diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2011-10-06 08:45:15 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2011-10-06 08:45:15 +0000 |
| commit | 3bd8a2ca225060d0108056b0e3af4de8edbf90d4 (patch) | |
| tree | a817412a90e27d539eaf060d7d0d7b7ca7e8eac9 | |
| parent | - remove uneeded oaf dependency (diff) | |
Fix build when gcc other than gcc46 exists.
PR: 161273
Submitted by: Oliver Hartmann <ohartman@zedat.fu-berlin.de>
Notes
Notes:
svn path=/head/; revision=283029
| -rw-r--r-- | math/gotoblas/Makefile | 2 | ||||
| -rw-r--r-- | math/gotoblas/files/patch-Makefile.system | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/math/gotoblas/Makefile b/math/gotoblas/Makefile index 1b30bd106b94..407f132f0d56 100644 --- a/math/gotoblas/Makefile +++ b/math/gotoblas/Makefile @@ -100,6 +100,8 @@ 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+$$(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 fba46a791a13..78bc14535705 100644 --- a/math/gotoblas/files/patch-Makefile.system +++ b/math/gotoblas/files/patch-Makefile.system @@ -1,11 +1,12 @@ --- Makefile.system.orig 2010-01-28 15:11:08.000000000 -0500 +++ Makefile.system 2011-09-05 12:30:26.000000000 -0400 -@@ -93,6 +93,10 @@ +@@ -93,6 +93,11 @@ EXTRALIB += -lm endif +ifeq ($(OSNAME), FreeBSD) +EXTRALIB += -lm ++FCOMMON_OPT += -Wl,-rpath=%%LOCALBASE%%/lib/%%_GCC_BUILD_DEPENDS%% +endif + ifeq ($(OSNAME), AIX) |