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

(-)./Makefile (-21 / +19 lines)
Lines 2-14 Link Here
2
# $FreeBSD: math/openblas/Makefile 313419 2013-03-04 19:16:36Z pawel $
2
# $FreeBSD: math/openblas/Makefile 313419 2013-03-04 19:16:36Z pawel $
3
3
4
PORTNAME=	openblas
4
PORTNAME=	openblas
5
PORTVERSION=	0.2.6
5
PORTVERSION=	0.2.7
6
CATEGORIES=	math
6
CATEGORIES=	math
7
MASTER_SITES=	https://github.com/${GH_USER}/${GH_PORTNAME}/tarball/${GH_VERSION}/ \
7
MASTER_SITES=	https://codeload.github.com/${GH_ACCOUNT}/${GH_PROJECT}/legacy.tar.gz/${GH_TAGNAME}?dummy=/:${PORTNAME} \
8
		NL:lapack,lapack_tmg
8
		NL:lapack_tmg
9
MASTER_SITE_SUBDIR=	lapack/:lapack lapack/timing/:lapack_tmg
9
MASTER_SITE_SUBDIR=	lapack/timing/:lapack_tmg
10
DISTFILES=	${GH_USER}-${GH_PORTNAME}-${GH_VERSION}-0-g${GH_REVISION}${EXTRACT_SUFX} \
10
DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:${PORTNAME} \
11
		lapack-${LAPACKVER}.tgz:lapack \
12
		large.tgz:lapack_tmg timing.tgz:lapack_tmg
11
		large.tgz:lapack_tmg timing.tgz:lapack_tmg
13
12
14
MAINTAINER=	phd_kimberlite@yahoo.co.jp
13
MAINTAINER=	phd_kimberlite@yahoo.co.jp
Lines 18-30 Link Here
18
LICENSE_FILE=	${WRKSRC}/LICENSE
17
LICENSE_FILE=	${WRKSRC}/LICENSE
19
18
20
DIST_SUBDIR=	openblas
19
DIST_SUBDIR=	openblas
21
FETCH_ARGS=	-pRr
20
FETCH_ARGS=	-Fpr
22
GH_USER=	xianyi
21
GH_ACCOUNT=	xianyi
23
GH_PORTNAME=	OpenBLAS
22
GH_PROJECT=	OpenBLAS
24
GH_REVISION=	54e7b37
23
#GH_TAGNAME=	v0.2.7
25
GH_VERSION=	v${PORTVERSION}
24
GH_TAGNAME=	${GH_COMMIT}
26
LAPACKVER=	3.4.2
25
GH_COMMIT=	f26b7a0
27
LAPACK_SRCFILE=	lapack-${LAPACKVER}.tgz
28
LARGE_FILE=	large.tgz
26
LARGE_FILE=	large.tgz
29
TIMING_FILE=	timing.tgz
27
TIMING_FILE=	timing.tgz
30
28
Lines 39-45 Link Here
39
PLIST_FILES=	${OPENBLAS_FILES:S|^|lib/|}
37
PLIST_FILES=	${OPENBLAS_FILES:S|^|lib/|}
40
38
41
MAKE_JOBS_SAFE=	yes
39
MAKE_JOBS_SAFE=	yes
42
WRKSRC=		${WRKDIR}/${GH_USER}-${GH_PORTNAME}-87b4d0c
40
WRKSRC=		${WRKDIR}/${GH_ACCOUNT}-${GH_PROJECT}-${GH_TAGNAME}
43
41
44
OPTIONS_DEFINE=		DYNAMIC_ARCH INTERFACE64 OPENMP AVX
42
OPTIONS_DEFINE=		DYNAMIC_ARCH INTERFACE64 OPENMP AVX
45
43
Lines 92-99 Link Here
92
.endif
90
.endif
93
91
94
post-extract:
92
post-extract:
95
	cd ${DISTDIR}/${DIST_SUBDIR} ; \
93
#	cd ${DISTDIR}/${DIST_SUBDIR} ; \
96
	${CP} ${LAPACK_SRCFILE} ${LARGE_FILE} ${TIMING_FILE} ${WRKSRC}
