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

(-)a/math/gotoblas/Makefile (-158 lines)
Removed Link Here
1
# Created by: Sato Hiroki <hrs@FreeBSD.org>
2
3
PORTNAME=	gotoblas
4
PORTVERSION=	2.${GOTOBLAS2VER}.${LAPACKVER}
5
PORTREVISION=	16
6
CATEGORIES=	math
7
MASTER_SITES=	LOCAL/maho/gotoblas \
8
		NL/lapack:lapack NL/lapack/timing:lapack_tmg
9
DISTFILES=	GotoBLAS2-${GOTOBLAS2VER}_bsd.tar.gz \
10
		lapack-${LAPACKVER}.tgz:lapack \
11
		large.tgz:lapack_tmg timing.tgz:lapack_tmg
12
DIST_SUBDIR=	gotoblas
13
EXTRACT_ONLY=	${GOTOBLAS2_SRCFILE}
14
15
MAINTAINER=	ports@FreeBSD.org
16
COMMENT=	Fast implementation of Basic Linear Algebra Subprograms
17
18
LICENSE=	BSD2CLAUSE
19
LICENSE_FILE=	${WRKSRC}/00License.txt
20
21
BROKEN_aarch64=		does not build: undefined reference to get_libname
22
BROKEN_armv6=		does not build: undefined reference to get_libname
23
BROKEN_armv7=		does not build: undefined reference to get_libname
24
BROKEN_powerpc64=	does not build: error: macro names must be identifiers
25
BROKEN_i386=		does not build (terminates with SIGBUS)
26
27
GOTOBLAS2VER=	1.13
28
GOTOBLAS2_SRCFILE=	GotoBLAS2-${GOTOBLAS2VER}_bsd.tar.gz
29
LAPACKVER=	3.4.0
30
LAPACK_SRCFILE=	lapack-${LAPACKVER}.tgz
31
LARGE_FILE=	large.tgz
32
TIMING_FILE=	timing.tgz
33
USE_LDCONFIG=	yes
34
WRKSRC=		${WRKDIR}/GotoBLAS2
35
36
USES=		fortran gmake perl5
37
USE_GCC=	yes
38
USE_PERL5=	build
39
GOTOLIBS=	libgoto2 libgoto2p
40
GOTOFILES=	${GOTOLIBS:S|$|.so|} ${GOTOLIBS:S|$|.so.1|} ${GOTOLIBS:S|$|.a|}
41
PLIST_FILES=	${GOTOFILES:S|^|lib/|}
42
SUB_FILES=	pkg-message
43
SUB_LIST=	MAXTHREADS=${MAXTHREADS}
44
MAKE_JOBS_UNSAFE=	yes
45
46
OPTIONS_DEFINE_i386=	DYNAMIC_ARCH
47
OPTIONS_DEFINE_amd64=	DYNAMIC_ARCH
48
OPTIONS_DEFINE=	INTERFACE64 OPENMP
49
50
OPTIONS_DEFAULT_i386=	DYNAMIC_ARCH
51
OPTIONS_DEFAULT_amd64=	DYNAMIC_ARCH
52
53
DYNAMIC_ARCH_DESC=	Support multiple CPU types on i386 and amd64
54
INTERFACE64_DESC=	Use 8 byte integers on 64-bit architectures
55
OPENMP_DESC=		Use OpenMP for threading
56
#QUAD_PRECISION=	Support IEEE quad precision (experimental)
57
58
.include <bsd.port.options.mk>
59
60
MAXTHREADS?=	8
61
62
.if ${ARCH:M*64} == ""
63
GOTOFLAGS+=	BINARY32=1
64
.else
65
GOTOFLAGS+=	BINARY64=1
66
.endif
67
68
.if ${PORT_OPTIONS:MDYNAMIC_ARCH}
69
GOTOFLAGS+=	DYNAMIC_ARCH=1
70
.endif
71
72
.if ${PORT_OPTIONS:MINTERFACE64}
73
GOTOFLAGS+=	INTERFACE64=1
74
.endif
75
76
.if ${PORT_OPTIONS:MOPENMP}
77
GOTOFLAGS+=	USE_OPENMP=1
78
.endif
79
80
.if ${GCC_DEFAULT} >= 10
81
BROKEN=		fails to build with GCC 10: Type mismatch between actual argument at (1) and actual argument at (2) (REAL(8)/INTEGER(4)).
82
.endif
83
84
#.if ${PORT_OPTIONS:MQUAD_PRECISION}
85
#BROKEN=	WITH_QUAD_PRECISION is broken; please disable this option
86
#GOTOFLAGS+=	QUAD_PRECISION=1
87
#.endif
88
89
post-extract:
90
	${FIND} ${WRKSRC} -type f -name '.*' -delete
91
	cd ${DISTDIR}/${DIST_SUBDIR} ; \
92
	${CP} ${LAPACK_SRCFILE} ${LARGE_FILE} ${TIMING_FILE} ${WRKSRC}
93
	${MKDIR} ${STAGEDIR}${PREFIX}/lib
94
95
post-patch:
96
	${REINPLACE_CMD} -e "s+%%FC%%+${FC}+" -e "s+%%CC%%+${CC}+" \
97
		${WRKSRC}/Makefile.rule
98
	${REINPLACE_CMD} -e "s+%%LAPACKVER%%+${LAPACKVER}+g" \
99
		${WRKSRC}/Makefile
100
	${REINPLACE_CMD} -e "s+%%LAPACKVER%%+${LAPACKVER}+g" \
101
		${WRKSRC}/exports/gensymbol
102
	${REINPLACE_CMD} -e "s+(ARCH)+(ARCH_)+" \
103
		${WRKSRC}/Makefile.rule \
104
		${WRKSRC}/Makefile.tail \
105
		${WRKSRC}/driver/level3/Makefile \
106
		${WRKSRC}/driver/others/Makefile \
107
		${WRKSRC}/exports/Makefile \
108
		${WRKSRC}/interface/Makefile \
109
		${WRKSRC}/kernel/Makefile \
110
		${WRKSRC}/kernel/Makefile.L3 \
111
		${WRKSRC}/lapack/laswp/Makefile \
112
		${WRKSRC}/reference/Makefile
113
	${REINPLACE_CMD} -e "s+(ARCH)+(ARCH_)+" \
114
	-e 's+%%_GCC_RUNTIME%%+${_GCC_RUNTIME}+' \
115
	-e 's+$$(CROSS_SUFFIX)+${LOCALBASE}/bin/+' \
116
		${WRKSRC}/Makefile.system
117
118
.if ${PORT_OPTIONS:MOPENMP}
119
	${REINPLACE_CMD} -e "s+GOTO_NUM_THREADS+OMP_NUM_THREADS+g" \
120
		${WRKSRC}/test/Makefile \
121
		${WRKSRC}/ctest/Makefile
122
.endif
123
124
do-build:
125
	cd ${WRKSRC} ; ${SETENV} ${GOTOFLAGS} NUM_THREADS=1 USE_THREAD=0 \
126
	${MAKE_CMD} ${MAKE_ARGS}
127
	${CP} ${WRKSRC}/libgoto2.a ${STAGEDIR}${PREFIX}/lib/libgoto2.a
128
	${CP} ${WRKSRC}/libgoto2.so ${STAGEDIR}${PREFIX}/lib/libgoto2.so.1
129
	cd ${WRKSRC} ; ${MAKE_CMD} ${MAKE_ARGS} clean
130
	cd ${WRKSRC} ; ${SETENV} ${GOTOFLAGS} NUM_THREADS=${MAXTHREADS} \
131
	USE_THREAD=1 ${MAKE_CMD} ${MAKE_ARGS}
132
	${CP} ${WRKSRC}/libgoto2.a ${STAGEDIR}${PREFIX}/lib/libgoto2p.a
133
	${CP} ${WRKSRC}/libgoto2.so ${STAGEDIR}${PREFIX}/lib/libgoto2p.so.1
134
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so.1
135
136
BENCHMARK_MAXTHREADS?=	${MAXTHREADS}
137
.if ${PORT_OPTIONS:MOPENMP}
138
BENCHMARK_THREADS_FLAG=		OMP_NUM_THREADS=${BENCHMARK_MAXTHREADS}
139
.else
140
BENCHMARK_THREADS_FLAG=		GOTO_NUM_THREADS=${BENCHMARK_MAXTHREADS}
141
.endif
142
143
benchmark: build
144
	cd ${WRKSRC} ; ${SETENV} ${GOTOFLAGS} NUM_THREADS=${MAXTHREADS} \
