View | Details | Raw Unified | Return to bug 206886 | Differences between
and this patch

Collapse All | Expand All

(-)./Makefile (-17 / +8 lines)
Lines 2-21 Link Here
2
# $FreeBSD: head/math/openblas/Makefile 384778 2015-04-26 12:01:23Z mat $
2
# $FreeBSD: head/math/openblas/Makefile 384778 2015-04-26 12:01:23Z mat $
3
3
4
PORTNAME=	openblas
4
PORTNAME=	openblas
5
PORTVERSION=	0.2.14
5
PORTVERSION=	0.2.15
6
PORTEPOCH=	1
7
DISTVERSIONPREFIX=	v
6
DISTVERSIONPREFIX=	v
7
PORTEPOCH=	1
8
CATEGORIES=	math
8
CATEGORIES=	math
9
MASTER_SITES=	GH NL/lapack/timing/:lapack_tmg
9
MASTER_SITES=	GH NL/lapack/timing/:lapack_tmg
10
DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
10
DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
11
		large.tgz:lapack_tmg timing.tgz:lapack_tmg
11
		large.tgz:lapack_tmg timing.tgz:lapack_tmg
12
DIST_SUBDIR=	openblas
12
13
13
MAINTAINER=	phd_kimberlite@yahoo.co.jp
14
MAINTAINER=	phd_kimberlite@yahoo.co.jp
14
COMMENT=	Optimized BLAS library based on GotoBLAS2
15
COMMENT=	Optimized BLAS library based on GotoBLAS2
15
16
16
LICENSE=	BSD3CLAUSE
17
LICENSE=	BSD3CLAUSE
17
18
18
DIST_SUBDIR=	openblas
19
USE_GITHUB=	yes
19
USE_GITHUB=	yes
20
GH_ACCOUNT=	xianyi
20
GH_ACCOUNT=	xianyi
21
GH_PROJECT=	OpenBLAS
21
GH_PROJECT=	OpenBLAS
Lines 141-149 Link Here
141
	${MAKE_CMD} ${MAKE_ARGS}
141
	${MAKE_CMD} ${MAKE_ARGS}
142
	${CP} ${WRKSRC}/libopenblasp-${OPENBLAS_SUFX}.a ${WRKDIR}/lib/libopenblasp.a
142
	${CP} ${WRKSRC}/libopenblasp-${OPENBLAS_SUFX}.a ${WRKDIR}/lib/libopenblasp.a
143
	${CP} ${WRKSRC}/libopenblasp-${OPENBLAS_SUFX}.so ${WRKDIR}/lib/libopenblasp.so.${OPENBLAS_SVER}
143
	${CP} ${WRKSRC}/libopenblasp-${OPENBLAS_SUFX}.so ${WRKDIR}/lib/libopenblasp.so.${OPENBLAS_SVER}