94
#	${CP} ${LAPACK_SRCFILE} ${LARGE_FILE} ${TIMING_FILE} ${WRKSRC}
97
	${MKDIR} ${WRKDIR}/lib
95
	${MKDIR} ${WRKDIR}/lib
98
96
99
post-patch:
97
post-patch:
Lines 103-112 Link Here
103
		${WRKSRC}/Makefile
101
		${WRKSRC}/Makefile
104
	${REINPLACE_CMD} -e "s+%%FC%%+${FC}+" -e "s+%%CC%%+${CC}+" \
102
	${REINPLACE_CMD} -e "s+%%FC%%+${FC}+" -e "s+%%CC%%+${CC}+" \
105
		${WRKSRC}/Makefile.rule
103
		${WRKSRC}/Makefile.rule
106
	${REINPLACE_CMD} -e "s+%%LAPACKVER%%+${LAPACKVER}+g" \
107
		${WRKSRC}/Makefile
108
	${REINPLACE_CMD} -e "s+%%LAPACKVER%%+${LAPACKVER}+g" \
109
		${WRKSRC}/exports/gensymbol
110
	${REINPLACE_CMD} -e "s+(ARCH)+(ARCH_)+" \
104
	${REINPLACE_CMD} -e "s+(ARCH)+(ARCH_)+" \
111
		${WRKSRC}/Makefile.rule \
105
		${WRKSRC}/Makefile.rule \
112
		${WRKSRC}/Makefile.tail \
106
		${WRKSRC}/Makefile.tail \
Lines 117-122 Link Here
117
		${WRKSRC}/kernel/Makefile \
111
		${WRKSRC}/kernel/Makefile \
118
		${WRKSRC}/kernel/Makefile.L3 \
112
		${WRKSRC}/kernel/Makefile.L3 \
119
		${WRKSRC}/lapack/laswp/Makefile \
113
		${WRKSRC}/lapack/laswp/Makefile \
114
		${WRKSRC}/lapack-netlib/SRC/Makefile \
115
		${WRKSRC}/lapack-netlib/SRC/VARIANTS/Makefile \
116
		${WRKSRC}/lapack-netlib/TESTING/MATGEN/Makefile \
117
		${WRKSRC}/lapack-netlib/lapacke/src/Makefile \
118
		${WRKSRC}/lapack-netlib/lapacke/utils/Makefile \
120
		${WRKSRC}/reference/Makefile
119
		${WRKSRC}/reference/Makefile
121
	${REINPLACE_CMD} -e "s+(ARCH)+(ARCH_)+" \
120
	${REINPLACE_CMD} -e "s+(ARCH)+(ARCH_)+" \
122
	-e 's+%%LOCALBASE%%+${LOCALBASE}+' \
121
	-e 's+%%LOCALBASE%%+${LOCALBASE}+' \
Lines 125-131 Link Here
125
	-e 's+%%REINPLACE_CMD%%+${REINPLACE_CMD}+' \
124
	-e 's+%%REINPLACE_CMD%%+${REINPLACE_CMD}+' \
126
	-e 's+%%_GCC_BUILD_DEPENDS%%+${_GCC_BUILD_DEPENDS}+' \
125
	-e 's+%%_GCC_BUILD_DEPENDS%%+${_GCC_BUILD_DEPENDS}+' \
127
	-e 's+$$(CROSS_SUFFIX)+${LOCALBASE}/bin/+' \
126
	-e 's+$$(CROSS_SUFFIX)+${LOCALBASE}/bin/+' \
128
	-e "s+%%LAPACKVER%%+${LAPACKVER}+g" \
129
		${WRKSRC}/Makefile.system
127
		${WRKSRC}/Makefile.system
130
.if ${PORT_OPTIONS:MOPENMP}
128
.if ${PORT_OPTIONS:MOPENMP}
131
	${REINPLACE_CMD} -e "s+OPENBLAS_NUM_THREADS+OMP_NUM_THREADS+g" \
129
	${REINPLACE_CMD} -e "s+OPENBLAS_NUM_THREADS+OMP_NUM_THREADS+g" \
