View | Details | Raw Unified | Return to bug 174107
Collapse All | Expand All

(-)./Makefile (-27 / +23 lines)
Lines 1-8 Link Here
1
# Created by: Eijiro Shibusawa <ej-sib@ice.uec.ac.jp>
2
# $FreeBSD: ports/math/openblas/Makefile,v 1.4 2012/11/17 05:59:25 svnexp Exp $
3
4
PORTNAME=	openblas
1
PORTNAME=	openblas
5
PORTVERSION=	0.2.4
2
PORTVERSION=	0.2.5
6
CATEGORIES=	math
3
CATEGORIES=	math
7
MASTER_SITES=	https://github.com/${GH_USER}/${GH_PORTNAME}/tarball/${GH_VERSION}/ \
4
MASTER_SITES=	https://github.com/${GH_USER}/${GH_PORTNAME}/tarball/${GH_VERSION}/ \
8
		NL:lapack,lapack_tmg
5
		NL:lapack,lapack_tmg
Lines 21-27 Link Here
21
FETCH_ARGS=	-pRr
18
FETCH_ARGS=	-pRr
22
GH_USER=	xianyi
19
GH_USER=	xianyi
23
GH_PORTNAME=	OpenBLAS
20
GH_PORTNAME=	OpenBLAS
24
GH_REVISION=	3a26470
21
GH_REVISION=	e01b3d4
25
GH_VERSION=	v${PORTVERSION}
22
GH_VERSION=	v${PORTVERSION}
26
LAPACKVER=	3.4.2
23
LAPACKVER=	3.4.2
27
LAPACK_SRCFILE=	lapack-${LAPACKVER}.tgz
24
LAPACK_SRCFILE=	lapack-${LAPACKVER}.tgz
Lines 39-59 Link Here
39
PLIST_FILES=	${OPENBLAS_FILES:S|^|lib/|}
36
PLIST_FILES=	${OPENBLAS_FILES:S|^|lib/|}
40
37
41
MAKE_JOBS_SAFE=	yes
38
MAKE_JOBS_SAFE=	yes
42
WRKSRC=		${WRKDIR}/${GH_USER}-${GH_PORTNAME}-ea9a46c
39
WRKSRC=		${WRKDIR}/${GH_USER}-${GH_PORTNAME}-93dd133
40
41
OPTIONS_DEFINE=		DYNAMIC_ARCH INTERFACE64 OPENMP AVX
42
43
DYNAMIC_ARCH_DESC=	"Support multiple CPU types on i386 and amd64"
44
INTERFACE64_DESC=	"Use 8 byte integers on 64-bit architectures"
45
OPENMP_DESC=		"Use OpenMP for threading"
46
AVX_DESC=		"Support Advanced Vector Extensions (AVX)"
43
47
44
.if defined(PACKAGE_BUILDING)
48
.if defined(PACKAGE_BUILDING)
45
DYNAMIC_ARCH_DEFAULT=	on
49
OPTIONS_DEFAULT=	DYNAMIC_ARCH
46
.else
47
DYNAMIC_ARCH_DEFAULT=	off
48
.endif
50
.endif
49
51
50
OPTIONS=	DYNAMIC_ARCH	"Support multiple CPU types on i386 and amd64" \
52
.include <bsd.port.options.mk>
51
							${DYNAMIC_ARCH_DEFAULT} \
52
		INTERFACE64	"Use 8 byte integers on 64-bit architectures" off \
53
		OPENMP		"Use OpenMP for threading" off \
54
		AVX		"Support Advanced Vector Extensions (AVX)" off