144
.if !${PORT_OPTIONS:MDEBUG}
145
	${LOCALBASE}/bin/strip -X ${WRKDIR}/lib/*.so.${OPENBLAS_SVER}
146
.endif
147
144
148
BENCHMARK_MAXTHREADS?=	${MAXTHREADS}
145
BENCHMARK_MAXTHREADS?=	${MAXTHREADS}
149
.if ${PORT_OPTIONS:MOPENMP}
146
.if ${PORT_OPTIONS:MOPENMP}
Lines 159-174 Link Here
159
	USE_THREAD=1 ${BENCHMARK_THREADS_FLAG} ${MAKE_CMD} ${MAKE_ARGS}
156
	USE_THREAD=1 ${BENCHMARK_THREADS_FLAG} ${MAKE_CMD} ${MAKE_ARGS}
160
157
161
do-install:
158
do-install:
162
	cd ${WRKDIR}/lib ; \
159
.for L in ${OPENBLAS_LIBS}
163
	${INSTALL_DATA} ${OPENBLAS_LIBS:S|$|.a|} ${OPENBLAS_LIBS:S|$|.so.${OPENBLAS_SVER}|} \
160
	${INSTALL_DATA} ${WRKDIR}/lib/${L}.a ${STAGEDIR}${PREFIX}/lib
164
	${STAGEDIR}${PREFIX}/lib/
161
	${INSTALL_LIB} ${WRKDIR}/lib/${L}.so.${OPENBLAS_SVER} ${STAGEDIR}${PREFIX}/lib
165
	cd ${STAGEDIR}${PREFIX}/lib ; \
162
	${LN} -sf ${L}.so.${OPENBLAS_SVER} ${STAGEDIR}${PREFIX}/lib/${L}.so
166
	for i in ${OPENBLAS_LIBS:S|$|.so|}; do \
163
.endfor
167
		${LN} -sf $$i.${OPENBLAS_SVER} $$i ; \
168
	done
169
170
post-stage:
171
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libopenblas.so.0
172
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libopenblasp.so.0
173
164
174
.include <bsd.port.mk>
165
.include <bsd.port.mk>
(-)./distinfo (-2 / +2 lines)
Lines 1-5 Link Here
1
SHA256 (openblas/xianyi-OpenBLAS-v0.2.14_GH0.tar.gz) = 2411c4f56f477b42dff54db2b7ffc0b7cf53bb9778d54982595c64cc69c40fc1
1
SHA256 (openblas/xianyi-OpenBLAS-v0.2.15_GH0.tar.gz) = 73c40ace5978282224e5e122a41c8388c5a19e65a6f2329c2b7c0b61bacc9044
2
SIZE (openblas/xianyi-OpenBLAS-v0.2.14_GH0.tar.gz) = 9858070
2
SIZE (openblas/xianyi-OpenBLAS-v0.2.15_GH0.tar.gz) = 9966585
3
SHA256 (openblas/large.tgz) = f328d88b7fa97722f271d7d0cfea1c220e0f8e5ed5ff01d8ef1eb51d6f4243a1
3
SHA256 (openblas/large.tgz) = f328d88b7fa97722f271d7d0cfea1c220e0f8e5ed5ff01d8ef1eb51d6f4243a1
4
SIZE (openblas/large.tgz) = 2595
4
SIZE (openblas/large.tgz) = 2595
5
SHA256 (openblas/timing.tgz) = 999c65f8ea8bd4eac7f1c7f3463d4946917afd20a997807300fe35d70122f3af
5
SHA256 (openblas/timing.tgz) = 999c65f8ea8bd4eac7f1c7f3463d4946917afd20a997807300fe35d70122f3af
(-)./files/patch-Makefile (-3 / +3 lines)
Lines 1-6 Link Here
1
--- Makefile.orig	2013-07-27 01:21:05.000000000 +0900
1
--- Makefile.orig	2015-10-27 20:44:50 UTC
2
+++ Makefile	2013-07-27 01:22:18.000000000 +0900
2
+++ Makefile
3
@@ -228,7 +228,7 @@
3
@@ -238,7 +238,7 @@ ifndef NOFORTRAN
4
 	-@echo "LOADOPTS    = $(FFLAGS) $(EXTRALIB)" >> $(NETLIB_LAPACK_DIR)/make.inc
4
 	-@echo "LOADOPTS    = $(FFLAGS) $(EXTRALIB)" >> $(NETLIB_LAPACK_DIR)/make.inc
5
 	-@echo "CC          = $(CC)" >> $(NETLIB_LAPACK_DIR)/make.inc
5
 	-@echo "CC          = $(CC)" >> $(NETLIB_LAPACK_DIR)/make.inc
6
 	-@echo "override CFLAGS      = $(LAPACK_CFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc
6
 	-@echo "override CFLAGS      = $(LAPACK_CFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc
(-)./files/patch-Makefile.rule (-5 / +5 lines)
Lines 1-6 Link Here
1
--- Makefile.rule.orig	2012-02-05 16:36:05.000000000 +0900
1
--- Makefile.rule.orig	2015-10-27 20:44:50 UTC
2
+++ Makefile.rule	2012-02-05 16:36:23.000000000 +0900
2
+++ Makefile.rule
3
@@ -14,10 +14,10 @@
3
@@ -19,10 +19,10 @@ VERSION = 0.2.15
4
 
4
 
5
 # C compiler including binary type(32bit / 64bit). Default is gcc.
5
 # C compiler including binary type(32bit / 64bit). Default is gcc.
6
 # Don't use Intel Compiler or PGI, it won't generate right codes as I expect.
6
 # Don't use Intel Compiler or PGI, it won't generate right codes as I expect.
Lines 11-15 Link Here
11
-# FC = gfortran
11
-# FC = gfortran
12
+FC = %%FC%%
12
+FC = %%FC%%
13
 
13
 
14
 # Even you can specify cross compiler
14
 # Even you can specify cross compiler. Meanwhile, please set HOSTCC.
15
 # CC = x86_64-w64-mingw32-gcc
15
 
(-)./files/patch-Makefile.system (-6 / +6 lines)
Lines 1-6 Link Here
1
--- Makefile.system.orig	2014-12-04 00:14:21.000000000 +0900
1
--- Makefile.system.orig	2015-10-27 20:44:50 UTC
2
+++ Makefile.system	2015-02-23 05:27:11.000000000 +0900
2
+++ Makefile.system
3
@@ -199,6 +199,7 @@
3
@@ -218,6 +218,7 @@ MD5SUM = md5 -r
4
 endif
4
 endif
5
 
5
 
6
 ifeq ($(OSNAME), FreeBSD)
6
 ifeq ($(OSNAME), FreeBSD)
Lines 8-14 Link Here
8
 MD5SUM = md5 -r
8
 MD5SUM = md5 -r
9
 endif
9
 endif
10
 
10
 
11
@@ -981,15 +982,6 @@
11
@@ -1020,15 +1021,6 @@ ifndef LIBSUFFIX
12
 LIBSUFFIX = a
12
 LIBSUFFIX = a
13
 endif
13
 endif
14
 
14
 
Lines 24-30 Link Here
24
 ifndef SMP
24
 ifndef SMP
25
 LIBNAME		= $(LIBPREFIX)$(REVISION).$(LIBSUFFIX)
25
 LIBNAME		= $(LIBPREFIX)$(REVISION).$(LIBSUFFIX)
26
 LIBNAME_P	= $(LIBPREFIX)$(REVISION)_p.$(LIBSUFFIX)
26
 LIBNAME_P	= $(LIBPREFIX)$(REVISION)_p.$(LIBSUFFIX)
27
@@ -997,7 +989,6 @@
27
@@ -1036,7 +1028,6 @@ else
28
 LIBNAME		= $(LIBPREFIX)p$(REVISION).$(LIBSUFFIX)
28
 LIBNAME		= $(LIBPREFIX)p$(REVISION).$(LIBSUFFIX)
29
 LIBNAME_P	= $(LIBPREFIX)p$(REVISION)_p.$(LIBSUFFIX)
29
 LIBNAME_P	= $(LIBPREFIX)p$(REVISION)_p.$(LIBSUFFIX)
30
 endif
30
 endif
Lines 32-38 Link Here
32
 
32
 
33
 
33
 
34
 LIBDLLNAME   = $(LIBPREFIX).dll
34
 LIBDLLNAME   = $(LIBPREFIX).dll
35
@@ -1028,7 +1019,7 @@
35
@@ -1067,7 +1058,7 @@ LIB_COMPONENTS = CBLAS
36
 endif
36
 endif
37
 
37
 
38
 export OSNAME
38
 export OSNAME
(-)./files/patch-c_check (-3 / +3 lines)
Lines 1-6 Link Here
1
--- c_check.orig	2014-12-03 16:14:21.000000000 +0100
1
--- c_check.orig	2015-10-27 20:44:50 UTC
2
+++ c_check	2015-02-01 01:01:27.784108000 +0100
2
+++ c_check
3
@@ -228,7 +228,7 @@
3
@@ -235,7 +235,7 @@ open(CONFFILE, "> $config"  ) || die "Ca
4
 # print $data, "\n";
4
 # print $data, "\n";
5
 
5
 
6
 print MAKEFILE "OSNAME=$os\n";
6
 print MAKEFILE "OSNAME=$os\n";
(-)./files/patch-cpuid_ia64.c (-2 / +2 lines)
Lines 1-5 Link Here
1
--- cpuid_ia64.c.orig	2012-02-05 16:28:01.000000000 +0900
1
--- cpuid_ia64.c.orig	2015-10-27 20:44:50 UTC
2
+++ cpuid_ia64.c	2012-02-05 16:28:41.000000000 +0900
2
+++ cpuid_ia64.c
3
@@ -38,7 +38,9 @@
3
@@ -38,7 +38,9 @@
4
 
4
 
5
 #include <stdio.h>
5
 #include <stdio.h>
(-)./files/patch-cpuid_sparc.c (-3 / +3 lines)
Lines 1-6 Link Here
1
--- cpuid_sparc.c.orig	2012-02-05 16:29:26.000000000 +0900
1
--- cpuid_sparc.c.orig	2015-10-27 20:44:50 UTC
2
+++ cpuid_sparc.c	2012-02-05 16:29:45.000000000 +0900
2
+++ cpuid_sparc.c
3
@@ -49,6 +49,7 @@
3
@@ -49,6 +49,7 @@ void get_subdirname(void){
4
 }
4
 }
5
 
5
 
6
 void get_cpuconfig(void){
6
 void get_cpuconfig(void){
(-)./files/patch-driver_others_blas__server.c (+11 lines)
Line 0 Link Here
1
--- driver/others/blas_server.c.orig	2015-10-27 20:44:50 UTC
2
+++ driver/others/blas_server.c
3
@@ -70,7 +70,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF
4
 /*********************************************************************/