(-)./distinfo (-4 / +2 lines)
Lines 1-7 Link Here
1
SHA256 (openblas/xianyi-OpenBLAS-v0.2.6-0-g54e7b37.tar.gz) = f14fed709343a40d32bdfe2c1a0b2e874ef7514661930a20afe8e7e2436b4440
1
SHA256 (openblas/openblas-0.2.7.tar.gz) = cfe5ea93098318dd2c09d865b2f849187c82d0880b9c75970aa5a80ef49fd06a
2
SIZE (openblas/xianyi-OpenBLAS-v0.2.6-0-g54e7b37.tar.gz) = 3259286
2
SIZE (openblas/openblas-0.2.7.tar.gz) = 9469551
3
SHA256 (openblas/lapack-3.4.2.tgz) = 60a65daaf16ec315034675942618a2230521ea7adf85eea788ee54841072faf0
4
SIZE (openblas/lapack-3.4.2.tgz) = 6168281
5
SHA256 (openblas/large.tgz) = f328d88b7fa97722f271d7d0cfea1c220e0f8e5ed5ff01d8ef1eb51d6f4243a1
3
SHA256 (openblas/large.tgz) = f328d88b7fa97722f271d7d0cfea1c220e0f8e5ed5ff01d8ef1eb51d6f4243a1
6
SIZE (openblas/large.tgz) = 2595
4
SIZE (openblas/large.tgz) = 2595
7
SHA256 (openblas/timing.tgz) = 999c65f8ea8bd4eac7f1c7f3463d4946917afd20a997807300fe35d70122f3af
5
SHA256 (openblas/timing.tgz) = 999c65f8ea8bd4eac7f1c7f3463d4946917afd20a997807300fe35d70122f3af
(-)./files/patch-Makefile (-72 / +6 lines)
Lines 1-77 Link Here
1
--- Makefile.orig	2012-11-27 08:24:53.000000000 +0900
1
--- Makefile.orig	2013-07-27 01:21:05.000000000 +0900
2
+++ Makefile	2012-11-28 01:13:31.000000000 +0900
2
+++ Makefile	2013-07-27 01:22:18.000000000 +0900
3
@@ -203,7 +203,7 @@
3
@@ -228,7 +228,7 @@
4
 netlib : 
4
 	-@echo "LOADOPTS    = $(FFLAGS) $(EXTRALIB)" >> $(NETLIB_LAPACK_DIR)/make.inc
5
 
5
 	-@echo "CC          = $(CC)" >> $(NETLIB_LAPACK_DIR)/make.inc
6
 else
6
 	-@echo "override CFLAGS      = $(LAPACK_CFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc
7
-netlib : lapack-3.4.2 patch.for_lapack-3.4.2 $(NETLIB_LAPACK_DIR)/make.inc
8
+netlib : lapack-%%LAPACKVER%% patch.for_lapack-%%LAPACKVER%% $(NETLIB_LAPACK_DIR)/make.inc
9
 ifndef NOFORTRAN
10
 	-@$(MAKE) -C $(NETLIB_LAPACK_DIR) lapacklib
11
 endif
12
@@ -212,7 +212,7 @@
13
 endif
14
 endif
15
 
16
-prof_lapack : lapack-3.4.2 $(NETLIB_LAPACK_DIR)/make.inc
17
+prof_lapack : lapack-%%LAPACKVER%% $(NETLIB_LAPACK_DIR)/make.inc
18
 	-@$(MAKE) -C $(NETLIB_LAPACK_DIR) lapack_prof
19
 
20
 $(NETLIB_LAPACK_DIR)/make.inc :
21
@@ -229,7 +229,7 @@
22
 else
23
 	-@echo "CFLAGS      = $(CFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc
24
 endif
25
-	-@echo "ARCH        = $(AR)" >> $(NETLIB_LAPACK_DIR)/make.inc
7
-	-@echo "ARCH        = $(AR)" >> $(NETLIB_LAPACK_DIR)/make.inc
26
+	-@echo "ARCH_       = $(AR)" >> $(NETLIB_LAPACK_DIR)/make.inc
8
+	-@echo "ARCH_       = $(AR)" >> $(NETLIB_LAPACK_DIR)/make.inc
27
 	-@echo "ARCHFLAGS   = -ru" >> $(NETLIB_LAPACK_DIR)/make.inc
