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

Collapse All | Expand All

(-)./Makefile (-8 / +9 lines)
Lines 6-12 Link Here
6
#
6
#
7
7
8
PORTNAME=	openblas
8
PORTNAME=	openblas
9
PORTVERSION=	0.1.a2.4
9
PORTVERSION=	0.1.a2.5
10
CATEGORIES=	math
10
CATEGORIES=	math
11
MASTER_SITES=	https://github.com/${GH_USER}/${GH_PORTNAME}/tarball/${GH_VERSION}/ \
11
MASTER_SITES=	https://github.com/${GH_USER}/${GH_PORTNAME}/tarball/${GH_VERSION}/ \
12
		NL:lapack,lapack_tmg
12
		NL:lapack,lapack_tmg
Lines 25-32 Link Here
25
FETCH_ARGS=	-pRr
25
FETCH_ARGS=	-pRr
26
GH_USER=	xianyi
26
GH_USER=	xianyi
27
GH_PORTNAME=	OpenBLAS
27
GH_PORTNAME=	OpenBLAS
28
GH_REVISION=	fe7a932
28
GH_REVISION=	fda39c6
29
GH_VERSION=	v0.1alpha2.4
29
GH_VERSION=	v0.1alpha2.5
30
LAPACKVER=	3.4.0
30
LAPACKVER=	3.4.0
31
LAPACK_SRCFILE=	lapack-${LAPACKVER}.tgz
31
LAPACK_SRCFILE=	lapack-${LAPACKVER}.tgz
32
LARGE_FILE=	large.tgz
32
LARGE_FILE=	large.tgz
Lines 42-48 Link Here
42
PLIST_FILES=	${OPENBLAS_FILES:S|^|lib/|}
42
PLIST_FILES=	${OPENBLAS_FILES:S|^|lib/|}
43
43
44
MAKE_JOBS_SAFE=	yes
44
MAKE_JOBS_SAFE=	yes
45
WRKSRC=		${WRKDIR}/${GH_USER}-${GH_PORTNAME}-92ba8a7
45
WRKSRC=		${WRKDIR}/${GH_USER}-${GH_PORTNAME}-9dcea60
46
46
47
.if defined(PACKAGE_BUILDING)
47
.if defined(PACKAGE_BUILDING)
48
DYNAMIC_ARCH_DEFAULT=	on
48
DYNAMIC_ARCH_DEFAULT=	on
Lines 94-99 Link Here
94
	cd ${DISTDIR}/${DIST_SUBDIR} ; \
94
	cd ${DISTDIR}/${DIST_SUBDIR} ; \
95
	${CP} ${LAPACK_SRCFILE} ${LARGE_FILE} ${TIMING_FILE} ${WRKSRC}
95
	${CP} ${LAPACK_SRCFILE} ${LARGE_FILE} ${TIMING_FILE} ${WRKSRC}
96
	${MKDIR} ${WRKDIR}/lib
96
	${MKDIR} ${WRKDIR}/lib
97
	${RM} ${WRKSRC}/patch.for_lapack-3.4.0
97
98
98
post-patch:
99
post-patch:
99
	${REINPLACE_CMD} -e "s+%%FC%%+${FC}+" -e "s+%%CC%%+${CC}+" \
100
	${REINPLACE_CMD} -e "s+%%FC%%+${FC}+" -e "s+%%CC%%+${CC}+" \
Lines 127-139 Link Here
127
do-build:
128
do-build:
128
	cd ${WRKSRC} ; ${SETENV} ${BUILDFLAGS} NUM_THREADS=1 USE_THREAD=0 \
129
	cd ${WRKSRC} ; ${SETENV} ${BUILDFLAGS} NUM_THREADS=1 USE_THREAD=0 \
129
	${GMAKE} ${MAKE_ARGS}
130
	${GMAKE} ${MAKE_ARGS}
130
	${CP} ${WRKSRC}/libopenblas-r0.1alpha2.4.a ${WRKDIR}/lib/libopenblas.a
131
	${CP} ${WRKSRC}/libopenblas-r0.1alpha2.5.a ${WRKDIR}/lib/libopenblas.a
