Date: Thu, 29 Mar 2018 15:02:05 +0000 (UTC) From: Ed Maste <emaste@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r465900 - in head: Mk devel/libds devel/pdcurses devel/ztcl irc/eggdrop irc/eggdrop-devel irc/evangeline java/java3d lang/myrddin lang/rexx-imc lang/smlnj lang/tclX multimedia/harvid ne... Message-ID: <201803291502.w2TF25mj045149@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: emaste (src committer) Date: Thu Mar 29 15:02:05 2018 New Revision: 465900 URL: https://svnweb.freebsd.org/changeset/ports/465900 Log: Use BINARY_ALIAS to make LLD_UNSAFE more widely applicable Some ports do not honour $LD or -fuse-ld=bfd in $CFLAGS, but do invoke ld via $PATH. Automatically set BINARY_ALIAS+=ld=${LD} when LLD_UNSAFE is active to use ld.bfd for these ports. Approved by: portmgr (antoine) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D14876 Modified: head/Mk/bsd.port.mk head/devel/libds/Makefile head/devel/pdcurses/Makefile head/devel/ztcl/Makefile head/irc/eggdrop-devel/Makefile head/irc/eggdrop/Makefile head/irc/evangeline/Makefile head/java/java3d/Makefile head/lang/myrddin/Makefile head/lang/rexx-imc/Makefile head/lang/smlnj/Makefile head/lang/tclX/Makefile head/multimedia/harvid/Makefile head/net-im/uTox/Makefile head/net-p2p/monero-cli/Makefile head/sysutils/dupd/Makefile head/sysutils/installwatch/Makefile head/www/mozplugger/Makefile Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Thu Mar 29 14:53:23 2018 (r465899) +++ head/Mk/bsd.port.mk Thu Mar 29 15:02:05 2018 (r465900) @@ -1844,6 +1844,7 @@ PKG_DEPENDS+= ${LOCALBASE}/sbin/pkg:${PKG_ORIGIN} .if defined(LLD_UNSAFE) && ${/usr/bin/ld:L:tA} == /usr/bin/ld.lld LDFLAGS+= -fuse-ld=bfd +BINARY_ALIAS+= ld=${LD} . if !defined(USE_BINUTILS) . if exists(/usr/bin/ld.bfd) LD= /usr/bin/ld.bfd Modified: head/devel/libds/Makefile ============================================================================== --- head/devel/libds/Makefile Thu Mar 29 14:53:23 2018 (r465899) +++ head/devel/libds/Makefile Thu Mar 29 15:02:05 2018 (r465900) @@ -14,9 +14,7 @@ COMMENT= ANSI Generic Data Structures Library LICENSE= BSD4CLAUSE USE_LDCONFIG= yes -# Requires directly-invoked linker to provide library search paths. -LLD_UNSAFE= yes -BINARY_ALIAS= ld=ld.bfd +LLD_UNSAFE= yes # Needs linker to provide library search paths. ALL_TARGET= gcc HTML= avltree.html heap.html parray.html set.html \ Modified: head/devel/pdcurses/Makefile ============================================================================== --- head/devel/pdcurses/Makefile Thu Mar 29 14:53:23 2018 (r465899) +++ head/devel/pdcurses/Makefile Thu Mar 29 15:02:05 2018 (r465900) @@ -18,9 +18,7 @@ USE_LDCONFIG= yes USE_XORG= x11 xext sm ice xt xaw xmu xpm GNU_CONFIGURE= yes MAKE_JOBS_UNSAFE=yes -# Requires directly-invoked linker to provide library search paths. -LLD_UNSAFE= yes -BINARY_ALIAS= ld=ld.bfd +LLD_UNSAFE= yes # Needs linker to provide library search paths. WRKSRC_SUBDIR= x11 Modified: head/devel/ztcl/Makefile ============================================================================== --- head/devel/ztcl/Makefile Thu Mar 29 14:53:23 2018 (r465899) +++ head/devel/ztcl/Makefile Thu Mar 29 15:02:05 2018 (r465900) @@ -21,7 +21,6 @@ USES= gmake tcl:tea USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/${DISTNAME:S/_src$//} LLD_UNSAFE= yes -BINARY_ALIAS= ld=ld.bfd INFO= ${PORTNAME} ${PORTNAME}-zlib Modified: head/irc/eggdrop-devel/Makefile ============================================================================== --- head/irc/eggdrop-devel/Makefile Thu Mar 29 14:53:23 2018 (r465899) +++ head/irc/eggdrop-devel/Makefile Thu Mar 29 15:02:05 2018 (r465900) @@ -26,7 +26,6 @@ GH_TAGNAME= 2bf3950 MAKE_JOBS_UNSAFE= yes LLD_UNSAFE= yes -BINARY_ALIAS= ld=ld.bfd SUB_FILES= pkg-message Modified: head/irc/eggdrop/Makefile ============================================================================== --- head/irc/eggdrop/Makefile Thu Mar 29 14:53:23 2018 (r465899) +++ head/irc/eggdrop/Makefile Thu Mar 29 15:02:05 2018 (r465900) @@ -22,7 +22,6 @@ CONFIGURE_ARGS+=--with-tcllib=${LOCALBASE}/lib/libtcl$ --with-tclinc=${LOCALBASE}/include/tcl${TCL_VER}/tcl.h MAKE_JOBS_UNSAFE= yes LLD_UNSAFE= yes -BINARY_ALIAS= ld=ld.bfd SUB_FILES= pkg-message PORTDOCS= * Modified: head/irc/evangeline/Makefile ============================================================================== --- head/irc/evangeline/Makefile Thu Mar 29 14:53:23 2018 (r465899) +++ head/irc/evangeline/Makefile Thu Mar 29 15:02:05 2018 (r465900) @@ -18,9 +18,8 @@ USES= gmake tcl GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-tcllib=${LOCALBASE}/lib/libtcl${TCL_SHLIB_VER}.so \ --with-tclinc=${TCL_INCLUDEDIR}/tcl.h -# Requires directly-invoked linker to provide library search paths. +LLD_UNSAFE= yes # Needs linker to provide library search paths. LLD_UNSAFE= yes -BINARY_ALIAS= ld=ld.bfd PLIST_FILES= bin/evangeline Modified: head/java/java3d/Makefile ============================================================================== --- head/java/java3d/Makefile Thu Mar 29 14:53:23 2018 (r465899) +++ head/java/java3d/Makefile Thu Mar 29 15:02:05 2018 (r465900) @@ -24,7 +24,6 @@ JAVA_VERSION= 1.6+ JAVA_VENDOR= openjdk USE_ANT= yes LLD_UNSAFE= yes -BINARY_ALIAS= ld=ld.bfd PLIST_SUB+= JAVA_HOME=${JAVA_HOME:S/^${PREFIX}\///} ARCH=${ARCH} Modified: head/lang/myrddin/Makefile ============================================================================== --- head/lang/myrddin/Makefile Thu Mar 29 14:53:23 2018 (r465899) +++ head/lang/myrddin/Makefile Thu Mar 29 15:02:05 2018 (r465900) @@ -20,9 +20,8 @@ CONFIGURE_ARGS= --prefix "${PREFIX}" TEST_TARGET= check WRKSRC= ${WRKDIR}/mc -# Myrddin is LLD_UNSAFE: # ld: error: <internal>: section sh_addralign is not a power of 2 -BINARY_ALIAS= ld=ld.bfd +LLD_UNSAFE= yes OPTIONS_DEFINE= DEBUG VIM OPTIONS_DEFAULT= VIM Modified: head/lang/rexx-imc/Makefile ============================================================================== --- head/lang/rexx-imc/Makefile Thu Mar 29 14:53:23 2018 (r465899) +++ head/lang/rexx-imc/Makefile Thu Mar 29 15:02:05 2018 (r465900) @@ -25,7 +25,6 @@ CONFIGURE_ARGS= o all NO_BUILD= yes USE_LDCONFIG= yes LLD_UNSAFE= yes -BINARY_ALIAS= ld=ld.bfd DOCFILES= rexx.info rexx.ref rexx.summary rexx.tech RMEFILES= README README.Y2K README.bugreport README.docs \ Modified: head/lang/smlnj/Makefile ============================================================================== --- head/lang/smlnj/Makefile Thu Mar 29 14:53:23 2018 (r465899) +++ head/lang/smlnj/Makefile Thu Mar 29 15:02:05 2018 (r465900) @@ -20,7 +20,6 @@ LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-se ONLY_FOR_ARCHS= i386 amd64 LLD_UNSAFE= yes -BINARY_ALIAS= ld=ld.bfd NO_WRKSUBDIR= yes Modified: head/lang/tclX/Makefile ============================================================================== --- head/lang/tclX/Makefile Thu Mar 29 14:53:23 2018 (r465899) +++ head/lang/tclX/Makefile Thu Mar 29 15:02:05 2018 (r465900) @@ -25,7 +25,6 @@ PLIST_SUB= TCLX_VER=${PORTVERSION:R} ALL_TARGET= binaries libraries INSTALL_TARGET= install-binaries install-libraries LLD_UNSAFE= yes -BINARY_ALIAS= ld=ld.bfd .include <bsd.port.pre.mk> Modified: head/multimedia/harvid/Makefile ============================================================================== --- head/multimedia/harvid/Makefile Thu Mar 29 14:53:23 2018 (r465899) +++ head/multimedia/harvid/Makefile Thu Mar 29 15:02:05 2018 (r465900) @@ -18,7 +18,6 @@ USES= gmake jpeg localbase pkgconfig USE_GITHUB= yes GH_ACCOUNT= x42 LLD_UNSAFE= yes -BINARY_ALIAS= ld=ld.bfd MAKE_JOBS_UNSAFE= yes # https://github.com/x42/harvid/issues/5 Modified: head/net-im/uTox/Makefile ============================================================================== --- head/net-im/uTox/Makefile Thu Mar 29 14:53:23 2018 (r465899) +++ head/net-im/uTox/Makefile Thu Mar 29 15:02:05 2018 (r465900) @@ -29,7 +29,6 @@ USES= cmake compiler:c11 desktop-file-utils localbase pkgconfig USE_XORG= x11 xext xrender LLD_UNSAFE= yes -BINARY_ALIAS= ld=ld.bfd OPTIONS_DEFINE= DBUS OPTIONS_DEFAULT= DBUS Modified: head/net-p2p/monero-cli/Makefile ============================================================================== --- head/net-p2p/monero-cli/Makefile Thu Mar 29 14:53:23 2018 (r465899) +++ head/net-p2p/monero-cli/Makefile Thu Mar 29 15:02:05 2018 (r465900) @@ -34,7 +34,6 @@ GH_ACCOUNT= monero-project GH_PROJECT= monero CFLAGS+= -D_WANT_SEMUN LLD_UNSAFE= yes -BINARY_ALIAS= ld=ld.bfd OPTIONS_DEFINE= DOXYGEN DOXYGEN_BUILD_DEPENDS= dot:graphics/graphviz \ Modified: head/sysutils/dupd/Makefile ============================================================================== --- head/sysutils/dupd/Makefile Thu Mar 29 14:53:23 2018 (r465899) +++ head/sysutils/dupd/Makefile Thu Mar 29 15:02:05 2018 (r465900) @@ -18,7 +18,6 @@ GH_TAGNAME= v1.4:libbloom USES= gmake ssl sqlite:3 LLD_UNSAFE= yes -BINARY_ALIAS= ld=ld.bfd PLIST_FILES= bin/${PORTNAME} man/man1/${PORTNAME}.1.gz Modified: head/sysutils/installwatch/Makefile ============================================================================== --- head/sysutils/installwatch/Makefile Thu Mar 29 14:53:23 2018 (r465899) +++ head/sysutils/installwatch/Makefile Thu Mar 29 15:02:05 2018 (r465900) @@ -14,9 +14,7 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING USE_LDCONFIG= yes -# Requires directly-invoked linker to provide library search paths. -LLD_UNSAFE= yes -BINARY_ALIAS= ld=ld.bfd +LLD_UNSAFE= yes # Needs linker to provide library search paths. PLIST_FILES= bin/installwatch lib/installwatch.so PORTDOCS= BUGS CHANGELOG README TODO Modified: head/www/mozplugger/Makefile ============================================================================== --- head/www/mozplugger/Makefile Thu Mar 29 14:53:23 2018 (r465899) +++ head/www/mozplugger/Makefile Thu Mar 29 15:02:05 2018 (r465900) @@ -16,7 +16,6 @@ GNU_CONFIGURE= yes USES= desthack gmake webplugin:native USE_XORG= x11 xt LLD_UNSAFE= yes -BINARY_ALIAS= ld=ld.bfd WEBPLUGIN_FILES=mozplugger.so MAKE_ENV= WEBPLUGINS_DIR="${WEBPLUGIN_DIR}"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201803291502.w2TF25mj045149>