diff options
| author | Gerald Pfeifer <gerald@FreeBSD.org> | 2015-02-23 00:05:39 +0000 |
|---|---|---|
| committer | Gerald Pfeifer <gerald@FreeBSD.org> | 2015-02-23 00:05:39 +0000 |
| commit | 29e106c604b8ec81c6ce8dcc335efa5b13b0e190 (patch) | |
| tree | ec9fd1b7d14caf16216ea3a9970c7ecd5bb3a3bc /math/openblas | |
| parent | 6c1cb69cbf60f4c434e9bac09619788affe8d507 (diff) | |
| download | ports-29e106c604b8ec81c6ce8dcc335efa5b13b0e190.tar.gz ports-29e106c604b8ec81c6ce8dcc335efa5b13b0e190.zip | |
Notes
Diffstat (limited to 'math/openblas')
| -rw-r--r-- | math/openblas/Makefile | 2 | ||||
| -rw-r--r-- | math/openblas/files/patch-Makefile.system | 17 |
2 files changed, 9 insertions, 10 deletions
diff --git a/math/openblas/Makefile b/math/openblas/Makefile index 262994a27a0f..c0a75283b203 100644 --- a/math/openblas/Makefile +++ b/math/openblas/Makefile @@ -115,11 +115,11 @@ post-patch: ${WRKSRC}/lapack-netlib/lapacke/utils/Makefile \ ${WRKSRC}/reference/Makefile ${REINPLACE_CMD} -e "s+(ARCH)+(ARCH_)+" \ + -e 's+%%LDFLAGS%%+${LDFLAGS}+' \ -e 's+%%LOCALBASE%%+${LOCALBASE}+' \ -e 's+%%FIND%%+${FIND}+' \ -e 's+%%XARGS%%+${XARGS}+' \ -e 's+%%REINPLACE_CMD%%+${REINPLACE_CMD}+' \ - -e 's+%%_GCC_VER%%+${_GCC_VER}+' \ -e 's+$$(CROSS_SUFFIX)+${LOCALBASE}/bin/+' \ ${WRKSRC}/Makefile.system .if ${PORT_OPTIONS:MOPENMP} diff --git a/math/openblas/files/patch-Makefile.system b/math/openblas/files/patch-Makefile.system index bc9546a3513e..7446a6b5191f 100644 --- a/math/openblas/files/patch-Makefile.system +++ b/math/openblas/files/patch-Makefile.system @@ -1,15 +1,14 @@ ---- Makefile.system.orig 2013-07-26 02:34:45.000000000 +0900 -+++ Makefile.system 2013-07-27 01:22:51.000000000 +0900 -@@ -142,6 +142,8 @@ +--- Makefile.system.orig 2014-12-04 00:14:21.000000000 +0900 ++++ Makefile.system 2015-02-23 05:27:11.000000000 +0900 +@@ -199,6 +199,7 @@ endif ifeq ($(OSNAME), FreeBSD) -+EXTRALIB += -lm -+FCOMMON_OPT += -Wl,-rpath=%%LOCALBASE%%/lib/gcc%%_GCC_VER%% ++EXTRALIB += -lm %%LDFLAGS%% MD5SUM = md5 -r endif -@@ -856,15 +859,6 @@ +@@ -981,15 +982,6 @@ LIBSUFFIX = a endif @@ -25,7 +24,7 @@ ifndef SMP LIBNAME = $(LIBPREFIX)$(REVISION).$(LIBSUFFIX) LIBNAME_P = $(LIBPREFIX)$(REVISION)_p.$(LIBSUFFIX) -@@ -872,7 +866,6 @@ +@@ -997,7 +989,6 @@ LIBNAME = $(LIBPREFIX)p$(REVISION).$(LIBSUFFIX) LIBNAME_P = $(LIBPREFIX)p$(REVISION)_p.$(LIBSUFFIX) endif @@ -33,8 +32,8 @@ LIBDLLNAME = $(LIBPREFIX).dll -@@ -886,7 +879,7 @@ - LIBS_P = $(TOPDIR)/$(LIBNAME_P) +@@ -1028,7 +1019,7 @@ + endif export OSNAME -export ARCH |