From nobody Fri Jul 08 17:50:04 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 6931617D0325; Fri, 8 Jul 2022 17:50:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Lfglw1yM5z48jG; Fri, 8 Jul 2022 17:50:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657302604; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d17/pcynFomW7XXgaGORwtHpBFfCfY9omp/8Q58g8cY=; b=fNSeEwwoycccQXZo7qt9D/thJjbhOTFevSHbW1pUeiMwczkPcPraRM4WbVzSI40BPgVOff RLh9K3klS/ALelCJF1f+YmRpTW075u7em9Zr2kCWy7hoXDbiutFGTY4SIM7JhzsLVIH9kU 2gg32YOfylLQ6Zj+sHACSbRmFElhlzRlZYfWwVY2LmK6H7KgPApNZ8yYTJYGSe67gpo+YC ad+K5SMNClNQzyOMiizzvEEvyJCb7nMvZaFqJQNuiFr7b8wCmwp+Y2eWdfRlSwg22hXC2w AwQ5NicvRZ1UtdceViBlKO72NHS1TDfAtLh39ALyqXCrodni32rNrJmIfo7CNg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Lfglw14MhzG0J; Fri, 8 Jul 2022 17:50:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 268Ho42g066615; Fri, 8 Jul 2022 17:50:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 268Ho40Y066612; Fri, 8 Jul 2022 17:50:04 GMT (envelope-from git) Date: Fri, 8 Jul 2022 17:50:04 GMT Message-Id: <202207081750.268Ho40Y066612@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 59a4cfe03cf7 - main - stand: Confine BZIP defines to bzip files List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 59a4cfe03cf7a916a3d855f63fa8b6955f1d4136 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657302604; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d17/pcynFomW7XXgaGORwtHpBFfCfY9omp/8Q58g8cY=; b=DRX8QAambpiUqZkDLU51AVB6WCyr2jVQ3klV6tdm+JlyUpY6hdy4REzihuWo+c7bY0W90V QsTB8izF/trxbEt+a/7nZNLTF3T0IqjflTJL4J5O8VmjMxj7tWCBqaYL9ds5cKgegZL0DW wVkuRaG659R0sOXYOaicPj/gXTLUfO00GBfLSIxLxsYiri8/EmOZMmfTaodbviFnLRgo/b EUvMV5SWUf+5xxm2qEoj+mvTUHCRzC57USvIj17Je5OBCsN3R+6FufkbrbnqQF3XR9pkmU Th2qsUAOX8xQIDKo+mghDunIZH/vdvptIzzFJwpPUlBdfgzxFOblmI4nSSJo6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657302604; a=rsa-sha256; cv=none; b=fUplb+IJierLXKx+IEAoWxoLGwv+Vq5/yd9GiPtDAJMpDR0Qj6yPRXjwtA1vyeCtX58sXC w6WjOB6ilriVDqY+LGECyoqkTXEYatScUulwG1zkBCWnv0eLDjsB3IGOBOoBeSYCCuxauZ QNOEXnVMC97tX7WFgbikvGHm3fXJNZSe6CBF6EsaOENkz4y9FegMYdp5eep0XzJXXvEkz+ tAmeRUFMp5R+oTuUTuegJFy0MIEDuGU0zU4efTnloCcWJwTv/Jw/WMqJtWnZMz7GP1o99b Xyu6HjIzcsE3aaR5WkZpEge8gja5pO+aDBwlQ0rywYMWwoWxF40s87lGVlwD8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=59a4cfe03cf7a916a3d855f63fa8b6955f1d4136 commit 59a4cfe03cf7a916a3d855f63fa8b6955f1d4136 Author: Warner Losh AuthorDate: 2022-07-08 16:19:39 +0000 Commit: Warner Losh CommitDate: 2022-07-08 17:47:37 +0000 stand: Confine BZIP defines to bzip files Sponsored by: Netflix --- stand/libsa/Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/stand/libsa/Makefile b/stand/libsa/Makefile index 6f2eaf3d959e..b5d800c26295 100644 --- a/stand/libsa/Makefile +++ b/stand/libsa/Makefile @@ -89,9 +89,10 @@ SRCS+= _setjmp.S # NOTE: to actually test this functionality after libbz2 upgrade compile # loader(8) with LOADER_BZIP2_SUPPORT defined .PATH: ${SRCTOP}/contrib/bzip2 -CFLAGS+= -DBZ_NO_STDIO -DBZ_NO_COMPRESS - -SRCS+=bzlib.c crctable.c decompress.c huffman.c randtable.c +.for i in bzlib.c crctable.c decompress.c huffman.c randtable.c +CFLAGS.${i}+= -DBZ_NO_STDIO -DBZ_NO_COMPRESS +SRCS+=${i} +.endfor # decompression functionality from zlib .PATH: ${SRCTOP}/sys/contrib/zlib @@ -170,7 +171,7 @@ SRCS+=ffs_subr.c ffs_tables.c CFLAGS.dosfs.c+= -I${LDRSRC} CFLAGS.tftp.c+= -I${LDRSRC} CFLAGS.ufs.c+= -I${LDRSRC} -CFLAGS.bzipfs.c+= -I${SRCTOP}/contrib/bzip2 +CFLAGS.bzipfs.c+= -I${SRCTOP}/contrib/bzip2 -DBZ_NO_STDIO -DBZ_NO_COMPRESS # explicit_bzero and calculate_crc32c .PATH: ${SYSDIR}/libkern