145
	USE_THREAD=1 ${MAKE_CMD} ${MAKE_ARGS} hpl
146
	cd ${WRKSRC}/benchmark ; ${SETENV} ${GOTOFLAGS} NUM_THREADS=${MAXTHREADS} \
147
	USE_THREAD=1 ${BENCHMARK_THREADS_FLAG} ${MAKE_CMD} ${MAKE_ARGS}
148
149
do-install:
150
	cd ${STAGEDIR}${PREFIX}/lib ; \
151
	${INSTALL_DATA} ${GOTOLIBS:S|$|.a|} ${GOTOLIBS:S|$|.so.1|} \
152
	${STAGEDIR}${PREFIX}/lib/
153
	cd ${STAGEDIR}${PREFIX}/lib ; \
154
	for i in ${GOTOLIBS:S|$|.so|}; do \
155
		${LN} -sf $$i.1 $$i ; \
156
	done
157
158
.include <bsd.port.mk>
(-)a/math/gotoblas/distinfo (-8 lines)
Removed Link Here
1
SHA256 (gotoblas/GotoBLAS2-1.13_bsd.tar.gz) = 7c3eab57ef5ad5c42f73adade833a531591e78967bbe9fc6db31310d73fa2d86
2
SIZE (gotoblas/GotoBLAS2-1.13_bsd.tar.gz) = 3165294
3
SHA256 (gotoblas/lapack-3.4.0.tgz) = a7139ef97004d0e3c4c30f1c52d508fd7ae84b5fbaf0dd8e792c167dc306c3e9
4
SIZE (gotoblas/lapack-3.4.0.tgz) = 6127787
5
SHA256 (gotoblas/large.tgz) = f328d88b7fa97722f271d7d0cfea1c220e0f8e5ed5ff01d8ef1eb51d6f4243a1
6
SIZE (gotoblas/large.tgz) = 2595
7
SHA256 (gotoblas/timing.tgz) = 999c65f8ea8bd4eac7f1c7f3463d4946917afd20a997807300fe35d70122f3af
8
SIZE (gotoblas/timing.tgz) = 1059485
(-)a/math/gotoblas/files/patch-Makefile (-127 lines)
Removed Link Here
1
--- Makefile.orig	2010-01-20 20:54:38 UTC
2
+++ Makefile
3
@@ -23,7 +23,7 @@ all :: libs netlib tests shared
4
 	@echo " GotoBLAS build complete."
5
 	@echo
6
 	@echo "  OS               ... $(OSNAME)             "
7
-	@echo "  Architecture     ... $(ARCH)               "
8
+	@echo "  Architecture     ... $(ARCH_)              "
9
 ifndef BINARY64
10
 	@echo "  BINARY           ... 32bit                 "
11
 else
12
@@ -142,46 +142,41 @@ hpl_p :
13
 	fi; \
14
 	done
15
 
16
-netlib : lapack-3.1.1 patch.for_lapack-3.1.1 lapack-3.1.1/make.inc
17
+netlib : lapack-%%LAPACKVER%% lapack-%%LAPACKVER%%/make.inc #patch.for_lapack-%%LAPACKVER%% 
18
 ifndef NOFORTRAN
19
-	-@$(MAKE) -C lapack-3.1.1 lapacklib
20
+	-@$(MAKE) -C lapack-%%LAPACKVER%% lapacklib
21
 endif
22
 
23
-prof_lapack : lapack-3.1.1 lapack-3.1.1/make.inc
24
-	-@$(MAKE) -C lapack-3.1.1 lapack_prof
25
+prof_lapack : lapack-%%LAPACKVER%% lapack-%%LAPACKVER%%/make.inc
26
+	-@$(MAKE) -C lapack-%%LAPACKVER%% lapack_prof
27
 
28
-lapack-3.1.1/make.inc :
29
+lapack-%%LAPACKVER%%/make.inc :
30
 ifndef NOFORTRAN
31
-	-@echo "FORTRAN   = $(FC)" > lapack-3.1.1/make.inc
32
-	-@echo "OPTS      = $(FFLAGS)" >> lapack-3.1.1/make.inc
33
-	-@echo "POPTS     = $(FPFLAGS)" >> lapack-3.1.1/make.inc
34
-	-@echo "NOOPT     = $(FFLAGS) -O0" >> lapack-3.1.1/make.inc
35
-	-@echo "PNOOPT     = $(FPFLAGS) -O0" >> lapack-3.1.1/make.inc
36
-	-@echo "LOADOPTS  = $(FFLAGS) $(EXTRALIB)" >> lapack-3.1.1/make.inc
37
-	-@echo "ARCH      = $(AR)" >> lapack-3.1.1/make.inc
38
-	-@echo "RANLIB    = $(RANLIB)" >> lapack-3.1.1/make.inc
39
-	-@echo "LAPACKLIB = ../$(LIBNAME)" >> lapack-3.1.1/make.inc
40
-	-@echo "LAPACKLIB_P = ../$(LIBNAME_P)" >> lapack-3.1.1/make.inc
41
-	-@echo "SUFFIX     = $(SUFFIX)" >> lapack-3.1.1/make.inc
42
-	-@echo "PSUFFIX    = $(PSUFFIX)" >> lapack-3.1.1/make.inc
43
-#	-@echo "CEXTRALIB  = $(CEXTRALIB)" >> lapack-3.1.1/make.inc
44
-	-@cat  make.inc >> lapack-3.1.1/make.inc
45
+	-@echo "FORTRAN   = $(FC)" > lapack-%%LAPACKVER%%/make.inc
46
+	-@echo "OPTS      = $(FFLAGS)" >> lapack-%%LAPACKVER%%/make.inc
47
+	-@echo "POPTS     = $(FPFLAGS)" >> lapack-%%LAPACKVER%%/make.inc
48
+	-@echo "NOOPT     = $(FFLAGS) -O0" >> lapack-%%LAPACKVER%%/make.inc
49
+	-@echo "PNOOPT     = $(FPFLAGS) -O0" >> lapack-%%LAPACKVER%%/make.inc
50
+	-@echo "LOADOPTS  = $(FFLAGS) $(EXTRALIB)" >> lapack-%%LAPACKVER%%/make.inc
51
+	-@echo "ARCH_      = $(AR)" >> lapack-%%LAPACKVER%%/make.inc
52
+	-@echo "RANLIB    = $(RANLIB)" >> lapack-%%LAPACKVER%%/make.inc
53
+	-@echo "LAPACKLIB = ../$(LIBNAME)" >> lapack-%%LAPACKVER%%/make.inc
54
+	-@echo "LAPACKLIB_P = ../$(LIBNAME_P)" >> lapack-%%LAPACKVER%%/make.inc
55
+	-@echo "SUFFIX     = $(SUFFIX)" >> lapack-%%LAPACKVER%%/make.inc
56
+	-@echo "PSUFFIX    = $(PSUFFIX)" >> lapack-%%LAPACKVER%%/make.inc
57
+#	-@echo "CEXTRALIB  = $(CEXTRALIB)" >> lapack-%%LAPACKVER%%/make.inc
58
+	-@cat  make.inc >> lapack-%%LAPACKVER%%/make.inc
59
 endif
60
 
61
-lapack-3.1.1 : lapack-3.1.1.tgz
62
+lapack-%%LAPACKVER%% : lapack-%%LAPACKVER%%.tgz
63
 ifndef NOFORTRAN
64
-	@if test `$(MD5SUM) lapack-3.1.1.tgz | $(AWK) '{print $$1}'` = 00b21551a899bcfbaa7b8443e1faeef9; then \
65
 		echo $(TAR) zxf $< ;\
66
-		$(TAR) zxf $< && (cd lapack-3.1.1; $(PATCH) -p1 < ../patch.for_lapack-3.1.1) ;\
67
-	else \
68
-		echo "	lapack-3.1.1.tgz check sum is wrong (Please use orignal)." ;\
69
-		rm -rf lapack-3.1.1 ;\
70
-	fi
71
+		$(TAR) zxf $< && (cd lapack-%%LAPACKVER%%; $(PATCH) -p1 < ../patch.for_lapack-%%LAPACKVER%%)
72
 endif
73
 
74
-lapack-3.1.1.tgz :
75
+lapack-%%LAPACKVER%%.tgz :
76
 ifndef NOFORTRAN
77
-	-wget http://www.netlib.org/lapack/lapack-3.1.1.tgz
78
+	-wget http://www.netlib.org/lapack/lapack-%%LAPACKVER%%.tgz
79
 endif