55
56
.include <bsd.port.pre.mk>
57
53
58
.if defined(TARGET_CPU_ARCH)
54
.if defined(TARGET_CPU_ARCH)
59
BUILDFLAGS+=	TARGET=${TARGET_CPU_ARCH}
55
BUILDFLAGS+=	TARGET=${TARGET_CPU_ARCH}
Lines 67-94 Link Here
67
BUILDFLAGS+=	BINARY64=1
63
BUILDFLAGS+=	BINARY64=1
68
.endif
64
.endif
69
65
70
.if ! ( defined(WITH_DYNAMIC_ARCH) && ( ${ARCH} == "amd64" || ${ARCH} == "i386" ) )
66
.if ! ( ${PORT_OPTIONS:MDYNAMIC_ARCH} && ( ${ARCH} == "amd64" || ${ARCH} == "i386" ) )
71
MANUAL_PACKAGE_BUILD=	Optimizes for the build machine.
67
MANUAL_PACKAGE_BUILD=	Optimizes for the build machine.
72
.endif
68
.endif
73
69
74
.if defined(WITH_DYNAMIC_ARCH)
70
.if ${PORT_OPTIONS:MDYNAMIC_ARCH}
75
BUILDFLAGS+=	DYNAMIC_ARCH=1
71
BUILDFLAGS+=	DYNAMIC_ARCH=1
76
.endif
72
.endif
77
73
78
.if defined(WITH_INTERFACE64)
74
.if ${PORT_OPTIONS:MINTERFACE64}
79
BUILDFLAGS+=	INTERFACE64=1
75
BUILDFLAGS+=	INTERFACE64=1
80
.endif
76
.endif
81
77
82
.if defined(WITH_OPENMP)
78
.if ${PORT_OPTIONS:MOPENMP}
83
BUILDFLAGS+=	USE_OPENMP=1
79
BUILDFLAGS+=	USE_OPENMP=1
84
.endif
80
.endif
85
81
86
.if defined(WITH_QUAD_PRECISION)
82
.if ${PORT_OPTIONS:MQUAD_PRECISION}
87
BROKEN =	WITH_QUAD_PRECISION is broken; please disable this option
83
BROKEN =	QUAD_PRECISION is broken; please disable this option
88
BUILDFLAGS+=	QUAD_PRECISION=1
84
BUILDFLAGS+=	QUAD_PRECISION=1
89
.endif
85
.endif
90
86
91
.if ! ( defined(WITH_AVX) )
87
.if empty{PORT_OPTIONS:MAVX}
92
BUILDFLAGS+=	NO_AVX=1
88
BUILDFLAGS+=	NO_AVX=1
93
.endif
89
.endif
94
90
Lines 128-134 Link Here
128
	-e 's+$$(CROSS_SUFFIX)+${LOCALBASE}/bin/+' \
124
	-e 's+$$(CROSS_SUFFIX)+${LOCALBASE}/bin/+' \
129
	-e "s+%%LAPACKVER%%+${LAPACKVER}+g" \
125
	-e "s+%%LAPACKVER%%+${LAPACKVER}+g" \
130
		${WRKSRC}/Makefile.system
126
		${WRKSRC}/Makefile.system
131
.if defined(WITH_OPENMP)
127
.if ${PORT_OPTIONS:MOPENMP}
132
	${REINPLACE_CMD} -e "s+OPENBLAS_NUM_THREADS+OMP_NUM_THREADS+g" \
128
	${REINPLACE_CMD} -e "s+OPENBLAS_NUM_THREADS+OMP_NUM_THREADS+g" \
133
		${WRKSRC}/test/Makefile \
129
		${WRKSRC}/test/Makefile \
134
		${WRKSRC}/ctest/Makefile
130
		${WRKSRC}/ctest/Makefile
Lines 144-155 Link Here
144
	USE_THREAD=1 ${GMAKE} ${MAKE_ARGS}
140
	USE_THREAD=1 ${GMAKE} ${MAKE_ARGS}
145
	${CP} ${WRKSRC}/libopenblasp-${OPENBLAS_SUFX}.a ${WRKDIR}/lib/libopenblasp.a
141
	${CP} ${WRKSRC}/libopenblasp-${OPENBLAS_SUFX}.a ${WRKDIR}/lib/libopenblasp.a
