diff options
author | Baptiste Daroussin <bapt@FreeBSD.org> | 2016-04-04 20:46:22 +0000 |
---|---|---|
committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2016-04-04 20:46:22 +0000 |
commit | 34d4baa56ca7224635a2c42a18ccaa4af51b5b07 (patch) | |
tree | ba71cff151e5528d6809367101f69e20543a65ec /math | |
parent | dbb56f6a5273e919cd8c6552cb59699b6eacd01b (diff) | |
download | ports-34d4baa56ca7224635a2c42a18ccaa4af51b5b07.tar.gz ports-34d4baa56ca7224635a2c42a18ccaa4af51b5b07.zip |
Notes
Diffstat (limited to 'math')
-rw-r--r-- | math/openblas/Makefile | 1 | ||||
-rw-r--r-- | math/openblas/files/patch-Makefile.system | 35 | ||||
-rw-r--r-- | math/openblas/files/patch-exports+Makefile | 8 |
3 files changed, 36 insertions, 8 deletions
diff --git a/math/openblas/Makefile b/math/openblas/Makefile index 7fb4218f3f65..2002f55f01e1 100644 --- a/math/openblas/Makefile +++ b/math/openblas/Makefile @@ -4,6 +4,7 @@ PORTNAME= openblas PORTVERSION= 0.2.15 DISTVERSIONPREFIX= v +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= math MASTER_SITES= GH NL/lapack/timing/:lapack_tmg diff --git a/math/openblas/files/patch-Makefile.system b/math/openblas/files/patch-Makefile.system index 6ac6e2418e90..aed8055a68c7 100644 --- a/math/openblas/files/patch-Makefile.system +++ b/math/openblas/files/patch-Makefile.system @@ -8,7 +8,25 @@ MD5SUM = md5 -r endif -@@ -1020,15 +1021,6 @@ ifndef LIBSUFFIX +@@ -889,9 +890,17 @@ SYMBOLSUFFIX = + endif + + ifndef LIBNAMESUFFIX ++ifndef SMP + LIBPREFIX = lib$(SYMBOLPREFIX)openblas$(SYMBOLSUFFIX) + else ++LIBPREFIX = lib$(SYMBOLPREFIX)openblasp$(SYMBOLSUFFIX) ++endif ++else ++ifndef SMP + LIBPREFIX = lib$(SYMBOLPREFIX)openblas$(SYMBOLSUFFIX)_$(LIBNAMESUFFIX) ++else ++LIBPREFIX = lib$(SYMBOLPREFIX)openblasp$(SYMBOLSUFFIX)_$(LIBNAMESUFFIX) ++endif + endif + + KERNELDIR = $(TOPDIR)/kernel/$(ARCH) +@@ -1020,24 +1029,8 @@ ifndef LIBSUFFIX LIBSUFFIX = a endif @@ -21,18 +39,19 @@ -LIBNAME_P = $(LIBPREFIX)_$(LIBCORE)p$(REVISION)_p.$(LIBSUFFIX) -endif -else - ifndef SMP +-ifndef SMP LIBNAME = $(LIBPREFIX)$(REVISION).$(LIBSUFFIX) LIBNAME_P = $(LIBPREFIX)$(REVISION)_p.$(LIBSUFFIX) -@@ -1036,7 +1028,6 @@ else - LIBNAME = $(LIBPREFIX)p$(REVISION).$(LIBSUFFIX) - LIBNAME_P = $(LIBPREFIX)p$(REVISION)_p.$(LIBSUFFIX) - endif +-else +-LIBNAME = $(LIBPREFIX)p$(REVISION).$(LIBSUFFIX) +-LIBNAME_P = $(LIBPREFIX)p$(REVISION)_p.$(LIBSUFFIX) -endif - +-endif +- LIBDLLNAME = $(LIBPREFIX).dll -@@ -1067,7 +1058,7 @@ LIB_COMPONENTS = CBLAS + LIBSONAME = $(LIBNAME:.$(LIBSUFFIX)=.so) +@@ -1067,7 +1060,7 @@ LIB_COMPONENTS = CBLAS endif export OSNAME diff --git a/math/openblas/files/patch-exports+Makefile b/math/openblas/files/patch-exports+Makefile index 2cab4d723625..fa147ae47437 100644 --- a/math/openblas/files/patch-exports+Makefile +++ b/math/openblas/files/patch-exports+Makefile @@ -8,3 +8,11 @@ so : ../$(LIBSONAME) ifeq (, $(SYMBOLPREFIX)$(SYMBOLSUFFIX)) +@@ -151,6 +152,7 @@ else + endif + $(CC) $(CFLAGS) $(LDFLAGS) -shared -o ../$(LIBSONAME) \ + -Wl,--whole-archive $< -Wl,--no-whole-archive \ ++ -Wl,-soname,$(LIBPREFIX).so.$(MAJOR_VERSION) \ + $(FEXTRALIB) $(EXTRALIB) + $(CC) $(CFLAGS) $(LDFLAGS) -w -o linktest linktest.c ../$(LIBSONAME) $(FEXTRALIB) && echo OK. + rm -f linktest |