From nobody Thu Jun 4 19:49:38 2026 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 4gWZsM3RhMz6grC1 for ; Thu, 04 Jun 2026 19:49:43 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: from mail-oi1-x232.google.com (mail-oi1-x232.google.com [IPv6:2607:f8b0:4864:20::232]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gWZsM1Lbdz3Bms for ; Thu, 04 Jun 2026 19:49:43 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Authentication-Results: mx1.freebsd.org; none Received: by mail-oi1-x232.google.com with SMTP id 5614622812f47-4863eae453eso534810b6e.1 for ; Thu, 04 Jun 2026 12:49:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hardenedbsd.org; s=google; t=1780602580; x=1781207380; darn=freebsd.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=zoBIG3368LLyii2cUka54LjPJ91IPp+0JciDn+vjo68=; b=ON+iftqoy1WWswAP8ISxrucWB4C5JSC3NCuAoHZAs/ox7ds6T9ppOeifdjhucJ4Aan tSukTbLZNb6CHyJPjQW1/E8jdoYWuZywkpQlgcTeeuAkgoH0Tptc1649gGcQLMTKRMXM aCVM5gKby2WZpDsgD4gpxic43gsvVOQ/YPYFSOls7iJa8Zkb6Q42PdK9TmSc+YRVTkD5 f2LsIgndlT4dY6/kA+kGKEAW3C3zADtrRYTvygZ3BesbqtaOxvr7XRPBBjnFcimWeMEp FYADwylvg1L4pFYmXbDckRm3OKjOybFf9ZUHj1TZ8/BmZNahJJIHfUUzB//dwYLpJbOy YjYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780602580; x=1781207380; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-gg:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zoBIG3368LLyii2cUka54LjPJ91IPp+0JciDn+vjo68=; b=fntnwRMPq5FQBn0h0KJoO+2IArIeqQlbdpjg0OzEK/e/wLzTiqGba5Olh41tTmwFHe DvmEzfh5YBt0F+61/74yNC6SyVjXPl9B56dRdcqqvGKmOFY+woHM/hhib5I60G532Bm8 F8u41Nl5teijA3pPIDiPmJpuG91woj/hmDGAfRwPAayuJ6vBX7cSl/g9r/64t9Z4H/eM cQSeM8jraTawdja+dY1KspFyqlgClz5bNaXwdiCiluSrkrhJW0h8TUvOHiiwU4AGYst/ mcH7ZrstTlSyt6KQU/u8h9eKzY3jGuhsnZboidnM5GpvlGob4xN4lPP6JtSa3zPN8cd3 GKmQ== X-Forwarded-Encrypted: i=1; AFNElJ8HBpnBdRv2z1lEF9DKxEQtEbeT5eQRsDhVIWwh6q/eMD1wrlRepr7X7mdQrDlGQ2ngzKU9XoiCV/BSEHAaJa20M/JU@freebsd.org X-Gm-Message-State: AOJu0YzUSo7FQJOGP4PSTPN1Cha8G1cq8FndI4I10akHc88pe1qq4Sy3 ildCsWzSaKRBsPtZESlAZ5OlGzoZrRFf6DK8tJYgLgYo5VsUFGhNHXzyOUJQXCV2FQE= X-Gm-Gg: Acq92OEBxUnYSlbCdmDAjnUggPIYlSjXJNMH7WV3nwQmVPtP4Y4XooyTf/sm38LMyRY tfKJ59zRX0H50n3ef2mtuH/6IhjPc3GkICkfuMQMc5GJiClpJrYAIA/QAjDwRghOyn9/j+PndoY A/3Y/iYC6zwtxPdplkCPEtgH3n4PvVGyxhIFA++KfAtbgClkCQPy+/TT3neoHo/rpnT+tV3/MWY ZmP8bXhEKWXxHqqP7sJu4vbX2+fU/6S66amgijuOyBkur45o8O78VmhMLOPFY7NE/RwP/dBMmoG 8XF++6++gbHjxuCUBuwupWmaSw/leKTy8DHF+Y6Ho8q4Qm5YLIyEIlSWxyXsHoduPPT5x10sXa/ cZC2igS6KmeGKiFLG1fcF/Y0mQ/05aHUTN3sgq0+nTlJ9h/pcHxMyrp7UAFelLW0vUXUqD/it0I Cm1wHLnCDZKa+OL/Uavcg/t8HopZhGmQ== X-Received: by 2002:a05:6808:221a:b0:479:fe0e:e83e with SMTP id 5614622812f47-4868dc59ecamr327170b6e.14.1780602580538; Thu, 04 Jun 2026 12:49:40 -0700 (PDT) Received: from mutt-hbsd ([97.112.164.127]) by smtp.gmail.com with ESMTPSA id 5614622812f47-4865b96e2dbsm5045176b6e.13.2026.06.04.12.49.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jun 2026 12:49:39 -0700 (PDT) Date: Thu, 4 Jun 2026 19:49:38 +0000 From: Shawn Webb To: Dag-Erling =?utf-8?B?U23DuHJncmF2?= Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: eb3a0a74a069 - main - libarchive: Clean up the build configuration Message-ID: <3pdazz27eqlfeclrop6e6eotyrq2nltofy36nxbzq5tj2nrk6b@7notz67ugzfl> X-Operating-System: FreeBSD mutt-hbsd 15.0-STABLE-HBSD FreeBSD 15.0-STABLE-HBSD HARDENEDBSD amd64 X-PGP-Key: https://git.hardenedbsd.org/hardenedbsd/pubkeys/-/blob/master/Shawn_Webb/03A4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc References: <6a2179d9.33381.266325aa@gitrepo.freebsd.org> 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="kknllzoizb2427mp" Content-Disposition: inline In-Reply-To: <6a2179d9.33381.266325aa@gitrepo.freebsd.org> X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Queue-Id: 4gWZsM1Lbdz3Bms X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated --kknllzoizb2427mp Content-Type: text/plain; protected-headers=v1; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Subject: Re: git: eb3a0a74a069 - main - libarchive: Clean up the build configuration MIME-Version: 1.0 On Thu, Jun 04, 2026 at 01:12:57PM +0000, Dag-Erling Sm=F8rgrav wrote: > The branch main has been updated by des: >=20 > URL: https://cgit.FreeBSD.org/src/commit/?id=3Deb3a0a74a069d0f294e1596504= 676459282bb308 >=20 > commit eb3a0a74a069d0f294e1596504676459282bb308 > Author: Dag-Erling Sm=F8rgrav > AuthorDate: 2026-06-04 13:12:23 +0000 > Commit: Dag-Erling Sm=F8rgrav > CommitDate: 2026-06-04 13:12:23 +0000 >=20 > libarchive: Clean up the build configuration > =20 > * Move settings duplicated in libarchive, bsdcat, bsdcpio, bsdtar, and > bsdunzip into libarchive's Makefile.inc. > =20 > * Drop some CFLAGS that merely duplicated some of the contents of our > platform configuration header. > =20 > MFC after: 1 week > Reviewed by: mm > Differential Revision: https://reviews.freebsd.org/D57307 > --- > lib/libarchive/Makefile | 7 ++----- > lib/libarchive/Makefile.inc | 16 +++++++++++----- > lib/libarchive/tests/Makefile | 8 ++++---- > usr.bin/bsdcat/Makefile | 17 ++++++----------- > usr.bin/bsdcat/tests/Makefile | 15 +++++++-------- > usr.bin/cpio/Makefile | 18 +++++------------- > usr.bin/cpio/tests/Makefile | 15 +++++++-------- > usr.bin/tar/Makefile | 13 +++---------- > usr.bin/tar/tests/Makefile | 13 +++++++------ > usr.bin/unzip/Makefile | 14 ++++---------- > usr.bin/unzip/tests/Makefile | 13 +++++++------ > 11 files changed, 63 insertions(+), 86 deletions(-) >=20 > diff --git a/lib/libarchive/Makefile b/lib/libarchive/Makefile > index 4e32dcf72341..c4b4bc67ba33 100644 > --- a/lib/libarchive/Makefile > +++ b/lib/libarchive/Makefile > @@ -1,7 +1,8 @@ > .include > =20 > +.include "Makefile.inc" > + > PACKAGE=3Dlib${LIB} > -_LIBARCHIVEDIR=3D ${SRCTOP}/contrib/libarchive > =20 > LIB=3D archive > =20 > @@ -9,10 +10,6 @@ LIB=3D archive > # It has no real relation to the libarchive version number. > SHLIB_MAJOR=3D 7 > =20 > -CFLAGS+=3D -I${.OBJDIR} > -CFLAGS+=3D -I${SRCTOP}/sys/contrib/zstd/lib > -.include "Makefile.inc" > - > .if ${MACHINE_ARCH:Marm*} !=3D "" || ${MACHINE_ARCH:Mpowerpc*} !=3D "" > NO_WCAST_ALIGN=3D yes > .if ${MACHINE_ARCH:M*64*} =3D=3D "" > diff --git a/lib/libarchive/Makefile.inc b/lib/libarchive/Makefile.inc > index 755a39ec01e8..33ab0085367f 100644 > --- a/lib/libarchive/Makefile.inc > +++ b/lib/libarchive/Makefile.inc > @@ -2,11 +2,17 @@ > # them in sync we can get run-time crashes while running tests due to mi= smatches > # between structures such as archive_md5_ctx, etc. > =20 > -LIBADD=3D z bz2 lzma bsdxml zstd > -CFLAGS+=3D -DHAVE_BZLIB_H=3D1 -DHAVE_LIBLZMA=3D1 -DHAVE_LZMA_H=3D1 \ > - -DHAVE_ZSTD_H=3D1 -DHAVE_LIBZSTD=3D1 -DHAVE_ZSTD_compressStream=3D1 \ > - -DHAVE_SYSCONF=3D1 > -CFLAGS+=3D -DPLATFORM_CONFIG_H=3D\"${.CURDIR}/config_freebsd.h\" > +_LIBARCHIVEDIR=3D ${SRCTOP}/contrib/libarchive > +LIBARCHIVE_VERSION_ONLY_STRING!=3D \ > + sed -n '/define.*ARCHIVE_VERSION_ONLY_STRING/{s,[^0-9.],,gp;q;}' \ > + ${LIBARCHIVEDIR}/libarchive/archive.h Hey Dag-Erling, This seems to have created a new warning during buildworld: =3D=3D=3D=3D BEGIN BUILD LOG =3D=3D=3D=3D =3D=3D=3D> lib/libarchive (all) sed: /libarchive/archive.h: No such file or directory make[5]: /usr/src/lib/libarchive/Makefile.inc:6: warning: Command "sed -n '= /define.*ARCHIVE_VERSION_ONLY_STRING/{s,[^0-9.],,gp;q;}' /libarchive/archi= ve.h" exited with status 1 =3D=3D=3D=3D END BUILD LOG =3D=3D=3D=3D Thanks, --=20 Shawn Webb Cofounder / Security Engineer HardenedBSD Signal Username: shawn_webb.74 Tor-ified Signal: +1 (719) 756-1197 / activist_opsec.27 https://git.hardenedbsd.org/hardenedbsd/pubkeys/-/raw/master/Shawn_Webb/03A= 4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc --kknllzoizb2427mp Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEA6TL67gupaZ9nzhT/y5nonf44foFAmoh1ssACgkQ/y5nonf4 4fqjbQ/9GSxJmeBn+BPIocCjZJ3AhyxQ1qqQ9/35K9qFe9IOAgvvj8Bi6nkaslkH IBebleF6CR0KqSzeRpaTeDsecym08sCV/2TacFi8yzzbeRD6j7mxc7OnRqUV7TmG mFmAfNtnnHUsRKP8u3XLgu0it39oO0Q74BMiG2HKeWeFfR4VyMus2nF7BVXcNEnS JKodf4g305w7SfmTIq+FfoLdetmEViPNywni9AurIYzbAyz01Mn1NOkSkvl/aDtk ceNPMfVw8QlCc+RPSIUd791Pvo4DU+0GXtfJSL4IO1zqnBWYRC8/0358lIKb7OLx CAGglcnJV4t8sCnhj8f3Ilzl8pq2mgBNRkDGOXUabElrN0JV8vM7pCBnFDq6pF2I cpny/g9YfllDtQnhC5i2L2N1vLwoKEaMjY9gof5R5aTuQXW6iHje5i8pQ3fc9/t2 +jibhXHkpsGGLNUbhdeJzR1Y5NdENwFWLcxAGxe0hw41pcecgV37nkn4y7OeaBlv /AMs4fEXFW2Jox2HGLhcq0kWklLwgqDIaDZ/7SbpJwizlFoKOsINydb1QF4j01bd w28z7exd1bUvJ57R43E0NIFUIYhkZtQnpWhMjg4jQr+vhc1B5fpupZ8U0g3VJZn4 ZgwxTzKR61wBwmrKBVxRSkhJCt1b28gwcKqfIamy5/xdcNwewQc= =zYF0 -----END PGP SIGNATURE----- --kknllzoizb2427mp--