Date: Mon, 21 May 2018 09:46:58 -0700 From: Bryan Drewery <bdrewery@FreeBSD.org> To: Tijl Coosemans <tijl@FreeBSD.org>, ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org, ler@FreeBSD.org, krion@FreeBSD.org Subject: Re: svn commit: r469956 - in head: Mk lang/gcc47 lang/gcc48 lang/gcc49 lang/gcc5 lang/gcc6 lang/gcc6-devel lang/gcc7 lang/gcc7-devel lang/gcc8-devel lang/gcc9-devel Message-ID: <b1ab6f4b-4358-1332-76c3-e08924bc761c@FreeBSD.org> In-Reply-To: <201805141915.w4EJFaFt008035@repo.freebsd.org> References: <201805141915.w4EJFaFt008035@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) --3iO6YpaJUaep46rZoc2gVPorqhhn9pjdD Content-Type: multipart/mixed; boundary="dR6HpoUJXLCtMIMD7Q4EgZsdvWsxflvfW"; protected-headers="v1" From: Bryan Drewery <bdrewery@FreeBSD.org> To: Tijl Coosemans <tijl@FreeBSD.org>, ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org, ler@FreeBSD.org, krion@FreeBSD.org Message-ID: <b1ab6f4b-4358-1332-76c3-e08924bc761c@FreeBSD.org> Subject: Re: svn commit: r469956 - in head: Mk lang/gcc47 lang/gcc48 lang/gcc49 lang/gcc5 lang/gcc6 lang/gcc6-devel lang/gcc7 lang/gcc7-devel lang/gcc8-devel lang/gcc9-devel References: <201805141915.w4EJFaFt008035@repo.freebsd.org> In-Reply-To: <201805141915.w4EJFaFt008035@repo.freebsd.org> --dR6HpoUJXLCtMIMD7Q4EgZsdvWsxflvfW Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable On 5/14/2018 12:15 PM, Tijl Coosemans wrote: > Author: tijl > Date: Mon May 14 19:15:36 2018 > New Revision: 469956 > URL: https://svnweb.freebsd.org/changeset/ports/469956 >=20 > Log: > Run "/usr/sbin/service ldconfig restart" for USE_LDCONFIG instead of > "ldconfig -m <path>" so the order of ldconfig search directories afte= r > package installation is the same as after a reboot. The original com= mand > simply appends the path to the list of directories while the ldconfig= rc.d > script uses "sort -u". > =20 > Bump lang/gcc* which are known to install libraries with exactly the = same > name so the library loaded at runtime depends on the order of the sea= rch > directories. > =20 > PR: 228046 > Approved by: portmgr (antoine) >=20 > Modified: > head/Mk/bsd.port.mk > head/lang/gcc47/Makefile > head/lang/gcc48/Makefile > head/lang/gcc49/Makefile > head/lang/gcc5/Makefile > head/lang/gcc6-devel/Makefile > head/lang/gcc6/Makefile > head/lang/gcc7-devel/Makefile > head/lang/gcc7/Makefile > head/lang/gcc8-devel/Makefile > head/lang/gcc9-devel/Makefile >=20 > Modified: head/Mk/bsd.port.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/Mk/bsd.port.mk Mon May 14 19:12:54 2018 (r469955) > +++ head/Mk/bsd.port.mk Mon May 14 19:15:36 2018 (r469956) > @@ -4512,22 +4512,13 @@ generate-plist: ${WRKDIR} > @${ECHO_CMD} "@postunexec ${LINUXBASE}/sbin/ldconfig" >> ${TMPPLIST} > .endif > .else > -.if defined(USE_LDCONFIG) > +.if defined(USE_LDCONFIG) || defined(USE_LDCONFIG32) > .if !defined(INSTALL_AS_USER) > - @${ECHO_CMD} "@postexec ${LDCONFIG} -m ${USE_LDCONFIG}" >> ${TMPPLIST= } > - @${ECHO_CMD} "@postunexec ${LDCONFIG} -R" >> ${TMPPLIST} > + @${ECHO_CMD} "@postexec /usr/sbin/service ldconfig restart > /dev/nul= l" >> ${TMPPLIST} > + @${ECHO_CMD} "@postunexec /usr/sbin/service ldconfig restart > /dev/n= ull" >> ${TMPPLIST} > .else > - @${ECHO_CMD} "@postexec ${LDCONFIG} -m ${USE_LDCONFIG} || ${TRUE}" >>= ${TMPPLIST} > - @${ECHO_CMD} "@postunexec ${LDCONFIG} -R || ${TRUE}" >> ${TMPPLIST} > -.endif > -.endif > -.if defined(USE_LDCONFIG32) > -.if !defined(INSTALL_AS_USER) > - @${ECHO_CMD} "@postexec ${LDCONFIG} -32 -m ${USE_LDCONFIG32}" >> ${TM= PPLIST} > - @${ECHO_CMD} "@postunexec ${LDCONFIG} -32 -R" >> ${TMPPLIST} > -.else > - @${ECHO_CMD} "@postexec ${LDCONFIG} -32 -m ${USE_LDCONFIG32} || ${TRU= E}" >> ${TMPPLIST} > - @${ECHO_CMD} "@postunexec ${LDCONFIG} -32 -R || ${TRUE}" >> ${TMPPLIS= T} > + @${ECHO_CMD} "@postexec /usr/sbin/service ldconfig restart > /dev/nul= l || ${TRUE}" >> ${TMPPLIST} > + @${ECHO_CMD} "@postunexec /usr/sbin/service ldconfig restart > /dev/n= ull || ${TRUE}" >> ${TMPPLIST} > .endif > .endif > .endif I'm getting several reports of LIB_DEPENDS no longer working in builds in Poudriere. I suspect this commit caused the problem but I haven't dug into it more yet. http://home.lerctr.org:8888/build.html?mastername=3Dlive-host-ports&build= =3D2018-05-20_09h52m53s libgmp.so http://home.lerctr.org:8888/data/live-host-ports/2018-05-20_09h52m53s/log= s/errors/coreutils-8.28.log libidn.so http://home.lerctr.org:8888/data/live-host-ports/2018-05-20_09h52m53s/log= s/errors/lynx-2.8.8.2_6,1.log libedit.so http://home.lerctr.org:8888/data/live-host-ports/2018-05-20_09h52m53s/log= s/errors/lua51-5.1.5_9.log USE_LDCONFIG only adds a file to LDCONFIG_DIR if it does not match LOCALBASE/lib (which it defaults to): =2E if ${USE_LDCONFIG} !=3D "${LOCALBASE}/lib" && !defined(INSTALL_AS_USER) But the code removed always was adding LOCALBASE/lib to the search path before. Larry, Kirill, please try reverting this commit and using bulk -c to see if it fixes it. --=20 Regards, Bryan Drewery --dR6HpoUJXLCtMIMD7Q4EgZsdvWsxflvfW-- --3iO6YpaJUaep46rZoc2gVPorqhhn9pjdD Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBAgAGBQJbAvgHAAoJEDXXcbtuRpfP7LMIALpXPDWF7UBL1Z4qV9zrc7h+ gVmE/pwZ6CMd+rqZ6VqNS2K8mme5G8nu2QqAu3sWsSdTO7VGhWg8KmivabtaQBuN WDi4Co3BrM5d5Ot7KaB1jSKTEqWKe47pbbsE5h75ii5k7q53EjocLHnxl1b2c9W0 3ElD+h23lzGWic8FisQIOCxqFJ3qrikwE/rL/58HiLEpsAemXLVNge5LNpKozOkC xMsjup5tdDyzMCP/A97P5iIBQ7rWk9Pr6O/sW3oK0U3dO4Zd6IXIla9wqoyqUBSF aM7AAr4stBdCMD8UhyhwGWJ9ctpyHkaisu2iNwbGQWRx/evQBqE5VCzF6BX8re0= =ClsA -----END PGP SIGNATURE----- --3iO6YpaJUaep46rZoc2gVPorqhhn9pjdD--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?b1ab6f4b-4358-1332-76c3-e08924bc761c>