131
	${CP} ${WRKSRC}/libopenblas-r0.1alpha2.4.so ${WRKDIR}/lib/libopenblas.so.${OPENBLAS_SVER}
132
	${CP} ${WRKSRC}/libopenblas-r0.1alpha2.5.so ${WRKDIR}/lib/libopenblas.so.${OPENBLAS_SVER}
132
	cd ${WRKSRC} ; ${GMAKE} ${MAKE_ARGS} clean
133
	cd ${WRKSRC} ; ${GMAKE} ${MAKE_ARGS} clean
133
	cd ${WRKSRC} ; ${SETENV} ${BUILDFLAGS} NUM_THREADS=${MAXTHREADS} \
134
	cd ${WRKSRC} ; ${SETENV} ${BUILDFLAGS} NUM_THREADS=${MAXTHREADS} \
134
	USE_THREAD=1 ${GMAKE} ${MAKE_ARGS}
135
	USE_THREAD=1 ${GMAKE} ${MAKE_ARGS}
135
	${CP} ${WRKSRC}/libopenblasp-r0.1alpha2.4.a ${WRKDIR}/lib/libopenblasp.a
136
	${CP} ${WRKSRC}/libopenblasp-r0.1alpha2.5.a ${WRKDIR}/lib/libopenblasp.a
136
	${CP} ${WRKSRC}/libopenblasp-r0.1alpha2.4.so ${WRKDIR}/lib/libopenblasp.so.${OPENBLAS_SVER}
137
	${CP} ${WRKSRC}/libopenblasp-r0.1alpha2.5.so ${WRKDIR}/lib/libopenblasp.so.${OPENBLAS_SVER}