9
 	-@echo "ARCHFLAGS   = -ru" >> $(NETLIB_LAPACK_DIR)/make.inc
28
 	-@echo "RANLIB      = $(RANLIB)" >> $(NETLIB_LAPACK_DIR)/make.inc
10
 	-@echo "RANLIB      = $(RANLIB)" >> $(NETLIB_LAPACK_DIR)/make.inc
29
 	-@echo "LAPACKLIB   = ../$(LIBNAME)" >> $(NETLIB_LAPACK_DIR)/make.inc
11
 	-@echo "LAPACKLIB   = ../$(LIBNAME)" >> $(NETLIB_LAPACK_DIR)/make.inc
30
@@ -241,24 +241,19 @@
31
 	-@cat  make.inc >> $(NETLIB_LAPACK_DIR)/make.inc
32
 endif
33
 
34
-lapack-3.4.2 : lapack-3.4.2.tgz
35
+lapack-%%LAPACKVER%% : lapack-%%LAPACKVER%%.tgz
36
 ifndef NOFORTRAN
37
 ifndef NO_LAPACK
38
-	@if test `$(MD5SUM) lapack-3.4.2.tgz | $(AWK) '{print $$1}'` = 61bf1a8a4469d4bdb7604f5897179478; then \
39
-		echo $(TAR) zxf $< ;\
40
-		$(TAR) zxf $< && (cd $(NETLIB_LAPACK_DIR); $(PATCH) -p1 < ../patch.for_lapack-3.4.2) ;\
41
-		rm -f $(NETLIB_LAPACK_DIR)/lapacke/make.inc ;\
42
-	else \
43
-		rm -rf $(NETLIB_LAPACK_DIR) ;\
44
-		echo "	Cannot download lapack-3.4.2.tgz or the MD5 check sum is wrong (Please use orignal)."; \
45
-		exit 1; \
46
-	fi
47
+	echo $(TAR) zxf $< ;\
48
+	$(TAR) zxf $< && (cd $(NETLIB_LAPACK_DIR); $(PATCH) -p1 < ../patch.for_lapack-%%LAPACKVER%%)
49
+	%%FIND%% $(NETLIB_LAPACK_DIR) -name "Makefile*" -type f|\
50
+		%%XARGS%% %%REINPLACE_CMD%% -e 's;$$(ARCH);$$(ARCH_);g'
51
 endif
52
 endif
53
 
54
-LAPACK_URL=http://www.netlib.org/lapack/lapack-3.4.2.tgz
55
+LAPACK_URL=http://www.netlib.org/lapack/lapack-%%LAPACKVER%%.tgz
56
 
57
-lapack-3.4.2.tgz :
58
+lapack-%%LAPACKVER%%.tgz :
59
 ifndef NOFORTRAN
60
 #http://stackoverflow.com/questions/7656425/makefile-ifeq-logical-or
61
 ifeq ($(OSNAME), $(filter $(OSNAME),Darwin NetBSD))
62
@@ -282,7 +277,7 @@
63
 	-wget http://www.netlib.org/lapack/timing/timing.tgz
64
 endif
65
 
66
-lapack-timing : lapack-3.4.2 large.tgz timing.tgz
67
+lapack-timing : lapack-%%LAPACKVER%% large.tgz timing.tgz
68
 ifndef NOFORTRAN
69
 	(cd $(NETLIB_LAPACK_DIR); $(TAR) zxf ../timing.tgz TIMING)
70
 	(cd $(NETLIB_LAPACK_DIR)/TIMING; $(TAR) zxf ../../large.tgz )
71
@@ -320,4 +315,4 @@
72
 	rm -rf $(NETLIB_LAPACK_DIR) ;\
73
 	fi
74
 	@rm -f *.grd Makefile.conf_last config_last.h