80
 
81
 large.tgz : 
82
@@ -194,21 +189,21 @@ ifndef NOFORTRAN
83
 	-wget http://www.netlib.org/lapack/timing/timing.tgz
84
 endif
85
 
86
-lapack-timing : lapack-3.1.1 large.tgz timing.tgz
87
+lapack-timing : lapack-%%LAPACKVER%% large.tgz timing.tgz
88
 ifndef NOFORTRAN
89
-	(cd lapack-3.1.1; $(TAR) zxf ../timing.tgz TIMING)
90
-	(cd lapack-3.1.1/TIMING; $(TAR) zxf ../../large.tgz )
91
-	make -C lapack-3.1.1 tmglib
92
-	make -C lapack-3.1.1/TIMING
93
+	(cd lapack-%%LAPACKVER%%; $(TAR) zxf ../timing.tgz TIMING)
94
+	(cd lapack-%%LAPACKVER%%/TIMING; $(TAR) zxf ../../large.tgz )
95
+	make -C lapack-%%LAPACKVER%% tmglib
96
+	make -C lapack-%%LAPACKVER%%/TIMING
97
 endif
98
 
99
 
100
 lapack-test :
101
-	$(MAKE) -C lapack-3.1.1 tmglib
102
-	$(MAKE) -C lapack-3.1.1/TESTING xeigtstc xeigtstd xeigtsts xeigtstz xlintstc xlintstd xlintstds xlintsts xlintstz xlintstzc
103
-	@rm	-f lapack-3.1.1/TESTING/*.out
104
-	$(MAKE) -j 1 -C lapack-3.1.1/TESTING
105
-	$(GREP) failed lapack-3.1.1/TESTING/*.out
106
+	$(MAKE) -C lapack-%%LAPACKVER%% tmglib
107
+	$(MAKE) -C lapack-%%LAPACKVER%%/TESTING xeigtstc xeigtstd xeigtsts xeigtstz xlintstc xlintstd xlintstds xlintsts xlintstz xlintstzc
108
+	@rm	-f lapack-%%LAPACKVER%%/TESTING/*.out
109
+	$(MAKE) -j 1 -C lapack-%%LAPACKVER%%/TESTING
110
+	$(GREP) failed lapack-%%LAPACKVER%%/TESTING/*.out
111
 
112
 dummy :
113
 
114
@@ -223,8 +218,8 @@ ifdef DYNAMIC_ARCH
115
 endif
116
 	@rm -f *.$(LIBSUFFIX) *.so *~ *.exe getarch getarch_2nd *.dll *.lib *.$(SUFFIX) *.dwf libgoto2.$(LIBSUFFIX) libgoto2_p.$(LIBSUFFIX) *.lnk myconfig.h
117
 	@rm -f Makefile.conf config.h Makefile_kernel.conf config_kernel.h st* *.dylib
118
-	@if test -d lapack-3.1.1; then \
119
-	echo deleting lapack-3.1.1; \
120
-	rm -rf lapack-3.1.1 ;\
121
+	@if test -d lapack-%%LAPACKVER%%; then \
122
+	echo deleting lapack-%%LAPACKVER%%; \
123
+	rm -rf lapack-%%LAPACKVER%% ;\
124
 	fi
125
-	@echo Done.
126
\ No newline at end of file
127
+	@echo Done.
(-)a/math/gotoblas/files/patch-Makefile.rule (-15 lines)
Removed Link Here
1
--- Makefile.rule.orig	2010-02-05 16:02:04 UTC
2
+++ Makefile.rule
3
@@ -14,10 +14,10 @@ VERSION = 1.13
4
 
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.
7
-# CC = gcc
8
+CC = %%CC%%
9
 
10
 # Fortran compiler. Default is g77.
11
-# FC = gfortran
12
+FC = %%FC%%
13
 
14
 # Even you can specify cross compiler
15
 # CC = x86_64-w64-mingw32-gcc
(-)a/math/gotoblas/files/patch-Makefile.system (-56 lines)
Removed Link Here
1
--- Makefile.system.orig	2010-01-28 20:11:08 UTC
2
+++ Makefile.system
3
@@ -93,6 +93,11 @@ ifeq ($(OSNAME), Linux)
4
 EXTRALIB	+= -lm
5
 endif
6
 
7
+ifeq ($(OSNAME), FreeBSD)
8
+EXTRALIB	+= -lm
9
+FCOMMON_OPT	+= -Wl,-rpath=%%_GCC_RUNTIME%%
10
+endif
11
+
12
 ifeq ($(OSNAME), AIX)
13
 EXTRALIB	+= -lm
14
 endif
15
@@ -608,7 +613,7 @@ PATCH	= patch
16
 GREP	= grep
17
 endif
18
 
19
-MD5SUM	= md5sum
20
+MD5SUM	= md5
21
 AWK	= awk
22
 
23
 REVISION = -r$(VERSION)
24
@@ -631,15 +636,6 @@ ifndef LIBSUFFIX
25
 LIBSUFFIX = a
26
 endif
27
 
28
-ifndef DYNAMIC_ARCH
29
-ifndef SMP
30
-LIBNAME		= $(LIBPREFIX)_$(LIBCORE)$(REVISION).$(LIBSUFFIX)
31
-LIBNAME_P	= $(LIBPREFIX)_$(LIBCORE)$(REVISION)_p.$(LIBSUFFIX)
32
-else
33
-LIBNAME		= $(LIBPREFIX)_$(LIBCORE)p$(REVISION).$(LIBSUFFIX)
34
-LIBNAME_P	= $(LIBPREFIX)_$(LIBCORE)p$(REVISION)_p.$(LIBSUFFIX)
35
-endif
36
-else
37
 ifndef SMP
38
 LIBNAME		= $(LIBPREFIX)$(REVISION).$(LIBSUFFIX)
39
 LIBNAME_P	= $(LIBPREFIX)$(REVISION)_p.$(LIBSUFFIX)
40
@@ -647,7 +643,6 @@ else
41
 LIBNAME		= $(LIBPREFIX)p$(REVISION).$(LIBSUFFIX)
42
 LIBNAME_P	= $(LIBPREFIX)p$(REVISION)_p.$(LIBSUFFIX)
43
 endif
44
-endif
45
 
46
 
47
 LIBSONAME    = $(LIBNAME:.$(LIBSUFFIX)=.so)
48
@@ -661,7 +656,7 @@ LIBS		= $(TOPDIR)/$(LIBNAME)
49
 LIBS_P		= $(TOPDIR)/$(LIBNAME_P)
50
 
51
 export OSNAME
52
-export ARCH
53
+export ARCH_
54
 export CORE
55
 export LIBCORE
56
 export PGCPATH
(-)a/math/gotoblas/files/patch-c_check (-20 lines)
Removed Link Here
1
--- c_check.orig	2010-01-28 19:26:25 UTC
2
+++ c_check
3
@@ -2,7 +2,7 @@
4
 
5
 # Checking cross compile
6
 $hostos   = `uname -s | sed -e s/\-.*//`;    chop($hostos);
7
-$hostarch = `uname -m | sed -e s/i.86/x86/`;chop($hostarch);
8
+$hostarch = `uname -m | sed -e s/i.86/x86/ | sed -e s/amd64/x86_64/` ;chop($hostarch);
9
 
10
 $binary = $ENV{"BINARY"};
11
 
12
@@ -215,7 +215,7 @@ open(CONFFILE, "> $config"  ) || die "Ca
13
 # print $data, "\n";
14
 
15
 print MAKEFILE "OSNAME=$os\n";
16
-print MAKEFILE "ARCH=$architecture\n";
17
+print MAKEFILE "ARCH_=$architecture\n";
18
 print MAKEFILE "C_COMPILER=$compiler\n";
19
 print MAKEFILE "BINARY32=\n" if $binformat ne bin32;
20
 print MAKEFILE "BINARY64=\n" if $binformat ne bin64;
(-)a/math/gotoblas/files/patch-cpuid_ia64.c (-12 lines)
Removed Link Here
1
--- cpuid_ia64.c.orig	2010-11-05 13:57:49 UTC
2
+++ cpuid_ia64.c
3
@@ -38,7 +38,9 @@
4
 
5
 #include <stdio.h>
6
 #include <string.h>
7
+#ifdef linux
8
 #include <sys/sysinfo.h>
9
+#endif
10
 #include "cpuid.h"
11
 
12
 #ifdef __ECC
(-)a/math/gotoblas/files/patch-cpuid_sparc.c (-10 lines)
Removed Link Here
1
--- cpuid_sparc.c.orig	2010-11-05 13:57:49 UTC
2
+++ cpuid_sparc.c
3
@@ -49,6 +49,7 @@ void get_subdirname(void){
4
 }
5
 
6
 void get_cpuconfig(void){
7
+  printf("#define SPARC\n");
8
   printf("#define V9\n");
9
   printf("#define DTB_ENTRIES 32\n");
10
 }
(-)a/math/gotoblas/files/patch-dynamic.c (-14 lines)
Removed Link Here
1
--- driver/others/dynamic.c~	2010-01-21 01:28:45.000000000 +0900
2
+++ driver/others/dynamic.c	2010-02-16 13:43:09.000000000 +0900
3
@@ -181,9 +181,9 @@
4
   gotoblas = get_coretype();
5
   
6
 #ifdef ARCH_X86
7
-  if (gotoblas == NULL) gotoblas = gotoblas_KATMAI;
8
+  if (gotoblas == NULL) gotoblas = &gotoblas_KATMAI;
9
 #else
10
-  if (gotoblas == NULL) gotoblas = gotoblas_PRESCOTT;
11
+  if (gotoblas == NULL) gotoblas = &gotoblas_PRESCOTT;
12
 #endif
13
   
14
   if (gotoblas && gotoblas -> init) {
(-)a/math/gotoblas/files/patch-exports+Makefile (-10 lines)
Removed Link Here
1
--- exports/Makefile.orig	2010-02-05 16:01:00 UTC
2
+++ exports/Makefile
3
@@ -106,6 +106,7 @@ so : ../$(LIBSONAME)
4
 endif
5
 
6
 ifeq ($(OSNAME), FreeBSD)
7
+EXTRALIB += -lgfortran
8
 
9
 so : ../$(LIBSONAME)
10
 
(-)a/math/gotoblas/files/patch-f_check (-20 lines)
Removed Link Here
1
--- f_check.orig	2009-11-11 18:05:49 UTC
2
+++ f_check
3
@@ -240,7 +240,7 @@ if ($link ne "") {
4
 
5
     foreach $flags (@flags) {
6
 	if (
7
-	    ($flags =~ /^\-L/)
8
+	    ($flags =~ /^\-L\S/)
9
 	    && ($flags !~ /^-LIST:/)
10
 	    && ($flags !~ /^-LANG:/)
11
 	    ) {
12
@@ -263,7 +263,7 @@ if ($link ne "") {
13
 	}
14
 	
15
 	if (
16
-	    ($flags =~ /^\-l/) 
17
+	    ($flags =~ /^\-l\S/) 
18
 	    && ($flags !~ /gfortranbegin/)
19
 	    && ($flags !~ /frtbegin/)
20
 	    && ($flags !~ /pathfstart/)
(-)a/math/gotoblas/files/patch-patch.for_lapack-3.1.1 (-65 lines)
Removed Link Here
1
--- patch.for_lapack-3.1.1.orig	2009-12-16 20:41:30 UTC
2
+++ patch.for_lapack-3.1.1
3
@@ -30,7 +30,7 @@ diff -ruN lapack-3.1.1.old/Makefile lapa
4
 diff -ruN lapack-3.1.1.old/SRC/Makefile lapack-3.1.1/SRC/Makefile
5
 --- lapack-3.1.1.old/SRC/Makefile	2007-02-23 15:33:05.000000000 -0600
6
 +++ lapack-3.1.1/SRC/Makefile	2009-12-16 14:41:09.000000000 -0600
7
-@@ -38,265 +38,273 @@
8
+@@ -38,285 +38,294 @@
9
  #
10
  #######################################################################
11
   
12
@@ -531,17 +531,35 @@ diff -ruN lapack-3.1.1.old/SRC/Makefile 
13
 +ALLOBJ_P = $(ALLOBJ:.$(SUFFIX)=.$(PSUFFIX))
14
 +
15
  ../$(LAPACKLIB): $(ALLOBJ)
16
- 	$(ARCH) $(ARCHFLAGS) $@ $(ALLOBJ)
17
- 	$(RANLIB) $@
18
- 
19
-+../$(LAPACKLIB_P): $(ALLOBJ_P)
20
-+	$(ARCH) $(ARCHFLAGS) $@ $(ALLOBJ_P)
21
+-	$(ARCH) $(ARCHFLAGS) $@ $(ALLOBJ)
22
++	$(ARCH_) $(ARCHFLAGS) $@ $(ALLOBJ)
23
 +	$(RANLIB) $@
24
 +
25
++../$(LAPACKLIB_P): $(ALLOBJ_P)
26
++	$(ARCH_) $(ARCHFLAGS) $@ $(ALLOBJ_P)
27
+ 	$(RANLIB) $@
28
+ 
29
  single: $(SLASRC) $(ALLAUX) $(SCLAUX) 
30
- 	$(ARCH) $(ARCHFLAGS) ../$(LAPACKLIB) $(SLASRC) $(ALLAUX) \
31
+-	$(ARCH) $(ARCHFLAGS) ../$(LAPACKLIB) $(SLASRC) $(ALLAUX) \
32
++	$(ARCH_) $(ARCHFLAGS) ../$(LAPACKLIB) $(SLASRC) $(ALLAUX) \
33
  	$(SCLAUX)
34
-@@ -317,6 +325,7 @@
35
+ 	$(RANLIB) ../$(LAPACKLIB)
36
+ 
37
+ complex: $(CLASRC) $(ALLAUX) $(SCLAUX)
38
+-	$(ARCH) $(ARCHFLAGS) ../$(LAPACKLIB) $(CLASRC) $(ALLAUX) \
39
++	$(ARCH_) $(ARCHFLAGS) ../$(LAPACKLIB) $(CLASRC) $(ALLAUX) \
40
+ 	$(SCLAUX)
41
+ 	$(RANLIB) ../$(LAPACKLIB)
42
+ 
43
+ double: $(DLASRC) $(ALLAUX) $(DZLAUX)
44
+-	$(ARCH) $(ARCHFLAGS) ../$(LAPACKLIB) $(DLASRC) $(ALLAUX) \
45
++	$(ARCH_) $(ARCHFLAGS) ../$(LAPACKLIB) $(DLASRC) $(ALLAUX) \
46
+ 	$(DZLAUX)
47
+ 	$(RANLIB) ../$(LAPACKLIB)
48
+ 
49
+ complex16: $(ZLASRC) $(ALLAUX) $(DZLAUX)
50
+-	$(ARCH) $(ARCHFLAGS) ../$(LAPACKLIB) $(ZLASRC) $(ALLAUX) \
51
++	$(ARCH_) $(ARCHFLAGS) ../$(LAPACKLIB) $(ZLASRC) $(ALLAUX) \
52
  	$(DZLAUX)
53
  	$(RANLIB) ../$(LAPACKLIB)
54
  
55
@@ -570,115 +588,4 @@ diff -ruN lapack-3.1.1.old/SRC/Makefile 
56
  
57
 +slaruv.$(PSUFFIX): slaruv.f ; $(FORTRAN) $(PNOOPT) -O0 -c $< -o $@
58
 +dlaruv.$(PSUFFIX): dlaruv.f ; $(FORTRAN) $(PNOOPT) -O0 -c $< -o $@
59
-diff -ruN lapack-3.1.1.old/TESTING/EIG/Makefile lapack-3.1.1/TESTING/EIG/Makefile
60
---- lapack-3.1.1.old/TESTING/EIG/Makefile	2007-02-20 15:33:03.000000000 -0600
61
-+++ lapack-3.1.1/TESTING/EIG/Makefile	2009-12-16 14:40:35.000000000 -0600
62
-@@ -78,7 +78,7 @@
63
-    cget35.o cget36.o cget37.o cget38.o cget51.o cget52.o \
64
-    cget54.o cglmts.o cgqrts.o cgrqts.o cgsvts.o \
65
-    chbt21.o chet21.o chet22.o chpt21.o chst01.o \
(-)a/math/gotoblas/files/patch-patch.for_lapack-3.4.0 (-381 lines)
Removed Link Here
1
--- patch.for_lapack-3.4.0.orig	2015-12-11 10:27:29 UTC
2
+++ patch.for_lapack-3.4.0
3
@@ -0,0 +1,378 @@
4
+
5
+--- a/lapack-3.4.0/INSTALL/Makefile	2011-10-01 11:37:03.000000000 +0900
6
++++ lapack-3.4.0/INSTALL/Makefile
7
+@@ -27,7 +27,7 @@
8
+ 	$(LOADER) $(LOADOPTS) -o testversion ilaver.o LAPACK_version.o
9
+ 
10
+ clean:
11
+-	rm -f *.o
12
++	rm -f *.o test*
13
+ .f.o: 
14
+ 	$(FORTRAN) $(OPTS) -c $< -o $@
15
+ 
16
+diff -ur /work/ports/va/lapack-3.4.0/Makefile lapack-3.4.0/Makefile
17
+--- a/lapack-3.4.0/Makefile	2011-11-12 06:08:04.000000000 +0900
18
++++ lapack-3.4.0/Makefile
19
+@@ -20,9 +20,12 @@
20
+ blaslib:
21
+ 	( cd BLAS/SRC; $(MAKE) )
22
+ 
23
+-lapacklib:	lapack_install
24
++lapacklib:
25
+ 	( cd SRC; $(MAKE) )
26
+ 
27
++lapack_prof:
28
++	( cd SRC; $(MAKE) lapack_prof)
29
++
30
+ variants:
31
+ 	( cd SRC/VARIANTS ; $(MAKE))
32
+ 	
33
+
34
+--- a/lapack-3.4.0/SRC/Makefile	2011-10-04 11:58:05.000000000 +0900
35
++++ lapack-3.4.0/SRC/Makefile
36
+@@ -54,9 +54,9 @@
37
+ #
38
+ #######################################################################
39
+ 
40
+-ALLAUX = ilaenv.o ieeeck.o lsamen.o xerbla.o xerbla_array.o iparmq.o	\
41
++ALLAUX = ilaenv.o ieeeck.o lsamen.o xerbla_array.o iparmq.o	\
42
+     ilaprec.o ilatrans.o ilauplo.o iladiag.o chla_transtype.o \
43
+-    ../INSTALL/ilaver.o ../INSTALL/lsame.o ../INSTALL/slamch.o
44
++    ../INSTALL/ilaver.o
45
+ 
46
+ SCLAUX = \
47
+    sbdsdc.o \
48
+@@ -92,7 +92,7 @@
49
+    dlasr.o  dlasrt.o dlassq.o dlasv2.o dpttrf.o dstebz.o dstedc.o \
50
+    dsteqr.o dsterf.o dlaisnan.o disnan.o \
51
+    dlartgp.o dlartgs.o \
52
+-   ../INSTALL/dlamch.o ../INSTALL/dsecnd_$(TIMER).o
53
++   ../INSTALL/dsecnd_$(TIMER).o
54
+ 
55
+ SLASRC = \
56
+    sgbbrd.o sgbcon.o sgbequ.o sgbrfs.o sgbsv.o  \
57
+@@ -101,8 +101,8 @@
58
+    sgegs.o  sgegv.o  sgehd2.o sgehrd.o sgelq2.o sgelqf.o \
59
+    sgels.o  sgelsd.o sgelss.o sgelsx.o sgelsy.o sgeql2.o sgeqlf.o \
60
+    sgeqp3.o sgeqpf.o sgeqr2.o sgeqr2p.o sgeqrf.o sgeqrfp.o sgerfs.o \
61
+-   sgerq2.o sgerqf.o sgesc2.o sgesdd.o sgesv.o  sgesvd.o sgesvx.o \
62
+-   sgetc2.o sgetf2.o sgetri.o \
63
++   sgerq2.o sgerqf.o sgesc2.o sgesdd.o sgesvd.o sgesvx.o \
64
++   sgetc2.o sgetri.o \
65
+    sggbak.o sggbal.o sgges.o  sggesx.o sggev.o  sggevx.o \
66
+    sggglm.o sgghrd.o sgglse.o sggqrf.o \
67
+    sggrqf.o sggsvd.o sggsvp.o sgtcon.o sgtrfs.o sgtsv.o  \
68
+@@ -118,16 +118,16 @@
69
+    slaqtr.o slar1v.o slar2v.o ilaslr.o ilaslc.o \
70
+    slarf.o  slarfb.o slarfg.o slarfgp.o slarft.o slarfx.o slargv.o \
71
+    slarrv.o slartv.o  \
72
+-   slarz.o  slarzb.o slarzt.o slaswp.o slasy2.o slasyf.o \
73
++   slarz.o  slarzb.o slarzt.o slasy2.o slasyf.o \
74
+    slatbs.o slatdf.o slatps.o slatrd.o slatrs.o slatrz.o slatzm.o \
75
+-   slauu2.o slauum.o sopgtr.o sopmtr.o sorg2l.o sorg2r.o \
76
++   sopgtr.o sopmtr.o sorg2l.o sorg2r.o \
77
+    sorgbr.o sorghr.o sorgl2.o sorglq.o sorgql.o sorgqr.o sorgr2.o \
78
+    sorgrq.o sorgtr.o sorm2l.o sorm2r.o \
79
+    sormbr.o sormhr.o sorml2.o sormlq.o sormql.o sormqr.o sormr2.o \
80
+    sormr3.o sormrq.o sormrz.o sormtr.o spbcon.o spbequ.o spbrfs.o \
81
+    spbstf.o spbsv.o  spbsvx.o \
82
+    spbtf2.o spbtrf.o spbtrs.o spocon.o spoequ.o sporfs.o sposv.o  \
83
+-   sposvx.o spotf2.o  spotri.o  spstrf.o spstf2.o \
84
++   sposvx.o spstrf.o spstf2.o \
85
+    sppcon.o sppequ.o \
86
+    spprfs.o sppsv.o  sppsvx.o spptrf.o spptri.o spptrs.o sptcon.o \
87
+    spteqr.o sptrfs.o sptsv.o  sptsvx.o spttrs.o sptts2.o srscl.o  \
88
+@@ -143,7 +143,7 @@
89
+    stgsja.o stgsna.o stgsy2.o stgsyl.o stpcon.o stprfs.o stptri.o \
90
+    stptrs.o \
91
+    strcon.o strevc.o strexc.o strrfs.o strsen.o strsna.o strsyl.o \
92
+-   strti2.o strtri.o strtrs.o stzrqf.o stzrzf.o sstemr.o \
93
++   strtrs.o stzrqf.o stzrzf.o sstemr.o \
94
+    slansf.o spftrf.o spftri.o spftrs.o ssfrk.o stfsm.o stftri.o stfttp.o \
95
+    stfttr.o stpttf.o stpttr.o strttf.o strttp.o \
96
+    sgejsv.o  sgesvj.o  sgsvj0.o  sgsvj1.o \
97
+@@ -152,7 +152,7 @@
98
+    sgeqrt.o sgeqrt2.o sgeqrt3.o sgemqrt.o \
99
+    stpqrt.o stpqrt2.o stpmqrt.o stprfb.o
100
+ 
101
+-DSLASRC = spotrs.o sgetrs.o spotrf.o sgetrf.o 
102
++DSLASRC = spotrs.o
103
+ 
104
+ ifdef USEXBLAS
105
+ SXLASRC = sgesvxx.o sgerfsx.o sla_gerfsx_extended.o sla_geamv.o		\
106
+@@ -171,8 +171,8 @@
107
+    cgegs.o  cgegv.o  cgehd2.o cgehrd.o cgelq2.o cgelqf.o \
108
+    cgels.o  cgelsd.o cgelss.o cgelsx.o cgelsy.o cgeql2.o cgeqlf.o cgeqp3.o \
109
+    cgeqpf.o cgeqr2.o cgeqr2p.o cgeqrf.o cgeqrfp.o cgerfs.o \
110
+-   cgerq2.o cgerqf.o cgesc2.o cgesdd.o cgesv.o  cgesvd.o  \
111
+-   cgesvx.o cgetc2.o cgetf2.o cgetri.o \
112
++   cgerq2.o cgerqf.o cgesc2.o cgesdd.o cgesvd.o  \
113
++   cgesvx.o cgetc2.o cgetri.o \
114
+    cggbak.o cggbal.o cgges.o  cggesx.o cggev.o  cggevx.o cggglm.o \
115
+    cgghrd.o cgglse.o cggqrf.o cggrqf.o \
116
+    cggsvd.o cggsvp.o \
117
+@@ -200,21 +200,21 @@
118
+    clarf.o  clarfb.o clarfg.o clarft.o clarfgp.o \
119
+    clarfx.o clargv.o clarnv.o clarrv.o clartg.o clartv.o \
120
+    clarz.o  clarzb.o clarzt.o clascl.o claset.o clasr.o  classq.o \
121
+-   claswp.o clasyf.o clatbs.o clatdf.o clatps.o clatrd.o clatrs.o clatrz.o \
122
+-   clatzm.o clauu2.o clauum.o cpbcon.o cpbequ.o cpbrfs.o cpbstf.o cpbsv.o  \
123
++   clasyf.o clatbs.o clatdf.o clatps.o clatrd.o clatrs.o clatrz.o \
124
++   clatzm.o cpbcon.o cpbequ.o cpbrfs.o cpbstf.o cpbsv.o  \
125
+    cpbsvx.o cpbtf2.o cpbtrf.o cpbtrs.o cpocon.o cpoequ.o cporfs.o \
126
+-   cposv.o  cposvx.o cpotf2.o cpotri.o cpstrf.o cpstf2.o \
127
++   cposv.o  cposvx.o cpstrf.o cpstf2.o \
128
+    cppcon.o cppequ.o cpprfs.o cppsv.o  cppsvx.o cpptrf.o cpptri.o cpptrs.o \
129
+    cptcon.o cpteqr.o cptrfs.o cptsv.o  cptsvx.o cpttrf.o cpttrs.o cptts2.o \
130
+-   crot.o   cspcon.o cspmv.o  cspr.o   csprfs.o cspsv.o  \
131
++   crot.o   cspcon.o csprfs.o cspsv.o  \
132
+    cspsvx.o csptrf.o csptri.o csptrs.o csrscl.o cstedc.o \
133
+-   cstegr.o cstein.o csteqr.o csycon.o csymv.o \
134
+-   csyr.o   csyrfs.o csysv.o  csysvx.o csytf2.o csytrf.o csytri.o csytri2.o csytri2x.o \
135
++   cstegr.o cstein.o csteqr.o csycon.o \
136
++   csyrfs.o csysv.o  csysvx.o csytf2.o csytrf.o csytri.o csytri2.o csytri2x.o \
137
+    csyswapr.o csytrs.o csytrs2.o csyconv.o ctbcon.o ctbrfs.o ctbtrs.o ctgevc.o ctgex2.o \
138
+    ctgexc.o ctgsen.o ctgsja.o ctgsna.o ctgsy2.o ctgsyl.o ctpcon.o \
139
+    ctprfs.o ctptri.o \
140
+    ctptrs.o ctrcon.o ctrevc.o ctrexc.o ctrrfs.o ctrsen.o ctrsna.o \
141
+-   ctrsyl.o ctrti2.o ctrtri.o ctrtrs.o ctzrqf.o ctzrzf.o cung2l.o cung2r.o \
142
++   ctrsyl.o ctrtrs.o ctzrqf.o ctzrzf.o cung2l.o cung2r.o \
143
+    cungbr.o cunghr.o cungl2.o cunglq.o cungql.o cungqr.o cungr2.o \
144
+    cungrq.o cungtr.o cunm2l.o cunm2r.o cunmbr.o cunmhr.o cunml2.o \
145
+    cunmlq.o cunmql.o cunmqr.o cunmr2.o cunmr3.o cunmrq.o cunmrz.o \
146
+@@ -240,7 +240,7 @@
147
+    cla_lin_berr.o clarscl2.o clascl2.o cla_wwaddw.o
148
+ endif
149
+ 
150
+-ZCLASRC = cpotrs.o cgetrs.o cpotrf.o cgetrf.o 
151
++ZCLASRC = cpotrs.o
152
+ 
153
+ DLASRC = \
154
+    dgbbrd.o dgbcon.o dgbequ.o dgbrfs.o dgbsv.o  \
155
+@@ -249,9 +249,9 @@
156
+    dgegs.o  dgegv.o  dgehd2.o dgehrd.o dgelq2.o dgelqf.o \
157
+    dgels.o  dgelsd.o dgelss.o dgelsx.o dgelsy.o dgeql2.o dgeqlf.o \
158
+    dgeqp3.o dgeqpf.o dgeqr2.o dgeqr2p.o dgeqrf.o dgeqrfp.o dgerfs.o \
159
+-   dgerq2.o dgerqf.o dgesc2.o dgesdd.o dgesv.o  dgesvd.o dgesvx.o  \
160
+-   dgetc2.o dgetf2.o dgetrf.o dgetri.o \
161
+-   dgetrs.o dggbak.o dggbal.o dgges.o  dggesx.o dggev.o  dggevx.o \
162
++   dgerq2.o dgerqf.o dgesc2.o dgesdd.o dgesvd.o dgesvx.o  \
163
++   dgetc2.o dgetri.o \
164
++   dggbak.o dggbal.o dgges.o  dggesx.o dggev.o  dggevx.o \
165
+    dggglm.o dgghrd.o dgglse.o dggqrf.o \
166
+    dggrqf.o dggsvd.o dggsvp.o dgtcon.o dgtrfs.o dgtsv.o  \
167
+    dgtsvx.o dgttrf.o dgttrs.o dgtts2.o dhgeqz.o \
168
+@@ -266,16 +266,16 @@
169
+    dlaqtr.o dlar1v.o dlar2v.o iladlr.o iladlc.o \
170
+    dlarf.o  dlarfb.o dlarfg.o dlarfgp.o dlarft.o dlarfx.o \
171
+    dlargv.o dlarrv.o dlartv.o  \
172
+-   dlarz.o  dlarzb.o dlarzt.o dlaswp.o dlasy2.o dlasyf.o \
173
+-   dlatbs.o dlatdf.o dlatps.o dlatrd.o dlatrs.o dlatrz.o dlatzm.o dlauu2.o \
174
+-   dlauum.o dopgtr.o dopmtr.o dorg2l.o dorg2r.o \
175
++   dlarz.o  dlarzb.o dlarzt.o dlasy2.o dlasyf.o \
176
++   dlatbs.o dlatdf.o dlatps.o dlatrd.o dlatrs.o dlatrz.o dlatzm.o \
177
++   dopgtr.o dopmtr.o dorg2l.o dorg2r.o \
178
+    dorgbr.o dorghr.o dorgl2.o dorglq.o dorgql.o dorgqr.o dorgr2.o \
179
+    dorgrq.o dorgtr.o dorm2l.o dorm2r.o \
180
+    dormbr.o dormhr.o dorml2.o dormlq.o dormql.o dormqr.o dormr2.o \
181
+    dormr3.o dormrq.o dormrz.o dormtr.o dpbcon.o dpbequ.o dpbrfs.o \
182
+    dpbstf.o dpbsv.o  dpbsvx.o \
183
+    dpbtf2.o dpbtrf.o dpbtrs.o dpocon.o dpoequ.o dporfs.o dposv.o  \
184
+-   dposvx.o dpotf2.o dpotrf.o dpotri.o dpotrs.o dpstrf.o dpstf2.o \
185
++   dposvx.o dpotrs.o dpstrf.o dpstf2.o \
186
+    dppcon.o dppequ.o \
187
+    dpprfs.o dppsv.o  dppsvx.o dpptrf.o dpptri.o dpptrs.o dptcon.o \
188
+    dpteqr.o dptrfs.o dptsv.o  dptsvx.o dpttrs.o dptts2.o drscl.o  \
189
+@@ -292,7 +292,7 @@
190
+    dtgsja.o dtgsna.o dtgsy2.o dtgsyl.o dtpcon.o dtprfs.o dtptri.o \
191
+    dtptrs.o \
192
+    dtrcon.o dtrevc.o dtrexc.o dtrrfs.o dtrsen.o dtrsna.o dtrsyl.o \
193
+-   dtrti2.o dtrtri.o dtrtrs.o dtzrqf.o dtzrzf.o dstemr.o \
194
++   dtrtrs.o dtzrqf.o dtzrzf.o dstemr.o \
195
+    dsgesv.o dsposv.o dlag2s.o slag2d.o dlat2s.o \
196
+    dlansf.o dpftrf.o dpftri.o dpftrs.o dsfrk.o dtfsm.o dtftri.o dtfttp.o \
197
+    dtfttr.o dtpttf.o dtpttr.o dtrttf.o dtrttp.o \
198
+@@ -319,8 +319,8 @@
199
+    zgegs.o  zgegv.o  zgehd2.o zgehrd.o zgelq2.o zgelqf.o \
200
+    zgels.o  zgelsd.o zgelss.o zgelsx.o zgelsy.o zgeql2.o zgeqlf.o zgeqp3.o \
201
+    zgeqpf.o zgeqr2.o zgeqr2p.o zgeqrf.o zgeqrfp.o zgerfs.o zgerq2.o zgerqf.o \
202
+-   zgesc2.o zgesdd.o zgesv.o  zgesvd.o zgesvx.o zgetc2.o zgetf2.o zgetrf.o \
203
+-   zgetri.o zgetrs.o \
204
++   zgesc2.o zgesdd.o zgesvd.o zgesvx.o zgetc2.o \
205
++   zgetri.o \
206
+    zggbak.o zggbal.o zgges.o  zggesx.o zggev.o  zggevx.o zggglm.o \
207
+    zgghrd.o zgglse.o zggqrf.o zggrqf.o \
208
+    zggsvd.o zggsvp.o \
209
+@@ -350,22 +350,22 @@
210
+    zlarfg.o zlarft.o zlarfgp.o \
211
+    zlarfx.o zlargv.o zlarnv.o zlarrv.o zlartg.o zlartv.o \
212
+    zlarz.o  zlarzb.o zlarzt.o zlascl.o zlaset.o zlasr.o  \
213
+-   zlassq.o zlaswp.o zlasyf.o \
214
+-   zlatbs.o zlatdf.o zlatps.o zlatrd.o zlatrs.o zlatrz.o zlatzm.o zlauu2.o \
215
+-   zlauum.o zpbcon.o zpbequ.o zpbrfs.o zpbstf.o zpbsv.o  \
216
++   zlassq.o zlasyf.o \
217
++   zlatbs.o zlatdf.o zlatps.o zlatrd.o zlatrs.o zlatrz.o zlatzm.o \
218
++   zpbcon.o zpbequ.o zpbrfs.o zpbstf.o zpbsv.o  \
219
+    zpbsvx.o zpbtf2.o zpbtrf.o zpbtrs.o zpocon.o zpoequ.o zporfs.o \
220
+-   zposv.o  zposvx.o zpotf2.o zpotrf.o zpotri.o zpotrs.o zpstrf.o zpstf2.o \
221
++   zposv.o  zposvx.o zpotrs.o zpstrf.o zpstf2.o \
222
+    zppcon.o zppequ.o zpprfs.o zppsv.o  zppsvx.o zpptrf.o zpptri.o zpptrs.o \
223
+    zptcon.o zpteqr.o zptrfs.o zptsv.o  zptsvx.o zpttrf.o zpttrs.o zptts2.o \
224
+-   zrot.o   zspcon.o zspmv.o  zspr.o   zsprfs.o zspsv.o  \
225
++   zrot.o   zspcon.o zsprfs.o zspsv.o  \
226
+    zspsvx.o zsptrf.o zsptri.o zsptrs.o zdrscl.o zstedc.o \
227
+-   zstegr.o zstein.o zsteqr.o zsycon.o zsymv.o \
228
+-   zsyr.o   zsyrfs.o zsysv.o  zsysvx.o zsytf2.o zsytrf.o zsytri.o zsytri2.o zsytri2x.o \
229
++   zstegr.o zstein.o zsteqr.o zsycon.o \
230
++   zsyrfs.o zsysv.o  zsysvx.o zsytf2.o zsytrf.o zsytri.o zsytri2.o zsytri2x.o \
231
+    zsyswapr.o zsytrs.o zsytrs2.o zsyconv.o ztbcon.o ztbrfs.o ztbtrs.o ztgevc.o ztgex2.o \
232
+    ztgexc.o ztgsen.o ztgsja.o ztgsna.o ztgsy2.o ztgsyl.o ztpcon.o \
233
+    ztprfs.o ztptri.o \
234
+    ztptrs.o ztrcon.o ztrevc.o ztrexc.o ztrrfs.o ztrsen.o ztrsna.o \
235
+-   ztrsyl.o ztrti2.o ztrtri.o ztrtrs.o ztzrqf.o ztzrzf.o zung2l.o \
236
++   ztrsyl.o ztrtrs.o ztzrqf.o ztzrzf.o zung2l.o \
237
+    zung2r.o zungbr.o zunghr.o zungl2.o zunglq.o zungql.o zungqr.o zungr2.o \
238
+    zungrq.o zungtr.o zunm2l.o zunm2r.o zunmbr.o zunmhr.o zunml2.o \
239
+    zunmlq.o zunmql.o zunmqr.o zunmr2.o zunmr3.o zunmrq.o zunmrz.o \
240
+@@ -393,34 +393,46 @@
241
+ 
242
+ ALLOBJ = $(SLASRC) $(DLASRC) $(DSLASRC) $(CLASRC) $(ZLASRC) $(ZCLASRC) \
243
+    $(SCLAUX) $(DZLAUX) $(ALLAUX)
244
++ 
245
++ALLOBJ_P = $(ALLOBJ:.$(SUFFIX)=.$(PSUFFIX))
246
++
247
++
248
+ 
249
+ ifdef USEXBLAS
250
+ ALLXOBJ = $(SXLASRC) $(DXLASRC) $(CXLASRC) $(ZXLASRC)
251
+ endif
252
+ 
253
+ all: ../$(LAPACKLIB)
254
++ 
255
++lapack_prof: ../$(LAPACKLIB_P)
256
++
257
++
258
+ 
259
+ ../$(LAPACKLIB): $(ALLOBJ) $(ALLXOBJ)
260
+-	$(ARCH) $(ARCHFLAGS) $@ $(ALLOBJ) $(ALLXOBJ)
261
++	$(ARCH_) $(ARCHFLAGS) $@ $(ALLOBJ) $(ALLXOBJ)
262
++	$(RANLIB) $@
263
++ 
264
++../$(LAPACKLIB_P): $(ALLOBJ_P)
265
++	$(ARCH_) $(ARCHFLAGS) $@ $(ALLOBJ_P)
266
+ 	$(RANLIB) $@
267
+ 
268
+ single: $(SLASRC) $(DSLASRC) $(SXLASRC) $(SCLAUX) $(ALLAUX)
269
+-	$(ARCH) $(ARCHFLAGS) ../$(LAPACKLIB) $(SLASRC) $(DSLASRC) \
270
++	$(ARCH_) $(ARCHFLAGS) ../$(LAPACKLIB) $(SLASRC) $(DSLASRC) \
271
+ 	$(SXLASRC) $(SCLAUX) $(ALLAUX) $(ALLXAUX)
272
+ 	$(RANLIB) ../$(LAPACKLIB)
273
+ 
274
+ complex: $(CLASRC) $(ZCLASRC) $(CXLASRC) $(SCLAUX) $(ALLAUX)
275
+-	$(ARCH) $(ARCHFLAGS) ../$(LAPACKLIB) $(CLASRC) $(ZCLASRC) \
276
++	$(ARCH_) $(ARCHFLAGS) ../$(LAPACKLIB) $(CLASRC) $(ZCLASRC) \
277
+ 	$(CXLASRC) $(SCLAUX) $(ALLAUX) $(ALLXAUX)
278
+ 	$(RANLIB) ../$(LAPACKLIB)
279
+ 
280
+ double: $(DLASRC) $(DSLASRC) $(DXLASRC) $(DZLAUX) $(ALLAUX)
281
+-	$(ARCH) $(ARCHFLAGS) ../$(LAPACKLIB) $(DLASRC) $(DSLASRC) \
282
++	$(ARCH_) $(ARCHFLAGS) ../$(LAPACKLIB) $(DLASRC) $(DSLASRC) \
283
+ 	$(DXLASRC) $(DZLAUX) $(ALLAUX) $(ALLXAUX)
284
+ 	$(RANLIB) ../$(LAPACKLIB)
285
+ 
286
+ complex16: $(ZLASRC) $(ZCLASRC) $(ZXLASRC) $(DZLAUX) $(ALLAUX)
287
+-	$(ARCH) $(ARCHFLAGS) ../$(LAPACKLIB) $(ZLASRC) $(ZCLASRC) \
288
++	$(ARCH_) $(ARCHFLAGS) ../$(LAPACKLIB) $(ZLASRC) $(ZCLASRC) \
289
+ 	$(ZXLASRC) $(DZLAUX) $(ALLAUX) $(ALLXAUX)
290
+ 	$(RANLIB) ../$(LAPACKLIB)
291
+ 
292
+@@ -444,13 +456,20 @@
293
+ 	@FRC=$(FRC)
294
+ 
295
+ clean:
296
+-	rm -f *.o
297
++	rm -f *.o *.$(PSUFFIX)
298
+ 
299
+-.f.o: 
300
++%.o: %.f
301
+ 	$(FORTRAN) $(OPTS) -c $< -o $@
302
+ 
303
++%.$(PSUFFIX): %.f
304
++	$(FORTRAN) $(POPTS) -c $< -o $@
305
++
306
+ slaruv.o: slaruv.f ; $(FORTRAN) $(NOOPT) -c $< -o $@
307
+ dlaruv.o: dlaruv.f ; $(FORTRAN) $(NOOPT) -c $< -o $@
308
++
309
++slaruv.$(PSUFFIX): slaruv.f ; $(FORTRAN) $(PNOOPT) -c $< -o $@
310
++dlaruv.$(PSUFFIX): dlaruv.f ; $(FORTRAN) $(PNOOPT) -c $< -o $@
311
++
312
+ sla_wwaddw.o: sla_wwaddw.f ; $(FORTRAN) $(NOOPT) -c $< -o $@
313
+ dla_wwaddw.o: dla_wwaddw.f ; $(FORTRAN) $(NOOPT) -c $< -o $@
314
+ cla_wwaddw.o: cla_wwaddw.f ; $(FORTRAN) $(NOOPT) -c $< -o $@
315
+
316
+--- a/lapack-3.4.0/TESTING/EIG/Makefile	2011-09-27 06:52:31.000000000 +0900
317
++++ lapack-3.4.0/TESTING/EIG/Makefile
318
+@@ -129,22 +129,22 @@
319
+ ../xeigtsts: $(SEIGTST) $(SCIGTST) $(AEIGTST) ../../$(LAPACKLIB); \
320
+           $(LOADER) $(LOADOPTS) -o xeigtsts \
321
+           $(SEIGTST) $(SCIGTST) $(AEIGTST) ../../$(TMGLIB) \
322
+-	  ../../$(LAPACKLIB) $(BLASLIB) && mv xeigtsts $@
323
++	  ../../$(LAPACKLIB) $(BLASLIB) $(CEXTRALIB) && mv xeigtsts $@
324
+ 
325
+ ../xeigtstc: $(CEIGTST) $(SCIGTST) $(AEIGTST) ../../$(LAPACKLIB); \
326
+           $(LOADER) $(LOADOPTS) -o xeigtstc \
327
+           $(CEIGTST) $(SCIGTST) $(AEIGTST) ../../$(TMGLIB) \
328
+-	  ../../$(LAPACKLIB) $(BLASLIB) && mv xeigtstc $@
329
++	  ../../$(LAPACKLIB) $(BLASLIB) $(CEXTRALIB) && mv xeigtstc $@
330
+ 
331
+ ../xeigtstd: $(DEIGTST) $(DZIGTST) $(AEIGTST) ../../$(LAPACKLIB); \
332
+           $(LOADER) $(LOADOPTS) -o xeigtstd \
333
+           $(DEIGTST) $(DZIGTST) $(AEIGTST) ../../$(TMGLIB) \
334
+-	  ../../$(LAPACKLIB) $(BLASLIB) && mv xeigtstd $@
335
++	  ../../$(LAPACKLIB) $(BLASLIB) $(CEXTRALIB) && mv xeigtstd $@
336
+ 
337
+ ../xeigtstz: $(ZEIGTST) $(DZIGTST) $(AEIGTST) ../../$(LAPACKLIB); \
338
+           $(LOADER) $(LOADOPTS) -o xeigtstz \
339
+           $(ZEIGTST) $(DZIGTST) $(AEIGTST) ../../$(TMGLIB) \
340
+-	  ../../$(LAPACKLIB) $(BLASLIB) && mv xeigtstz $@
341
++	  ../../$(LAPACKLIB) $(BLASLIB) $(CEXTRALIB) && mv xeigtstz $@
342
+ 
343
+ $(AEIGTST): $(FRC)
344
+ $(SCIGTST): $(FRC)
345
+
346
+--- a/lapack-3.4.0/TESTING/LIN/Makefile	2011-11-01 07:21:11.000000000 +0900
347
++++ lapack-3.4.0/TESTING/LIN/Makefile
348
+@@ -243,27 +243,27 @@
349
+ 
350
+ xlintsts : $(ALINTST) $(SLINTST) $(SCLNTST) ../../$(LAPACKLIB)
351
+ 	$(LOADER) $(LOADOPTS)  $(ALINTST) $(SCLNTST) $(SLINTST) \
352
+-        ../../$(TMGLIB) ../../$(LAPACKLIB) $(XBLASLIB)  $(BLASLIB) -o $@
353
++        ../../$(TMGLIB) ../../$(LAPACKLIB) $(XBLASLIB)  $(BLASLIB) $(CEXTRALIB) -o $@
354
+ 
355
+ xlintstc : $(ALINTST) $(CLINTST) $(SCLNTST) ../../$(LAPACKLIB)
356
+ 	$(LOADER) $(LOADOPTS)  $(ALINTST) $(SCLNTST) $(CLINTST) \
357
+-        ../../$(TMGLIB) ../../$(LAPACKLIB) $(XBLASLIB)  $(BLASLIB) -o $@
358
++        ../../$(TMGLIB) ../../$(LAPACKLIB) $(XBLASLIB)  $(BLASLIB) $(CEXTRALIB) -o $@
359
+  
360
+ xlintstd : $(ALINTST) $(DLINTST) $(DZLNTST) ../../$(LAPACKLIB)
361
+ 	$(LOADER) $(LOADOPTS) $^ \
362
+-        ../../$(TMGLIB) ../../$(LAPACKLIB) $(XBLASLIB) $(BLASLIB) -o $@
363
++        ../../$(TMGLIB) ../../$(LAPACKLIB) $(XBLASLIB) $(BLASLIB) $(CEXTRALIB) -o $@
364
+  
365
+ xlintstz : $(ALINTST) $(ZLINTST) $(DZLNTST) ../../$(LAPACKLIB)
366
+ 	$(LOADER) $(LOADOPTS)  $(ALINTST) $(DZLNTST) $(ZLINTST) \
367
+-        ../../$(TMGLIB) ../../$(LAPACKLIB) $(XBLASLIB)  $(BLASLIB) -o $@
368
++        ../../$(TMGLIB) ../../$(LAPACKLIB) $(XBLASLIB)  $(BLASLIB) $(CEXTRALIB) -o $@
369
+  
370
+ xlintstds : $(DSLINTST) ../../$(LAPACKLIB)
371
+ 	$(LOADER) $(LOADOPTS)  $(DSLINTST) \
372
+-        ../../$(TMGLIB) ../../$(LAPACKLIB) $(BLASLIB) -o $@
373
++        ../../$(TMGLIB) ../../$(LAPACKLIB) $(BLASLIB) $(CEXTRALIB) -o $@
374
+  
375
+ xlintstzc : $(ZCLINTST) ../../$(LAPACKLIB)
376
+ 	$(LOADER) $(LOADOPTS)  $(ZCLINTST) \
377
+-        ../../$(TMGLIB) ../../$(LAPACKLIB) $(BLASLIB) -o $@
378
++        ../../$(TMGLIB) ../../$(LAPACKLIB) $(BLASLIB) $(CEXTRALIB) -o $@
379
+  
380
+ xlintstrfs : $(SLINTSTRFP) ../../$(LAPACKLIB)
381
+ 	$(LOADER) $(LOADOPTS)  $(SLINTSTRFP) \
(-)a/math/gotoblas/files/pkg-message.in (-12 lines)
Removed Link Here
1
[
2
{ type: install
3
  message: <<EOM
4
GotoBLAS has been built with a maximum limit of MAXTHREADS=%%MAXTHREADS%%
5
threads, which may be further reduced (but not increased) by the number of
6
logical processors detected at run-time, as well as the environment variable
7
GOTO_NUM_THREADS (or OMP_NUM_THREADS, if the port has been build WITH_OPENMP).
8
To modify this limit, rebuild the port after setting MAXTHREADS to a suitable
9
value in the build environment.
10
EOM
11
}
12
]
(-)a/math/gotoblas/pkg-descr (-7 lines)
Removed Link Here
1
GotoBLAS2 is a fast implementation of Basic Linear Algebra
2
Subprograms. It supports various architectures and is optimized
3
for many cores, including Intel Nehalem and Atom, Via Nano,
4
SiCortex, AMD Shanghai and Istanbul.
5
6
WWW: http://www.tacc.utexas.edu/tacc-projects/
7
- 

Return to bug 261194