5
 
6
 #include "common.h"
7
-#if defined(OS_LINUX) || defined(OS_NETBSD) || defined(OS_DARWIN) || defined(OS_ANDROID)
8
+#if defined(OS_LINUX) || defined(OS_NETBSD) || defined(OS_DARWIN) || defined(OS_ANDROID) || defined(OS_FREEBSD)
9
 #include <dlfcn.h>
10
 #include <signal.h>
11
 #include <sys/resource.h>
(-)./files/patch-driver_others_memory.c (+12 lines)
Line 0 Link Here
1
--- driver/others/memory.c.orig	2015-10-27 20:44:50 UTC
2
+++ driver/others/memory.c
3
@@ -145,6 +145,9 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF
4
 #elif defined(OS_DARWIN) && defined(C_GCC)
5
 #define CONSTRUCTOR	__attribute__ ((constructor))
6
 #define DESTRUCTOR	__attribute__ ((destructor))
7
+#elif defined(OS_FREEBSD) && defined(C_GCC)
8
+#define CONSTRUCTOR	__attribute__ ((constructor))
9
+#define DESTRUCTOR	__attribute__ ((destructor))
10
 #else
11
 #define CONSTRUCTOR	__attribute__ ((constructor(101)))
12
 #define DESTRUCTOR	__attribute__ ((destructor(101)))