146
	${CP} ${WRKSRC}/libopenblasp-${OPENBLAS_SUFX}.so ${WRKDIR}/lib/libopenblasp.so.${OPENBLAS_SVER}
142
	${CP} ${WRKSRC}/libopenblasp-${OPENBLAS_SUFX}.so ${WRKDIR}/lib/libopenblasp.so.${OPENBLAS_SVER}
147
.if !defined(WITH_DEBUG)
143
.if ${PORT_OPTIONS:MDEBUG}
148
	${LOCALBASE}/bin/strip -X ${WRKDIR}/lib/*.so.${OPENBLAS_SVER}
144
	${LOCALBASE}/bin/strip -X ${WRKDIR}/lib/*.so.${OPENBLAS_SVER}
149
.endif
145
.endif
150
146
151
BENCHMARK_MAXTHREADS?=	${MAXTHREADS}
147
BENCHMARK_MAXTHREADS?=	${MAXTHREADS}
152
.if defined(WITH_OPENMP)
148
.if ${PORT_OPTIONS:MOPENMP}
153
BENCHMARK_THREADS_FLAG =	OMP_NUM_THREADS=${BENCHMARK_MAXTHREADS}
149
BENCHMARK_THREADS_FLAG =	OMP_NUM_THREADS=${BENCHMARK_MAXTHREADS}
154
.else
150
.else
155
BENCHMARK_THREADS_FLAG =	OPENBLAS_NUM_THREADS=${BENCHMARK_MAXTHREADS}
151
BENCHMARK_THREADS_FLAG =	OPENBLAS_NUM_THREADS=${BENCHMARK_MAXTHREADS}
Lines 170-173 Link Here
170
		${LN} -sf $$i.${OPENBLAS_SVER} $$i ; \
166
		${LN} -sf $$i.${OPENBLAS_SVER} $$i ; \
171
	done
167
	done
172
168
173
.include <bsd.port.post.mk>
169
.include <bsd.port.mk>
(-)./distinfo (-2 / +2 lines)
Lines 1-5 Link Here
1
SHA256 (openblas/xianyi-OpenBLAS-v0.2.4-0-g3a26470.tar.gz) = e5f7a46da2b2b2fc82a905650df14d0a0562c52c8ef6d83db8fe91899275335a
1
SHA256 (openblas/xianyi-OpenBLAS-v0.2.5-0-ge01b3d4.tar.gz) = e5f097adc09d3384242e387ee39cc7710451e667273b4cb37c13f275e1da8650
2
SIZE (openblas/xianyi-OpenBLAS-v0.2.4-0-g3a26470.tar.gz) = 3249943
2
SIZE (openblas/xianyi-OpenBLAS-v0.2.5-0-ge01b3d4.tar.gz) = 3252581
3
SHA256 (openblas/lapack-3.4.2.tgz) = 60a65daaf16ec315034675942618a2230521ea7adf85eea788ee54841072faf0
3
SHA256 (openblas/lapack-3.4.2.tgz) = 60a65daaf16ec315034675942618a2230521ea7adf85eea788ee54841072faf0
4
SIZE (openblas/lapack-3.4.2.tgz) = 6168281
4
SIZE (openblas/lapack-3.4.2.tgz) = 6168281
5
SHA256 (openblas/large.tgz) = f328d88b7fa97722f271d7d0cfea1c220e0f8e5ed5ff01d8ef1eb51d6f4243a1
5
SHA256 (openblas/large.tgz) = f328d88b7fa97722f271d7d0cfea1c220e0f8e5ed5ff01d8ef1eb51d6f4243a1
(-)./files/patch-Makefile (-10 / +10 lines)
Lines 1-6 Link Here
1
--- Makefile.orig	2012-10-09 21:08:28.000000000 +0900
1
--- Makefile.orig	2012-11-27 08:24:53.000000000 +0900
2
+++ Makefile	2012-10-12 21:37:18.000000000 +0900
2
+++ Makefile	2012-11-28 01:13:31.000000000 +0900
3
@@ -201,7 +201,7 @@
3
@@ -203,7 +203,7 @@
4
 netlib : 
4
 netlib : 
5
 
5
 
6
 else
6
 else
Lines 9-15 Link Here
9
 ifndef NOFORTRAN
9
 ifndef NOFORTRAN
10
 	-@$(MAKE) -C $(NETLIB_LAPACK_DIR) lapacklib
10
 	-@$(MAKE) -C $(NETLIB_LAPACK_DIR) lapacklib
11
 endif
11
 endif
12
@@ -210,7 +210,7 @@
12
@@ -212,7 +212,7 @@
13
 endif
13
 endif
14
 endif
14
 endif
15
 
15
 
Lines 18-33 Link Here
18
 	-@$(MAKE) -C $(NETLIB_LAPACK_DIR) lapack_prof
18
 	-@$(MAKE) -C $(NETLIB_LAPACK_DIR) lapack_prof
19
 
19
 
20
 $(NETLIB_LAPACK_DIR)/make.inc :
20
 $(NETLIB_LAPACK_DIR)/make.inc :
21
@@ -223,7 +223,7 @@
21
@@ -229,7 +229,7 @@
22
 	-@echo "LOADOPTS    = $(FFLAGS) $(EXTRALIB)" >> $(NETLIB_LAPACK_DIR)/make.inc
22
 else
23
 	-@echo "CC          = $(CC)" >> $(NETLIB_LAPACK_DIR)/make.inc
24
 	-@echo "CFLAGS      = $(CFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc
23
 	-@echo "CFLAGS      = $(CFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc
24
 endif
25
-	-@echo "ARCH        = $(AR)" >> $(NETLIB_LAPACK_DIR)/make.inc
25
-	-@echo "ARCH        = $(AR)" >> $(NETLIB_LAPACK_DIR)/make.inc
26
+	-@echo "ARCH_       = $(AR)" >> $(NETLIB_LAPACK_DIR)/make.inc
26
+	-@echo "ARCH_       = $(AR)" >> $(NETLIB_LAPACK_DIR)/make.inc
27
 	-@echo "ARCHFLAGS   = -ru" >> $(NETLIB_LAPACK_DIR)/make.inc
27
 	-@echo "ARCHFLAGS   = -ru" >> $(NETLIB_LAPACK_DIR)/make.inc
28
 	-@echo "RANLIB      = $(RANLIB)" >> $(NETLIB_LAPACK_DIR)/make.inc
28
 	-@echo "RANLIB      = $(RANLIB)" >> $(NETLIB_LAPACK_DIR)/make.inc
29
 	-@echo "LAPACKLIB   = ../$(LIBNAME)" >> $(NETLIB_LAPACK_DIR)/make.inc
29
 	-@echo "LAPACKLIB   = ../$(LIBNAME)" >> $(NETLIB_LAPACK_DIR)/make.inc
30
@@ -235,24 +235,19 @@
30
@@ -241,24 +241,19 @@
31
 	-@cat  make.inc >> $(NETLIB_LAPACK_DIR)/make.inc
31
 	-@cat  make.inc >> $(NETLIB_LAPACK_DIR)/make.inc
32
 endif
32
 endif
33
 
33
 
Lines 59-65 Link Here
59
 ifndef NOFORTRAN
59
 ifndef NOFORTRAN
60
 #http://stackoverflow.com/questions/7656425/makefile-ifeq-logical-or
60
 #http://stackoverflow.com/questions/7656425/makefile-ifeq-logical-or
61
 ifeq ($(OSNAME), $(filter $(OSNAME),Darwin NetBSD))
61
 ifeq ($(OSNAME), $(filter $(OSNAME),Darwin NetBSD))
62
@@ -276,7 +271,7 @@
62
@@ -282,7 +277,7 @@
63
 	-wget http://www.netlib.org/lapack/timing/timing.tgz
63
 	-wget http://www.netlib.org/lapack/timing/timing.tgz
64
 endif
64
 endif
65
 
65
 
Lines 68-74 Link Here
68
 ifndef NOFORTRAN
68
 ifndef NOFORTRAN
69
 	(cd $(NETLIB_LAPACK_DIR); $(TAR) zxf ../timing.tgz TIMING)
69
 	(cd $(NETLIB_LAPACK_DIR); $(TAR) zxf ../timing.tgz TIMING)
70
 	(cd $(NETLIB_LAPACK_DIR)/TIMING; $(TAR) zxf ../../large.tgz )
70
 	(cd $(NETLIB_LAPACK_DIR)/TIMING; $(TAR) zxf ../../large.tgz )
71
@@ -314,4 +309,4 @@
71
@@ -320,4 +315,4 @@
72
 	rm -rf $(NETLIB_LAPACK_DIR) ;\
72
 	rm -rf $(NETLIB_LAPACK_DIR) ;\
73
 	fi
73
 	fi
74
 	@rm -f *.grd Makefile.conf_last config_last.h
74
 	@rm -f *.grd Makefile.conf_last config_last.h
(-)./files/patch-exports+Makefile (-6 / +6 lines)
Lines 1-10 Link Here
1
--- exports/Makefile.orig	2012-02-05 16:32:13.000000000 +0900
1
--- exports/Makefile.orig	2012-11-27 08:24:53.000000000 +0900
2
+++ exports/Makefile	2012-02-05 16:33:32.000000000 +0900
2
+++ exports/Makefile	2012-11-28 01:24:49.000000000 +0900
3
@@ -107,6 +107,7 @@
3
@@ -122,6 +122,7 @@
4
 endif
4
 #http://stackoverflow.com/questions/7656425/makefile-ifeq-logical-or
5
 ifeq ($(OSNAME), $(filter $(OSNAME),FreeBSD NetBSD))
5
 
6
 
6
 ifeq ($(OSNAME), FreeBSD)
7
+EXTRALIB += -lgfortran
7
+EXTRALIB += -lgfortran
8
 
9
 so : ../$(LIBSONAME)
8
 so : ../$(LIBSONAME)
10
 
9
 
10
 ../$(LIBSONAME) : ../$(LIBNAME) linux.def linktest.c
(-)./files/patch-exports+gensymbol (-4 / +5 lines)
Lines 1-13 Link Here
1
--- exports/gensymbol.orig	2012-07-08 21:47:12.000000000 +0900
1
--- exports/gensymbol.orig	2012-11-27 08:24:53.000000000 +0900
2
+++ exports/gensymbol	2012-07-08 21:48:26.000000000 +0900
2
+++ exports/gensymbol	2012-11-28 01:19:10.000000000 +0900
3
@@ -2666,10 +2666,7 @@
3
@@ -2666,11 +2666,7 @@
4
 		#LAPACKE_zlagsy_work,
4
 		#LAPACKE_zlagsy_work,
5
 		);
5
 		);
6
 
6
 
7
-if ($ARGV[5] == 1) {
7
-if ($ARGV[5] == 1) {
8
-	#NO_LAPACK=1
8
-	#NO_LAPACK=1
9
-	@underscore_objs = (@blasobjs, @misc_underscore_objs);
9
-	@underscore_objs = (@blasobjs, @misc_underscore_objs);
10
-} elsif (-d "../lapack-3.1.1" || -d "../lapack-3.4.0" || -d "../lapack-3.4.1") {
10
-} elsif (-d "../lapack-3.1.1" || -d "../lapack-3.4.0" || -d "../lapack-3.4.1" ||
11
-         -d "../lapack-3.4.2") {
11
+if (-d "../lapack-%%LAPACKVER%%") {
12
+if (-d "../lapack-%%LAPACKVER%%") {
12
     @underscore_objs = (@blasobjs, @lapackobjs, @lapackobjs2, @misc_underscore_objs);
13
     @underscore_objs = (@blasobjs, @lapackobjs, @lapackobjs2, @misc_underscore_objs);
13
 } else {
14
 } else {

Return to bug 174107