From nobody Tue Jan 24 22:10:42 2023 X-Original-To: dev-commits-src-all@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 4P1h4M0Ydpz3bf6R; Tue, 24 Jan 2023 22:10:43 +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 4P1h4L6ynTz4L8k; Tue, 24 Jan 2023 22:10:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598243; 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=yR3X4yb/v/J3HqENuC/9GM8pQXWXMYG5br3pyIoebpA=; b=NF8o1l4U7Z2B53Ue4aVW6IJsGf0xn1vPZ8qXrOdNKo9zs5dEwlHTT4+7gYIsrmNaQF6ap2 7Nb49d/vJUn3dmeivBraIJlmWYLzNi1dlfhvaFVMSiIc2ZE3BtPP2eprEX3OPCYNMlgV8/ BlpE0jfWTpPUi3jmfvTTockekTgRiA6yTIxqLtFpOE01RvrmvuFuzwJ5LutKRXGzPKy5YN IQB4jlv/6z4Dho7xP8yRLYGRPq0TQg25EAK2D3sYkUP7n5c7af7DurIsXef+5zh1GNx+Gb LTTYc5AnBt15gQMfAOqdJ0rKgoXBARSWk00W5i3eP0TI5Ik2AWyn+baFt8gUGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598243; 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=yR3X4yb/v/J3HqENuC/9GM8pQXWXMYG5br3pyIoebpA=; b=f6XCsH5G+nhZiErJzrobOmaFcRyzCUFe3sH0Vu6S7Um5w/ADu7S6Husa8mSLC9/KZQKAaT PdXVu9+AHFytCw8Zhg/zBAX636prlOHECUbK5tO/u4aqnMLgJVyAbcjt8fZVQEqnG0XUMD XJLI+ltHKHqxL954Cl5WEZGN7Vc54khksHB8+7E4g2gDlLd3acikQYoPg3mPKojWEyQl5/ PmFTas99p4aUuG4bUOnm0AoHD5ar/TnjmnRow9CNPidVV56R+tsgefWAC9LgNKXbAEosVI 9gYniKCqa0+rMX0eduEuNi8cax2ufMeX8Fvuw0DgmEYTy5i1JRf40cZTk78yKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674598243; a=rsa-sha256; cv=none; b=qemL4qD/lweq6MihUElroWhECroCoN70598jbsgs8nuHiJL3z+4ZjTkYLGoywFs35T4PuH wFFJuA/VcBvsjtXVsODLsLc1Rl2U1l87dXbabmWKD8KmSjQhNqx68sTbUqVybu3y7FOZZl XVs6V4DYL3Wh3c+e4n/73ZCVjdRPhIHxyY8pRZt7ecAGgfVA4cWphDcE2NpsYKgg9OKopg 8Rk6ncGNLub6bfSTWczYMCcfpLA82t37FUNXYWuXDqj/kwlCLXcoTG0JnSfQm0iqKs5cIq bmlBrvkb3Wsl9MHYvcA3C6ETtOZzkDzXJ5SF6ZW1C1IjE9XB5cAg+JDkkm1fhA== 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 4P1h4L5jXvzQFM; Tue, 24 Jan 2023 22:10:42 +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 30OMAgiK080428; Tue, 24 Jan 2023 22:10:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30OMAgAH080427; Tue, 24 Jan 2023 22:10:42 GMT (envelope-from git) Date: Tue, 24 Jan 2023 22:10:42 GMT Message-Id: <202301242210.30OMAgAH080427@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 09a31487c1bd - stable/13 - stand: Confine BZIP defines to bzip files List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 09a31487c1bdcb5dc8780fdd7e78540d686a3854 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=09a31487c1bdcb5dc8780fdd7e78540d686a3854 commit 09a31487c1bdcb5dc8780fdd7e78540d686a3854 Author: Warner Losh AuthorDate: 2022-07-08 16:19:39 +0000 Commit: Warner Losh CommitDate: 2023-01-24 21:49:22 +0000 stand: Confine BZIP defines to bzip files Sponsored by: Netflix (cherry picked from commit 59a4cfe03cf7a916a3d855f63fa8b6955f1d4136) --- stand/libsa/Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/stand/libsa/Makefile b/stand/libsa/Makefile index 621747a85d0f..f319645a8072 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 @@ -181,7 +182,7 @@ CFLAGS.ffs_subr.c+= -DSTANDALONE_SMALL 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