Date: Mon, 23 Mar 2020 18:24:07 -0700 From: Bryan Drewery <bdrewery@FreeBSD.org> To: Emmanuel Vadot <manu@FreeBSD.org>, src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r359267 - in head: . share/mk Message-ID: <87469ad7-182c-1cd7-489c-e1d2cb60e4a8@FreeBSD.org> In-Reply-To: <202003240109.02O195Gs086052@repo.freebsd.org> References: <202003240109.02O195Gs086052@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --WH6CQOCXRnSm0ZYFzbCrE5cmZxFZEWta1 Content-Type: multipart/mixed; boundary="vig4vx2ozKi2FGZeBslm6ZDaa4btZkznu"; protected-headers="v1" From: Bryan Drewery <bdrewery@FreeBSD.org> To: Emmanuel Vadot <manu@FreeBSD.org>, src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-ID: <87469ad7-182c-1cd7-489c-e1d2cb60e4a8@FreeBSD.org> Subject: Re: svn commit: r359267 - in head: . share/mk References: <202003240109.02O195Gs086052@repo.freebsd.org> In-Reply-To: <202003240109.02O195Gs086052@repo.freebsd.org> --vig4vx2ozKi2FGZeBslm6ZDaa4btZkznu Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable On 3/23/2020 6:09 PM, Emmanuel Vadot wrote: > Author: manu > Date: Tue Mar 24 01:09:04 2020 > New Revision: 359267 > URL: https://svnweb.freebsd.org/changeset/base/359267 >=20 > Log: > bsd.lib.mk: Do not include bsd.incs.mk for INTERNALLIB > =20 > If we're building an internal lib do not bother including bsd.incs.mk= so we > will not install the headers. > This also "solves" a problem with pkgbase where a libXXX-development = package > is created and due to how packages are created we add a dependency to= a > libXXX package that doesn't exists. > =20 > Reported by: pizzamig > Reviewed by: pizzamig bapt emaste > Differential Revision: https://reviews.freebsd.org/D24166 >=20 > Modified: > head/ObsoleteFiles.inc > head/share/mk/bsd.lib.mk >=20 > Modified: head/ObsoleteFiles.inc > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/ObsoleteFiles.inc Tue Mar 24 01:08:06 2020 (r359266) > +++ head/ObsoleteFiles.inc Tue Mar 24 01:09:04 2020 (r359267) > @@ -36,6 +36,11 @@ > # xargs -n1 | sort | uniq -d; > # done > =20 > +# 20200323: INTERNALLIB don't install headers anymore > +OLD_FILES+=3D/usr/include/libelftc.h > +OLD_FILES+=3D/usr/include/libifconfig.h > +OLD_FILES+=3D/usr/include/libpmcstat.h > + lib/libelftc/Makefile:INCS=3D libelftc.h lib/libifconfig/Makefile:INCSDIR=3D ${INCLUDEDIR} lib/libifconfig/Makefile:INCS=3D libifconfig.h lib/libpmcstat/Makefile:INCS=3D libpmcstat.h This commit seems incomplete or wrong due to the leftover logic. > # 20200320: cx and ctau drivers retired > OLD_FILES+=3Dusr/share/man/man4/ctau.4.gz > OLD_FILES+=3Dusr/share/man/man4/cx.4.gz >=20 > Modified: head/share/mk/bsd.lib.mk > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/share/mk/bsd.lib.mk Tue Mar 24 01:08:06 2020 (r359266) > +++ head/share/mk/bsd.lib.mk Tue Mar 24 01:09:04 2020 (r359267) > @@ -489,7 +489,10 @@ _libinstall: > .include <bsd.nls.mk> > .include <bsd.confs.mk> > .include <bsd.files.mk> > +#No need to install header for INTERNALLIB > +.if !defined(INTERNALLIB) > .include <bsd.incs.mk> > +.endif > .endif > =20 > LINKOWN?=3D ${LIBOWN} >=20 --=20 Regards, Bryan Drewery --vig4vx2ozKi2FGZeBslm6ZDaa4btZkznu-- --WH6CQOCXRnSm0ZYFzbCrE5cmZxFZEWta1 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQGTBAEBCgB9FiEE+Rc8ssOq6npcih8JNddxu25Gl88FAl55YTdfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEY5 MTczQ0IyQzNBQUVBN0E1QzhBMUYwOTM1RDc3MUJCNkU0Njk3Q0YACgkQNddxu25G l8/YawgAlley/d8Lr9qPNj3F1iHcPy/jyOxRikLSS1YXi0t9+neHPqvQh/Bu/GPw CGHeUOfZ8DY6L1/fpEYW0CElCFBpFWgao9vZWAA9zAmEdm3LkfAcEwudb7L07FCT /gxOM97t9e2dUlmSCr+6aTup9ZuwdF1QKxa2v6OE48FtKE/rOKc8yJWhqB+HEwgh rHCfJIpg3D+nFgM2rCD66UXq7kgCbVs1p3Bw9TXbQU0hWGh6xot9sFiPxhULKQ82 JMeoCLKsebet1IZ9pU6Vy7Z949G0Nvy4Al0QWLlYtXxa+Dpe4VT0JbQSDTdoghvg fz15rGagPc1gbhf+2rebl8nrZAGjpg== =CWG6 -----END PGP SIGNATURE----- --WH6CQOCXRnSm0ZYFzbCrE5cmZxFZEWta1--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?87469ad7-182c-1cd7-489c-e1d2cb60e4a8>