75
-	@echo Done.
76
\ No newline at end of file
77
+	@echo Done.
(-)./files/patch-Makefile.system (-15 / +6 lines)
Lines 1-15 Link Here
1
--- Makefile.system.orig	2012-10-09 21:08:28.000000000 +0900
1
--- Makefile.system.orig	2013-07-26 02:34:45.000000000 +0900
2
+++ Makefile.system	2012-10-12 21:33:31.000000000 +0900
2
+++ Makefile.system	2013-07-27 01:22:51.000000000 +0900
3
@@ -10,7 +10,7 @@
3
@@ -142,6 +142,9 @@
4
 endif
5
 
6
 ifndef NETLIB_LAPACK_DIR
7
-NETLIB_LAPACK_DIR = $(TOPDIR)/lapack-3.4.2
8
+NETLIB_LAPACK_DIR = $(TOPDIR)/lapack-%%LAPACKVER%%
9
 endif
10
 
11
 # Default C compiler
12
@@ -125,6 +125,9 @@
13
 endif
4
 endif
14
 
5
 
15
 ifeq ($(OSNAME), FreeBSD)
6
 ifeq ($(OSNAME), FreeBSD)
Lines 19-25 Link Here
19
 MD5SUM = md5 -r
10
 MD5SUM = md5 -r
20
 endif
11
 endif
21
 
12
 
22
@@ -753,15 +756,6 @@
13
@@ -856,15 +859,6 @@
23
 LIBSUFFIX = a
14
 LIBSUFFIX = a
24
 endif
15
 endif
25
 
16
 
Lines 35-41 Link Here
35
 ifndef SMP
26
 ifndef SMP
36
 LIBNAME		= $(LIBPREFIX)$(REVISION).$(LIBSUFFIX)
27
 LIBNAME		= $(LIBPREFIX)$(REVISION).$(LIBSUFFIX)
37
 LIBNAME_P	= $(LIBPREFIX)$(REVISION)_p.$(LIBSUFFIX)
28
 LIBNAME_P	= $(LIBPREFIX)$(REVISION)_p.$(LIBSUFFIX)
38
@@ -769,7 +763,6 @@
29
@@ -872,7 +866,6 @@
39
 LIBNAME		= $(LIBPREFIX)p$(REVISION).$(LIBSUFFIX)
30
 LIBNAME		= $(LIBPREFIX)p$(REVISION).$(LIBSUFFIX)
40
 LIBNAME_P	= $(LIBPREFIX)p$(REVISION)_p.$(LIBSUFFIX)
31
 LIBNAME_P	= $(LIBPREFIX)p$(REVISION)_p.$(LIBSUFFIX)
41
 endif
32
 endif
Lines 43-49 Link Here
43
 
34
 
44
 
35
 
45
 LIBDLLNAME   = $(LIBPREFIX).dll
36
 LIBDLLNAME   = $(LIBPREFIX).dll
46
@@ -783,7 +776,7 @@
37
@@ -886,7 +879,7 @@
47
 LIBS_P		= $(TOPDIR)/$(LIBNAME_P)
38
 LIBS_P		= $(TOPDIR)/$(LIBNAME_P)
48
 
39
 
49
 export OSNAME
40
 export OSNAME
(-)./files/patch-exports+gensymbol (-15 lines)
Lines 1-15 Link Here
1
--- exports/gensymbol.orig	2012-11-27 08:24:53.000000000 +0900
2
+++ exports/gensymbol	2012-11-28 01:19:10.000000000 +0900
3
@@ -2666,11 +2666,7 @@
4
 		#LAPACKE_zlagsy_work,
5
 		);
6
 
7
-if ($ARGV[5] == 1) {
8
-	#NO_LAPACK=1
9
-	@underscore_objs = (@blasobjs, @misc_underscore_objs);
10
-} elsif (-d "../lapack-3.1.1" || -d "../lapack-3.4.0" || -d "../lapack-3.4.1" ||
11
-         -d "../lapack-3.4.2") {
12
+if (-d "../lapack-%%LAPACKVER%%") {
13
     @underscore_objs = (@blasobjs, @lapackobjs, @lapackobjs2, @misc_underscore_objs);
14
 } else {
15
     @underscore_objs = (@blasobjs, @lapackobjs, @misc_underscore_objs);

Return to bug 180882