From owner-svn-ports-all@freebsd.org Tue Sep 18 14:48:50 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1F6F8109FF1C; Tue, 18 Sep 2018 14:48:50 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id BFC167377A; Tue, 18 Sep 2018 14:48:49 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B62C4215C1; Tue, 18 Sep 2018 14:48:49 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w8IEmn2W066171; Tue, 18 Sep 2018 14:48:49 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w8IEmmiD066167; Tue, 18 Sep 2018 14:48:48 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201809181448.w8IEmmiD066167@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Tue, 18 Sep 2018 14:48:48 +0000 (UTC) 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 X-SVN-Group: ports-head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: in head: Mk archivers/p7zip multimedia/libx264 multimedia/xmms X-SVN-Commit-Revision: 480026 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Sep 2018 14:48:50 -0000 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}" \