(-)./files/patch-exports+Makefile (-4 / +4 lines)
Lines 1-10 Link Here
1
--- exports/Makefile.orig	2012-11-27 08:24:53.000000000 +0900
1
--- exports/Makefile.orig	2015-10-27 20:44:50 UTC
2
+++ exports/Makefile	2012-11-28 01:24:49.000000000 +0900
2
+++ exports/Makefile
3
@@ -122,6 +122,7 @@
3
@@ -140,6 +140,7 @@ endif
4
 #http://stackoverflow.com/questions/7656425/makefile-ifeq-logical-or
4
 #http://stackoverflow.com/questions/7656425/makefile-ifeq-logical-or
5
 ifeq ($(OSNAME), $(filter $(OSNAME),FreeBSD NetBSD))
5
 ifeq ($(OSNAME), $(filter $(OSNAME),FreeBSD NetBSD))
6
 
6
 
7
+EXTRALIB += -lgfortran
7
+EXTRALIB += -lgfortran
8
 so : ../$(LIBSONAME)
8
 so : ../$(LIBSONAME)
9
 
9
 
10
 ../$(LIBSONAME) : ../$(LIBNAME) linux.def linktest.c
10
 ifeq (, $(SYMBOLPREFIX)$(SYMBOLSUFFIX))
(-)./files/patch-f_check (-4 / +4 lines)
Lines 1-6 Link Here
1
--- f_check.orig	2014-08-18 12:16:14.000000000 +0900
1
--- f_check.orig	2015-10-27 20:44:50 UTC
2
+++ f_check	2014-09-03 23:08:18.000000000 +0900
2
+++ f_check
3
@@ -259,7 +259,7 @@
3
@@ -261,7 +261,7 @@ if ($link ne "") {
4
 
4
 
5
     foreach $flags (@flags) {
5
     foreach $flags (@flags) {
6
 	if (
6
 	if (
Lines 9-15 Link Here
9
 	    && ($flags !~ /^-LIST:/)
9
 	    && ($flags !~ /^-LIST:/)
10
 	    && ($flags !~ /^-LANG:/)
10
 	    && ($flags !~ /^-LANG:/)
11
 	    ) {
11
 	    ) {
12
@@ -290,7 +290,7 @@
12
@@ -292,7 +292,7 @@ if ($link ne "") {
13
 	}
13
 	}
14
 
14
 
15
 	if (
15
 	if (

Return to bug 206886