137
.if !defined(WITH_DEBUG)
138
.if !defined(WITH_DEBUG)
138
	${LOCALBASE}/bin/strip -X ${WRKDIR}/lib/*.so.${OPENBLAS_SVER}
139
	${LOCALBASE}/bin/strip -X ${WRKDIR}/lib/*.so.${OPENBLAS_SVER}
139
.endif
140
.endif
(-)./distinfo (-2 / +2 lines)
Lines 1-5 Link Here
1
SHA256 (openblas/xianyi-OpenBLAS-v0.1alpha2.4-0-gfe7a932.tar.gz) = 95e0beab5cede658c075e32ec7ad10fa7e1c4cbdf69b03743e54bd67e27766c7
1
SHA256 (openblas/xianyi-OpenBLAS-v0.1alpha2.5-0-gfda39c6.tar.gz) = a2f13bebcd0b7e9968e216c6e772ac88784ff3a1ac779272198efd5d81b14741
2
SIZE (openblas/xianyi-OpenBLAS-v0.1alpha2.4-0-gfe7a932.tar.gz) = 3077836
2
SIZE (openblas/xianyi-OpenBLAS-v0.1alpha2.5-0-gfda39c6.tar.gz) = 3092361
3
SHA256 (openblas/lapack-3.4.0.tgz) = a7139ef97004d0e3c4c30f1c52d508fd7ae84b5fbaf0dd8e792c167dc306c3e9
3
SHA256 (openblas/lapack-3.4.0.tgz) = a7139ef97004d0e3c4c30f1c52d508fd7ae84b5fbaf0dd8e792c167dc306c3e9
4
SIZE (openblas/lapack-3.4.0.tgz) = 6127787
4
SIZE (openblas/lapack-3.4.0.tgz) = 6127787
5
SHA256 (openblas/large.tgz) = f328d88b7fa97722f271d7d0cfea1c220e0f8e5ed5ff01d8ef1eb51d6f4243a1
5
SHA256 (openblas/large.tgz) = f328d88b7fa97722f271d7d0cfea1c220e0f8e5ed5ff01d8ef1eb51d6f4243a1
(-)./files/patch-Makefile (-44 / +44 lines)
Lines 1-5 Link Here
1
--- Makefile.orig	2011-09-18 17:57:28.000000000 +0900
1
--- Makefile.orig	2012-03-04 22:09:49.000000000 +0900
2
+++ Makefile	2012-02-12 21:30:02.000000000 +0900
2
+++ Makefile	2012-03-04 22:15:17.000000000 +0900
3
@@ -34,7 +34,7 @@
3
@@ -34,7 +34,7 @@
4
 	@echo " OpenBLAS build complete."
4
 	@echo " OpenBLAS build complete."
5
 	@echo
5
 	@echo
Lines 9-48 Link Here
9
 ifndef BINARY64
9
 ifndef BINARY64
10
 	@echo "  BINARY           ... 32bit                 "
10
 	@echo "  BINARY           ... 32bit                 "
11
 else
11
 else
12
@@ -195,47 +195,42 @@
12
@@ -202,47 +202,42 @@
13
 netlib : 
13
 netlib : 
14
 
14
 
15
 else
15
 else
16
-netlib : lapack-3.1.1 patch.for_lapack-3.1.1 lapack-3.1.1/make.inc
16
-netlib : lapack-3.4.0 patch.for_lapack-3.4.0 lapack-3.4.0/make.inc
17
+netlib : lapack-%%LAPACKVER%% patch.for_lapack-%%LAPACKVER%% lapack-%%LAPACKVER%%/make.inc
17
+netlib : lapack-%%LAPACKVER%% patch.for_lapack-%%LAPACKVER%% lapack-%%LAPACKVER%%/make.inc
18
 ifndef NOFORTRAN
18
 ifndef NOFORTRAN
19
-	-@$(MAKE) -C lapack-3.1.1 lapacklib
19
-	-@$(MAKE) -C lapack-3.4.0 lapacklib
20
+	-@$(MAKE) -C lapack-%%LAPACKVER%% lapacklib
20
+	-@$(MAKE) -C lapack-%%LAPACKVER%% lapacklib
21
 endif
21
 endif
22
 endif
22
 endif
23
 
23
 
24
-prof_lapack : lapack-3.1.1 lapack-3.1.1/make.inc
24
-prof_lapack : lapack-3.4.0 lapack-3.4.0/make.inc
25
-	-@$(MAKE) -C lapack-3.1.1 lapack_prof
25
-	-@$(MAKE) -C lapack-3.4.0 lapack_prof
26
+prof_lapack : lapack-%%LAPACKVER%% lapack-%%LAPACKVER%%/make.inc
26
+prof_lapack : lapack-%%LAPACKVER%% lapack-%%LAPACKVER%%/make.inc
27
+	-@$(MAKE) -C lapack-%%LAPACKVER%% lapack_prof
27
+	-@$(MAKE) -C lapack-%%LAPACKVER%% lapack_prof
28
 
28
 
29
-lapack-3.1.1/make.inc :
29
-lapack-3.4.0/make.inc :
30
+lapack-%%LAPACKVER%%/make.inc :
30
+lapack-%%LAPACKVER%%/make.inc :
31
 ifndef NOFORTRAN
31
 ifndef NOFORTRAN
32
-	-@echo "FORTRAN   = $(FC)" > lapack-3.1.1/make.inc
32
-	-@echo "FORTRAN   = $(FC)" > lapack-3.4.0/make.inc
33
-	-@echo "OPTS      = $(FFLAGS)" >> lapack-3.1.1/make.inc
33
-	-@echo "OPTS      = $(FFLAGS)" >> lapack-3.4.0/make.inc
34
-	-@echo "POPTS     = $(FPFLAGS)" >> lapack-3.1.1/make.inc
34
-	-@echo "POPTS     = $(FPFLAGS)" >> lapack-3.4.0/make.inc
35
-	-@echo "NOOPT     = $(FFLAGS) -O0" >> lapack-3.1.1/make.inc
35
-	-@echo "NOOPT     = $(FFLAGS) -O0" >> lapack-3.4.0/make.inc
36
-	-@echo "PNOOPT     = $(FPFLAGS) -O0" >> lapack-3.1.1/make.inc
36
-	-@echo "PNOOPT     = $(FPFLAGS) -O0" >> lapack-3.4.0/make.inc
37
-	-@echo "LOADOPTS  = $(FFLAGS) $(EXTRALIB)" >> lapack-3.1.1/make.inc
37
-	-@echo "LOADOPTS  = $(FFLAGS) $(EXTRALIB)" >> lapack-3.4.0/make.inc
38
-	-@echo "ARCH      = $(AR)" >> lapack-3.1.1/make.inc
38
-	-@echo "ARCH      = $(AR)" >> lapack-3.4.0/make.inc
39
-	-@echo "RANLIB    = $(RANLIB)" >> lapack-3.1.1/make.inc
39
-	-@echo "RANLIB    = $(RANLIB)" >> lapack-3.4.0/make.inc
40
-	-@echo "LAPACKLIB = ../$(LIBNAME)" >> lapack-3.1.1/make.inc
40
-	-@echo "LAPACKLIB = ../$(LIBNAME)" >> lapack-3.4.0/make.inc
41
-	-@echo "LAPACKLIB_P = ../$(LIBNAME_P)" >> lapack-3.1.1/make.inc
41
-	-@echo "LAPACKLIB_P = ../$(LIBNAME_P)" >> lapack-3.4.0/make.inc
42
-	-@echo "SUFFIX     = $(SUFFIX)" >> lapack-3.1.1/make.inc
42
-	-@echo "SUFFIX     = $(SUFFIX)" >> lapack-3.4.0/make.inc
43
-	-@echo "PSUFFIX    = $(PSUFFIX)" >> lapack-3.1.1/make.inc
43
-	-@echo "PSUFFIX    = $(PSUFFIX)" >> lapack-3.4.0/make.inc
44
-#	-@echo "CEXTRALIB  = $(CEXTRALIB)" >> lapack-3.1.1/make.inc
44
-#	-@echo "CEXTRALIB  = $(CEXTRALIB)" >> lapack-3.4.0/make.inc
45
-	-@cat  make.inc >> lapack-3.1.1/make.inc
45
-	-@cat  make.inc >> lapack-3.4.0/make.inc
46
+	-@echo "FORTRAN   = $(FC)" > lapack-%%LAPACKVER%%/make.inc
46
+	-@echo "FORTRAN   = $(FC)" > lapack-%%LAPACKVER%%/make.inc
47
+	-@echo "OPTS      = $(FFLAGS)" >> lapack-%%LAPACKVER%%/make.inc
47
+	-@echo "OPTS      = $(FFLAGS)" >> lapack-%%LAPACKVER%%/make.inc
48
+	-@echo "POPTS     = $(FPFLAGS)" >> lapack-%%LAPACKVER%%/make.inc
48
+	-@echo "POPTS     = $(FPFLAGS)" >> lapack-%%LAPACKVER%%/make.inc
Lines 59-97 Link Here
59
+	-@cat  make.inc >> lapack-%%LAPACKVER%%/make.inc
59
+	-@cat  make.inc >> lapack-%%LAPACKVER%%/make.inc
60
 endif
60
 endif
61
 
61
 
62
-lapack-3.1.1 : lapack-3.1.1.tgz
62
-lapack-3.4.0 : lapack-3.4.0.tgz
63
+lapack-%%LAPACKVER%% : lapack-%%LAPACKVER%%.tgz
63
+lapack-%%LAPACKVER%% : lapack-%%LAPACKVER%%.tgz
64
 ifndef NOFORTRAN
64
 ifndef NOFORTRAN
65
-	@if test `$(MD5SUM) lapack-3.1.1.tgz | $(AWK) '{print $$1}'` = 00b21551a899bcfbaa7b8443e1faeef9; then \
65
-	@if test `$(MD5SUM) lapack-3.4.0.tgz | $(AWK) '{print $$1}'` = 02d5706ec03ba885fc246e5fa10d8c70; then \
66
-		echo $(TAR) zxf $< ;\
66
-		echo $(TAR) zxf $< ;\
67
-		$(TAR) zxf $< && (cd lapack-3.1.1; $(PATCH) -p1 < ../patch.for_lapack-3.1.1) ;\
67
-		$(TAR) zxf $< && (cd lapack-3.4.0; $(PATCH) -p1 < ../patch.for_lapack-3.4.0) ;\
68
-	else \
68
-	else \
69
-		echo "	lapack-3.1.1.tgz check sum is wrong (Please use orignal)." ;\
69
-		echo "	lapack-3.4.0.tgz check sum is wrong (Please use orignal)." ;\
70
-		rm -rf lapack-3.1.1 ;\
70
-		rm -rf lapack-3.4.0 ;\
71
-	fi
71
-	fi
72
+	echo $(TAR) zxf $< ;\
72
+	echo $(TAR) zxf $< ;\
73
+	$(TAR) zxf $< && (cd lapack-%%LAPACKVER%%; $(PATCH) -p1 < ../patch.for_lapack-%%LAPACKVER%%)
73
+	$(TAR) zxf $< && (cd lapack-%%LAPACKVER%%; $(PATCH) -p1 < ../patch.for_lapack-%%LAPACKVER%%)
74
 endif
74
 endif
75
 
75
 
76
-lapack-3.1.1.tgz :
76
-lapack-3.4.0.tgz :
77
+lapack-%%LAPACKVER%%.tgz :
77
+lapack-%%LAPACKVER%%.tgz :
78
 ifndef NOFORTRAN
78
 ifndef NOFORTRAN
79
-	-wget http://www.netlib.org/lapack/lapack-3.1.1.tgz
79
-	-wget http://www.netlib.org/lapack/lapack-3.4.0.tgz
80
+	-wget http://www.netlib.org/lapack/lapack-%%LAPACKVER%%.tgz
80
+	-wget http://www.netlib.org/lapack/lapack-%%LAPACKVER%%.tgz
81
 endif
81
 endif
82
 
82
 
83
 large.tgz : 
83
 large.tgz : 
84
@@ -248,21 +243,21 @@
84
@@ -255,21 +250,21 @@
85
 	-wget http://www.netlib.org/lapack/timing/timing.tgz
85
 	-wget http://www.netlib.org/lapack/timing/timing.tgz
86
 endif
86
 endif
87
 
87
 
88
-lapack-timing : lapack-3.1.1 large.tgz timing.tgz
88
-lapack-timing : lapack-3.4.0 large.tgz timing.tgz
89
+lapack-timing : lapack-%%LAPACKVER%% large.tgz timing.tgz
89
+lapack-timing : lapack-%%LAPACKVER%% large.tgz timing.tgz
90
 ifndef NOFORTRAN
90
 ifndef NOFORTRAN
91
-	(cd lapack-3.1.1; $(TAR) zxf ../timing.tgz TIMING)
91
-	(cd lapack-3.4.0; $(TAR) zxf ../timing.tgz TIMING)
92
-	(cd lapack-3.1.1/TIMING; $(TAR) zxf ../../large.tgz )
92
-	(cd lapack-3.4.0/TIMING; $(TAR) zxf ../../large.tgz )
93
-	make -C lapack-3.1.1 tmglib
93
-	make -C lapack-3.4.0 tmglib
94
-	make -C lapack-3.1.1/TIMING
94
-	make -C lapack-3.4.0/TIMING
95
+	(cd lapack-%%LAPACKVER%%; $(TAR) zxf ../timing.tgz TIMING)
95
+	(cd lapack-%%LAPACKVER%%; $(TAR) zxf ../timing.tgz TIMING)
96
+	(cd lapack-%%LAPACKVER%%/TIMING; $(TAR) zxf ../../large.tgz )
96
+	(cd lapack-%%LAPACKVER%%/TIMING; $(TAR) zxf ../../large.tgz )
97
+	make -C lapack-%%LAPACKVER%% tmglib
97
+	make -C lapack-%%LAPACKVER%% tmglib
Lines 100-110 Link Here
100
 
100
 
101
 
101
 
102
 lapack-test :
102
 lapack-test :
103
-	$(MAKE) -C lapack-3.1.1 tmglib
103
-	$(MAKE) -C lapack-3.4.0 tmglib
104
-	$(MAKE) -C lapack-3.1.1/TESTING xeigtstc xeigtstd xeigtsts xeigtstz xlintstc xlintstd xlintstds xlintsts xlintstz xlintstzc
104
-	$(MAKE) -C lapack-3.4.0/TESTING xeigtstc xeigtstd xeigtsts xeigtstz xlintstc xlintstd xlintstds xlintsts xlintstz xlintstzc
105
-	@rm	-f lapack-3.1.1/TESTING/*.out
105
-	@rm	-f lapack-3.4.0/TESTING/*.out
106
-	$(MAKE) -j 1 -C lapack-3.1.1/TESTING
106
-	$(MAKE) -j 1 -C lapack-3.4.0/TESTING
107
-	$(GREP) failed lapack-3.1.1/TESTING/*.out
107
-	$(GREP) failed lapack-3.4.0/TESTING/*.out
108
+	$(MAKE) -C lapack-%%LAPACKVER%% tmglib
108
+	$(MAKE) -C lapack-%%LAPACKVER%% tmglib
109
+	$(MAKE) -C lapack-%%LAPACKVER%%/TESTING xeigtstc xeigtstd xeigtsts xeigtstz xlintstc xlintstd xlintstds xlintsts xlintstz xlintstzc
109
+	$(MAKE) -C lapack-%%LAPACKVER%%/TESTING xeigtstc xeigtstd xeigtsts xeigtstz xlintstc xlintstd xlintstds xlintsts xlintstz xlintstzc
110
+	@rm	-f lapack-%%LAPACKVER%%/TESTING/*.out
110
+	@rm	-f lapack-%%LAPACKVER%%/TESTING/*.out
Lines 113-125 Link Here
113
 
113
 
114
 dummy :
114
 dummy :
115
 
115
 
116
@@ -280,9 +275,10 @@
116
@@ -287,9 +282,10 @@
117
 #endif
117
 #endif
118
 	@rm -f *.$(LIBSUFFIX) *.so *~ *.exe getarch getarch_2nd *.dll *.lib *.$(SUFFIX) *.dwf libopenblas.$(LIBSUFFIX) libopenblas_p.$(LIBSUFFIX) *.lnk myconfig.h
118
 	@rm -f *.$(LIBSUFFIX) *.so *~ *.exe getarch getarch_2nd *.dll *.lib *.$(SUFFIX) *.dwf libopenblas.$(LIBSUFFIX) libopenblas_p.$(LIBSUFFIX) *.lnk myconfig.h
119
 	@rm -f Makefile.conf config.h Makefile_kernel.conf config_kernel.h st* *.dylib
119
 	@rm -f Makefile.conf config.h Makefile_kernel.conf config_kernel.h st* *.dylib
120
-	@if test -d lapack-3.1.1; then \
120
-	@if test -d lapack-3.4.0; then \
121
-	echo deleting lapack-3.1.1; \
121
-	echo deleting lapack-3.4.0; \
122
-	rm -rf lapack-3.1.1 ;\
122
-	rm -rf lapack-3.4.0 ;\
123
+	@if test -d lapack-%%LAPACKVER%%; then \
123
+	@if test -d lapack-%%LAPACKVER%%; then \
124
+	echo deleting lapack-%%LAPACKVER%%; \
124
+	echo deleting lapack-%%LAPACKVER%%; \
125
+	rm -rf lapack-%%LAPACKVER%% ;\
125
+	rm -rf lapack-%%LAPACKVER%% ;\
(-)./pkg-descr (-4 / +3 lines)
Lines 2-10 Link Here
2
OpenBLAS is an open source project supported by
2
OpenBLAS is an open source project supported by
3
Lab of Parallel Software and Computational Science, ISCAS.
3
Lab of Parallel Software and Computational Science, ISCAS.
4
4
5
NOTE: OpenBLAS cannot automatically detect CPU
5
NOTE: If you want to specify your CPU microarchitecture manually,
6
based on "Sandy Bridge" microarchitecture. 
6
please use TARGET_CPU_ARCH knob, e.g., "make TARGET_CPU_ARCH=NEHALEM".
7
If you use this processor, please specify set TARGET build flag,
7
This value is set TARGET build flag.
8
e.g., "make TARGET_CPU_ARCH=NEHALEM".
9
8
10
WWW: https://github.com/xianyi/OpenBLAS
9
WWW: https://github.com/xianyi/OpenBLAS

Return to bug 165684