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

[Larry Rosenman]

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 libraries,
  and consequently breaks ports.

Modified:
  head/contrib/file/magic/Magdir/elf

Modified: head/contrib/file/magic/Magdir/elf
==============================================================================
--- 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.
_______________________________________________




-- 
Larry Rosenman                     http://www.lerctr.org/~ler
Phone: +1 214-642-9640                 E-Mail: ler at lerctr.org
US Mail: 5708 Sabbia Drive, Round Rock, TX 78665-2106

On 5/21/18, 11:47 AM, "Bryan Drewery" <bdrewery at 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
    > 
    > Log:
    >   Run "/usr/sbin/service ldconfig restart" for USE_LDCONFIG instead of
    >   "ldconfig -m <path>" so the order of ldconfig search directories after
    >   package installation is the same as after a reboot.  The original command
    >   simply appends the path to the list of directories while the ldconfig rc.d
    >   script uses "sort -u".
    >   
    >   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 search
    >   directories.
    >   
    >   PR:		228046
    >   Approved by:	portmgr (antoine)
    > 
    > 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
    > 
    > Modified: head/Mk/bsd.port.mk
    > ==============================================================================
    > --- 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/null" >> ${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} || ${TRUE}" >> ${TMPPLIST}
    > -	@${ECHO_CMD} "@postunexec ${LDCONFIG} -32 -R || ${TRUE}" >> ${TMPPLIST}
    > +	@${ECHO_CMD} "@postexec /usr/sbin/service ldconfig restart > /dev/null || ${TRUE}" >> ${TMPPLIST}
    > +	@${ECHO_CMD} "@postunexec /usr/sbin/service ldconfig restart > /dev/null || ${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=live-host-ports&build=2018-05-20_09h52m53s
    
    libgmp.so
    http://home.lerctr.org:8888/data/live-host-ports/2018-05-20_09h52m53s/logs/errors/coreutils-8.28.log
    libidn.so
    http://home.lerctr.org:8888/data/live-host-ports/2018-05-20_09h52m53s/logs/errors/lynx-2.8.8.2_6,1.log
    libedit.so
    http://home.lerctr.org:8888/data/live-host-ports/2018-05-20_09h52m53s/logs/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):
    
    .        if ${USE_LDCONFIG} != "${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.
    
    -- 
    Regards,
    Bryan Drewery