Date: Tue, 18 Sep 2018 14:48:48 +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: r480026 - in head: Mk archivers/p7zip multimedia/libx264 multimedia/xmms Message-ID: <201809181448.w8IEmmiD066167@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: emaste (src committer) Date: Tue Sep 18 14:48:48 2018 New Revision: 480026 URL: https://svnweb.freebsd.org/changeset/ports/480026 Log: Hoist LDFLAGS_${ARCH} logic into bsd.port.mk Approved by: portmgr (bapt) Sponsored by: The FreeBSD Foundation Modified: head/Mk/bsd.port.mk head/archivers/p7zip/Makefile head/multimedia/libx264/Makefile head/multimedia/xmms/Makefile Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Tue Sep 18 14:21:33 2018 (r480025) +++ head/Mk/bsd.port.mk Tue Sep 18 14:48:48 2018 (r480026) @@ -363,6 +363,7 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # CXXFLAGS_${ARCH} # Append the cxxflags to CXXFLAGS only on the specified architecture ## +# LDFLAGS_${ARCH} Append the ldflags to LDFLAGS only on the specified architecture # USE_SDL - If set, this port uses the sdl libraries. # See bsd.sdl.mk for more information. ## @@ -2049,6 +2050,10 @@ ${lang}FLAGS:= ${${lang}FLAGS:N-std=*} -std=${USE_${la ${lang}FLAGS+= ${${lang}FLAGS_${ARCH}} .endif .endfor + +.if defined(LDFLAGS_${ARCH}) +LDFLAGS+= ${LDFLAGS_${ARCH}} +.endif # Multiple make jobs support .if defined(DISABLE_MAKE_JOBS) || defined(MAKE_JOBS_UNSAFE) Modified: head/archivers/p7zip/Makefile ============================================================================== --- head/archivers/p7zip/Makefile Tue Sep 18 14:21:33 2018 (r480025) +++ head/archivers/p7zip/Makefile Tue Sep 18 14:48:48 2018 (r480026) @@ -31,7 +31,6 @@ CFLAGS_sparc64= -fPIC # Fix the build for i386 when WITH_LLD_IS_LD is set # https://bugs.freebsd.org/230210 -LDFLAGS+= ${LDFLAGS_${ARCH}} LDFLAGS_i386= -Wl,-z,notext OPTIONS_DEFINE= DOCS Modified: head/multimedia/libx264/Makefile ============================================================================== --- head/multimedia/libx264/Makefile Tue Sep 18 14:21:33 2018 (r480025) +++ head/multimedia/libx264/Makefile Tue Sep 18 14:48:48 2018 (r480026) @@ -13,8 +13,6 @@ PLIST= ${.CURDIR}/pkg-plist LIB_DEPENDS= # USES= pathfix - -LDFLAGS+= ${LDFLAGS_${ARCH}} LDFLAGS_i386= -Wl,-znotext OPTIONS_DEFINE= ASM OPENCL Modified: head/multimedia/xmms/Makefile ============================================================================== --- head/multimedia/xmms/Makefile Tue Sep 18 14:21:33 2018 (r480025) +++ head/multimedia/xmms/Makefile Tue Sep 18 14:48:48 2018 (r480026) @@ -23,9 +23,7 @@ USE_GNOME= gtk12 USE_LDCONFIG= yes USE_XORG= sm x11 xxf86vm -LDFLAGS+= ${LDFLAGS_${ARCH}} LDFLAGS_i386= -Wl,-znotext - CONFIGURE_ARGS= xmms_cv_newpcm_driver=yes --disable-static CONFIGURE_ENV= INPUT_PLUGINS="${INPUT_PLUGINS}" \ OUTPUT_PLUGINS="${OUTPUT_PLUGINS}" \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201809181448.w8IEmmiD066167>