diff options
| author | Gerald Pfeifer <gerald@FreeBSD.org> | 2013-03-24 14:55:33 +0000 |
|---|---|---|
| committer | Gerald Pfeifer <gerald@FreeBSD.org> | 2013-03-24 14:55:33 +0000 |
| commit | 0e1092a873290bd9bd481fb11e465859a5cec972 (patch) | |
| tree | d05afd53cc3ae52c3638751b234496189ac7d293 /math/gotoblas | |
| parent | - Update to 10.2 (diff) | |
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
Notes
Notes:
svn path=/head/; revision=315125
Diffstat (limited to 'math/gotoblas')
| -rw-r--r-- | math/gotoblas/Makefile | 3 | ||||
| -rw-r--r-- | math/gotoblas/files/patch-Makefile.system | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/math/gotoblas/Makefile b/math/gotoblas/Makefile index f05bf1086268..3dfcc4adcb56 100644 --- a/math/gotoblas/Makefile +++ b/math/gotoblas/Makefile @@ -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) diff --git a/math/gotoblas/files/patch-Makefile.system b/math/gotoblas/files/patch-Makefile.system index 78bc14535705..8537dc55a37d 100644 --- a/math/gotoblas/files/patch-Makefile.system +++ b/math/gotoblas/files/patch-Makefile.system @@ -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) |