Date: Mon, 21 May 2018 11:53:57 -0500 From: Larry Rosenman <ler@lerctr.org> To: Bryan Drewery <bdrewery@FreeBSD.org>, 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: <4430405D-3E9C-4E8E-BE7D-213DDF27EAA3@lerctr.org> In-Reply-To: <b1ab6f4b-4358-1332-76c3-e08924bc761c@FreeBSD.org> References: <201805141915.w4EJFaFt008035@repo.freebsd.org> <b1ab6f4b-4358-1332-76c3-e08924bc761c@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
antoine@ fixed it yesterday in: Author: antoine Date: Sun May 20 22:07:44 2018 New Revision: 333944 URL: https://svnweb.freebsd.org/changeset/base/333944 Log: Revert last change to file/magic/Magdir/elf, it misidentifies most shared libraries installed from ports as pie executables instead of shared libra= ries, and consequently breaks ports. Modified: head/contrib/file/magic/Magdir/elf Modified: head/contrib/file/magic/Magdir/elf =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/contrib/file/magic/Magdir/elf Sun May 20 21:56:08 2018 (r333943) +++ head/contrib/file/magic/Magdir/elf Sun May 20 22:07:44 2018 (r333944) @@ -48,9 +48,8 @@ !:mime application/x-object >16 leshort 2 executable, !:mime application/x-executable ->16 leshort 3 ${x?pie executable:shared object} - -!:mime application/x-${x?pie-executable:sharedlib} +>16 leshort 3 shared object, +!:mime application/x-sharedlib >16 leshort 4 core file !:mime application/x-coredump # Core file detection is not reliable. _______________________________________________ --=20 Larry Rosenman http://www.lerctr.org/~ler Phone: +1 214-642-9640 E-Mail: ler@lerctr.org US Mail: 5708 Sabbia Drive, Round Rock, TX 78665-2106 =EF=BB=BFOn 5/21/18, 11:47 AM, "Bryan Drewery" <bdrewery@FreeBSD.org> wrote: 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 o= f > "ldconfig -m <path>" so the order of ldconfig search directories af= ter > package installation is the same as after a reboot. The original c= ommand > simply appends the path to the list of directories while the ldconf= ig rc.d > script uses "sort -u". > =20 > Bump lang/gcc* which are known to install libraries with exactly th= e same > name so the library loaded at runtime depends on the order of the s= earch > 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}" >> ${TMPPLI= ST} > - @${ECHO_CMD} "@postunexec ${LDCONFIG} -R" >> ${TMPPLIST} > + @${ECHO_CMD} "@postexec /usr/sbin/service ldconfig restart > /dev/n= ull" >> ${TMPPLIST} > + @${ECHO_CMD} "@postunexec /usr/sbin/service ldconfig restart > /dev= /null" >> ${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}" >> ${= TMPPLIST} > - @${ECHO_CMD} "@postunexec ${LDCONFIG} -32 -R" >> ${TMPPLIST} > -.else > - @${ECHO_CMD} "@postexec ${LDCONFIG} -32 -m ${USE_LDCONFIG32} || ${T= RUE}" >> ${TMPPLIST} > - @${ECHO_CMD} "@postunexec ${LDCONFIG} -32 -R || ${TRUE}" >> ${TMPPL= IST} > + @${ECHO_CMD} "@postexec /usr/sbin/service ldconfig restart > /dev/n= ull || ${TRUE}" >> ${TMPPLIST} > + @${ECHO_CMD} "@postunexec /usr/sbin/service ldconfig restart > /dev= /null || ${TRUE}" >> ${TMPPLIST} > .endif > .endif > .endif =20 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 du= g into it more yet. =20 http://home.lerctr.org:8888/build.html?mastername=3Dlive-host-ports&build= =3D2018-05-20_09h52m53s =20 libgmp.so http://home.lerctr.org:8888/data/live-host-ports/2018-05-20_09h52m53s/l= ogs/errors/coreutils-8.28.log libidn.so http://home.lerctr.org:8888/data/live-host-ports/2018-05-20_09h52m53s/l= ogs/errors/lynx-2.8.8.2_6,1.log libedit.so http://home.lerctr.org:8888/data/live-host-ports/2018-05-20_09h52m53s/l= ogs/errors/lua51-5.1.5_9.log =20 =20 USE_LDCONFIG only adds a file to LDCONFIG_DIR if it does not match LOCALBASE/lib (which it defaults to): =20 . if ${USE_LDCONFIG} !=3D "${LOCALBASE}/lib" && !defined(INSTALL_AS_USER) =20 But the code removed always was adding LOCALBASE/lib to the search path before. =20 Larry, Kirill, please try reverting this commit and using bulk -c to se= e if it fixes it. =20 --=20 Regards, Bryan Drewery =20 =20
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4430405D-3E9C-4E8E-BE7D-213DDF27EAA3>