Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 24 Mar 2013 14:55:33 +0000 (UTC)
From:      Gerald Pfeifer <gerald@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r315125 - in head/math/gotoblas: . files
Message-ID:  <201303241455.r2OEtXjr009624@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: gerald
Date: Sun Mar 24 14:55:33 2013
New Revision: 315125
URL: http://svnweb.freebsd.org/changeset/ports/315125

Log:
  Replace the use of _GCC_BUILD_DEPENDS (which was never meant to be
  used outside of Mk/bsd.gcc.mk) by _GCC_RUNTIME.
  
  This is still not ideal, but at least a documented stopgap, and it
  avoids the manual construction of the directory to be added to rpath.
  
  Approved by:	maho

Modified:
  head/math/gotoblas/Makefile
  head/math/gotoblas/files/patch-Makefile.system

Modified: head/math/gotoblas/Makefile
==============================================================================
--- head/math/gotoblas/Makefile	Sun Mar 24 14:32:38 2013	(r315124)
+++ head/math/gotoblas/Makefile	Sun Mar 24 14:55:33 2013	(r315125)
@@ -109,8 +109,7 @@ post-patch:
 		${WRKSRC}/lapack/laswp/Makefile \
 		${WRKSRC}/reference/Makefile
 	${REINPLACE_CMD} -e "s+(ARCH)+(ARCH_)+" \
-	-e 's+%%LOCALBASE%%+${LOCALBASE}+' \
-	-e 's+%%_GCC_BUILD_DEPENDS%%+${_GCC_BUILD_DEPENDS}+' \
+	-e 's+%%_GCC_RUNTIME%%+${_GCC_RUNTIME}+' \
 	-e 's+$$(CROSS_SUFFIX)+${LOCALBASE}/bin/+' \
 		${WRKSRC}/Makefile.system
 .if defined(WITH_OPENMP)

Modified: head/math/gotoblas/files/patch-Makefile.system
==============================================================================
--- head/math/gotoblas/files/patch-Makefile.system	Sun Mar 24 14:32:38 2013	(r315124)
+++ head/math/gotoblas/files/patch-Makefile.system	Sun Mar 24 14:55:33 2013	(r315125)
@@ -6,7 +6,7 @@
  
 +ifeq ($(OSNAME), FreeBSD)
 +EXTRALIB	+= -lm
-+FCOMMON_OPT	+= -Wl,-rpath=%%LOCALBASE%%/lib/%%_GCC_BUILD_DEPENDS%%
++FCOMMON_OPT	+= -Wl,-rpath=%%_GCC_RUNTIME%%
 +endif
 +
  ifeq ($(OSNAME), AIX)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303241455.r2OEtXjr009624>