Attachment #164113 for bug #205241





PORTNAME=	gotoblas
PORTVERSION=	2.${GOTOBLAS2VER}.${LAPACKVER}
PORTREVISION=	6
CATEGORIES=	math
MASTER_SITES=	LOCAL/maho/gotoblas \
		NL/lapack:lapack NL/lapack/timing:lapack_tmg
DISTFILES=	GotoBLAS2-${GOTOBLAS2VER}_bsd.tar.gz \
		lapack-${LAPACKVER}.tgz:lapack \
		large.tgz:lapack_tmg timing.tgz:lapack_tmg
DIST_SUBDIR=	gotoblas
EXTRACT_ONLY=	${GOTOBLAS2_SRCFILE}

MAINTAINER=	cpm@fbsd.es

LICENSE=	BSD2CLAUSE
LICENSE_FILE=	${WRKSRC}/00License.txt

DIST_SUBDIR=	gotoblas
GOTOBLAS2VER=	1.13
GOTOBLAS2_SRCFILE=	GotoBLAS2-${GOTOBLAS2VER}_bsd.tar.gz
LAPACKVER=	3.4.0

USE_LDCONFIG=	yes
WRKSRC=		${WRKDIR}/GotoBLAS2

USES=		fortran gmake perl5
USE_GCC=	yes
USE_PERL5=	build
GOTOLIBS=	libgoto2 libgoto2p

	-e 's+%%_GCC_RUNTIME%%+${_GCC_RUNTIME}+' \
	-e 's+$$(CROSS_SUFFIX)+${LOCALBASE}/bin/+' \
		${WRKSRC}/Makefile.system

.if ${PORT_OPTIONS:MOPENMP}
	${REINPLACE_CMD} -e "s+GOTO_NUM_THREADS+OMP_NUM_THREADS+g" \
		${WRKSRC}/test/Makefile \




--- Makefile.orig	2010-01-20 20:54:38 UTC
+++ Makefile
@@ -23,7 +23,7 @@ all :: libs netlib tests shared
 	@echo " GotoBLAS build complete."
 	@echo
 	@echo "  OS               ... $(OSNAME)             "

 ifndef BINARY64
 	@echo "  BINARY           ... 32bit                 "
 else
@@ -142,46 +142,41 @@ hpl_p :
 	fi; \
 	done
 

 endif
 
 large.tgz : 
@@ -194,21 +189,21 @@ ifndef NOFORTRAN
 	-wget http://www.netlib.org/lapack/timing/timing.tgz
 endif
 

 
 dummy :
 
@@ -223,8 +218,8 @@ ifdef DYNAMIC_ARCH
 endif
 	@rm -f *.$(LIBSUFFIX) *.so *~ *.exe getarch getarch_2nd *.dll *.lib *.$(SUFFIX) *.dwf libgoto2.$(LIBSUFFIX) libgoto2_p.$(LIBSUFFIX) *.lnk myconfig.h
 	@rm -f Makefile.conf config.h Makefile_kernel.conf config_kernel.h st* *.dylib

Lines 1-6 Link Here

(-)/usr/ports/math/gotoblas/files/patch-Makefile.rule (-3 / +3 lines)
1	--- Makefile.rule 2009-12-16 11:26:22.000000000 +0900	1	--- Makefile.rule.orig 2010-02-05 16:02:04 UTC
2	+++ Makefile.rule 2009-12-31 19:16:48.000000000 +0900	2	+++ Makefile.rule
3	@@ -14,10 +14,10 @@	3	@@ -14,10 +14,10 @@ VERSION = 1.13
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.




--- Makefile.system.orig	2010-01-28 20:11:08 UTC
+++ Makefile.system
@@ -93,6 +93,11 @@ ifeq ($(OSNAME), Linux)
 EXTRALIB	+= -lm
 endif
 

 ifeq ($(OSNAME), AIX)
 EXTRALIB	+= -lm
 endif
@@ -608,7 +613,7 @@ PATCH	= patch
 GREP	= grep
 endif
 

 AWK	= awk
 
 REVISION = -r$(VERSION)
@@ -631,15 +636,6 @@ ifndef LIBSUFFIX
 LIBSUFFIX = a
 endif
 

 ifndef SMP
 LIBNAME		= $(LIBPREFIX)$(REVISION).$(LIBSUFFIX)
 LIBNAME_P	= $(LIBPREFIX)$(REVISION)_p.$(LIBSUFFIX)
@@ -647,7 +643,6 @@ else
 LIBNAME		= $(LIBPREFIX)p$(REVISION).$(LIBSUFFIX)
 LIBNAME_P	= $(LIBPREFIX)p$(REVISION)_p.$(LIBSUFFIX)
 endif

 
 
 LIBSONAME    = $(LIBNAME:.$(LIBSUFFIX)=.so)
@@ -661,7 +656,7 @@ LIBS		= $(TOPDIR)/$(LIBNAME)
 LIBS_P		= $(TOPDIR)/$(LIBNAME_P)
 
 export OSNAME

Lines 1-5 Link Here

(-)/usr/ports/math/gotoblas/files/patch-c_check (-4 / +4 lines)
1	--- c_check~ 2009-08-27 01:40:47.000000000 +0900	1	--- c_check.orig 2010-01-28 19:26:25 UTC
2	+++ c_check 2009-09-03 15:44:04.000000000 +0900	2	+++ c_check
3	@@ -2,7 +2,7 @@	3	@@ -2,7 +2,7 @@
4		4
5	# Checking cross compile	5	# Checking cross compile
Lines 8-15 Link Here
8	+$hostarch = `uname -m \| sed -e s/i.86/x86/ \| sed -e s/amd64/x86_64/` ;chop($hostarch);	8	+$hostarch = `uname -m \| sed -e s/i.86/x86/ \| sed -e s/amd64/x86_64/` ;chop($hostarch);
9		9
10	$binary = $ENV{"BINARY"};	10	$binary = $ENV{"BINARY"};
11		11
12	@@ -143,7 +143,7 @@	12	@@ -215,7 +215,7 @@ open(CONFFILE, "> $config" ) \|\| die "Ca
13	# print $data, "\n";	13	# print $data, "\n";
14		14
15	print MAKEFILE "OSNAME=$os\n";	15	print MAKEFILE "OSNAME=$os\n";

Lines 1-5 Link Here

(-)/usr/ports/math/gotoblas/files/patch-cpuid_ia64.c (-2 / +2 lines)
1	--- cpuid_ia64.c.orig 2011-09-23 10:47:22.000000000 -0400	1	--- cpuid_ia64.c.orig 2010-11-05 13:57:49 UTC
2	+++ cpuid_ia64.c 2011-09-23 10:48:08.000000000 -0400	2	+++ cpuid_ia64.c
3	@@ -38,7 +38,9 @@	3	@@ -38,7 +38,9 @@
4		4
5	#include <stdio.h>	5	#include <stdio.h>

Lines 1-6 Link Here

(-)/usr/ports/math/gotoblas/files/patch-cpuid_sparc.c (-3 / +3 lines)
1	--- cpuid_sparc.c.orig 2010-11-05 09:57:49.000000000 -0400	1	--- cpuid_sparc.c.orig 2010-11-05 13:57:49 UTC
2	+++ cpuid_sparc.c 2011-09-23 13:10:18.000000000 -0400	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){




--- driver/others/dynamic.c.orig	2010-11-05 13:57:49 UTC
+++ driver/others/dynamic.c
@@ -198,9 +198,9 @@ void gotoblas_dynamic_init(void) {
   gotoblas = get_coretype();
   
 #ifdef ARCH_X86
-  if (gotoblas == NULL) gotoblas = gotoblas_KATMAI;
+  if (gotoblas == NULL) gotoblas = &gotoblas_KATMAI;
 #else
-  if (gotoblas == NULL) gotoblas = gotoblas_PRESCOTT;
+  if (gotoblas == NULL) gotoblas = &gotoblas_PRESCOTT;
 #endif
   
   if (gotoblas && gotoblas -> init) {




--- driver/others/dynamic.c~	2010-01-21 01:28:45.000000000 +0900
+++ driver/others/dynamic.c	2010-02-16 13:43:09.000000000 +0900
@@ -181,9 +181,9 @@
   gotoblas = get_coretype();
   
 #ifdef ARCH_X86
-  if (gotoblas == NULL) gotoblas = gotoblas_KATMAI;
+  if (gotoblas == NULL) gotoblas = &gotoblas_KATMAI;
 #else
-  if (gotoblas == NULL) gotoblas = gotoblas_PRESCOTT;
+  if (gotoblas == NULL) gotoblas = &gotoblas_PRESCOTT;
 #endif
   
   if (gotoblas && gotoblas -> init) {

Lines 1-6 Link Here

(-)/usr/ports/math/gotoblas/files/patch-exports+Makefile (-3 / +3 lines)
1	--- exports/Makefile~ 2011-08-09 13:19:10.000000000 +0900	1	--- exports/Makefile.orig 2010-02-05 16:01:00 UTC
2	+++ exports/Makefile 2011-08-09 13:57:42.000000000 +0900	2	+++ exports/Makefile
3	@@ -106,6 +106,7 @@	3	@@ -106,6 +106,7 @@ so : ../$(LIBSONAME)
4	endif	4	endif
5		5
6	ifeq ($(OSNAME), FreeBSD)	6	ifeq ($(OSNAME), FreeBSD)

Lines 1-6 Link Here

(-)/usr/ports/math/gotoblas/files/patch-f_check (-4 / +4 lines)
1	--- f_check.orig 2011-09-05 09:17:18.000000000 -0400	1	--- f_check.orig 2009-11-11 18:05:49 UTC
2	+++ f_check 2011-09-05 09:21:09.000000000 -0400	2	+++ f_check
3	@@ -240,7 +240,7 @@	3	@@ -240,7 +240,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	@@ -263,7 +263,7 @@	12	@@ -263,7 +263,7 @@ if ($link ne "") {
13	}	13	}
14		14
15	if (	15	if (

Lines 1-6 Link Here

(-)/usr/ports/math/gotoblas/files/patch-patch.for_lapack-3.1.1 (-5 / +5 lines)
1	--- patch.for_lapack-3.1.1.org 2010-02-02 11:11:11.000000000 +0900	1	--- patch.for_lapack-3.1.1.orig 2009-12-16 20:41:30 UTC
2	+++ patch.for_lapack-3.1.1 2010-02-02 11:13:40.000000000 +0900	2	+++ patch.for_lapack-3.1.1
3	@@ -30,7 +30,7 @@	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	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	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	6	+++ lapack-3.1.1/SRC/Makefile 2009-12-16 14:41:09.000000000 -0600
Lines 9-15 Link Here
9	#	9	#
10	#######################################################################	10	#######################################################################
11		11
12	@@ -531,17 +531,35 @@	12	@@ -531,17 +531,35 @@ diff -ruN lapack-3.1.1.old/SRC/Makefile
13	+ALLOBJ_P = $(ALLOBJ:.$(SUFFIX)=.$(PSUFFIX))	13	+ALLOBJ_P = $(ALLOBJ:.$(SUFFIX)=.$(PSUFFIX))
14	+	14	+
15	../$(LAPACKLIB): $(ALLOBJ)	15	../$(LAPACKLIB): $(ALLOBJ)
Lines 52-58 Link Here
52	$(DZLAUX)	52	$(DZLAUX)
53	$(RANLIB) ../$(LAPACKLIB)	53	$(RANLIB) ../$(LAPACKLIB)
54		54
55	@@ -570,115 +588,4 @@	55	@@ -570,115 +588,4 @@ diff -ruN lapack-3.1.1.old/SRC/Makefile
56		56
57	+slaruv.$(PSUFFIX): slaruv.f ; $(FORTRAN) $(PNOOPT) -O0 -c $< -o $@	57	+slaruv.$(PSUFFIX): slaruv.f ; $(FORTRAN) $(PNOOPT) -O0 -c $< -o $@
58	+dlaruv.$(PSUFFIX): dlaruv.f ; $(FORTRAN) $(PNOOPT) -O0 -c $< -o $@	58	+dlaruv.$(PSUFFIX): dlaruv.f ; $(FORTRAN) $(PNOOPT) -O0 -c $< -o $@

Lines 1-9 Link Here

(-)/usr/ports/math/gotoblas/files/patch-patch.for_lapack-3.4.0 (-7 / +7 lines)
1	--- /dev/null 2012-02-01 12:00:00.000000000 +0900	1	--- patch.for_lapack-3.4.0.orig 2015-12-11 10:27:29 UTC
2	+++ patch.for_lapack-3.4.0 2012-02-01 11:59:44.000000000 +0900	2	+++ patch.for_lapack-3.4.0
3	@@ -0,0 +1,378 @@	3	@@ -0,0 +1,378 @@
4	+	4	+
5	+--- a/lapack-3.4.0/INSTALL/Makefile 2011-10-01 11:37:03.000000000 +0900	5	+--- a/lapack-3.4.0/INSTALL/Makefile 2011-10-01 11:37:03.000000000 +0900
6	++++ lapack-3.4.0/INSTALL/Makefile 2012-02-01 11:05:05.000000000 +0900	6	++++ lapack-3.4.0/INSTALL/Makefile
7	+@@ -27,7 +27,7 @@	7	+@@ -27,7 +27,7 @@
8	+ $(LOADER) $(LOADOPTS) -o testversion ilaver.o LAPACK_version.o	8	+ $(LOADER) $(LOADOPTS) -o testversion ilaver.o LAPACK_version.o
9	+	9	+
Lines 15-21 Link Here
15	+	15	+
16	+diff -ur /work/ports/va/lapack-3.4.0/Makefile lapack-3.4.0/Makefile	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	17	+--- a/lapack-3.4.0/Makefile 2011-11-12 06:08:04.000000000 +0900
18	++++ lapack-3.4.0/Makefile 2012-02-01 11:05:05.000000000 +0900	18	++++ lapack-3.4.0/Makefile
19	+@@ -20,9 +20,12 @@	19	+@@ -20,9 +20,12 @@
20	+ blaslib:	20	+ blaslib:
21	+ ( cd BLAS/SRC; $(MAKE) )	21	+ ( cd BLAS/SRC; $(MAKE) )
Lines 32-38 Link Here
32	+	32	+
33	+	33	+
34	+--- a/lapack-3.4.0/SRC/Makefile 2011-10-04 11:58:05.000000000 +0900	34	+--- a/lapack-3.4.0/SRC/Makefile 2011-10-04 11:58:05.000000000 +0900
35	++++ lapack-3.4.0/SRC/Makefile 2012-02-01 11:58:55.000000000 +0900	35	++++ lapack-3.4.0/SRC/Makefile
36	+@@ -54,9 +54,9 @@	36	+@@ -54,9 +54,9 @@
37	+ #	37	+ #
38	+ #######################################################################	38	+ #######################################################################
Lines 314-320 Link Here
314	+ cla_wwaddw.o: cla_wwaddw.f ; $(FORTRAN) $(NOOPT) -c $< -o $@	314	+ cla_wwaddw.o: cla_wwaddw.f ; $(FORTRAN) $(NOOPT) -c $< -o $@
315	+	315	+
316	+--- a/lapack-3.4.0/TESTING/EIG/Makefile 2011-09-27 06:52:31.000000000 +0900	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 2012-02-01 11:05:05.000000000 +0900	317	++++ lapack-3.4.0/TESTING/EIG/Makefile
318	+@@ -129,22 +129,22 @@	318	+@@ -129,22 +129,22 @@
319	+ ../xeigtsts: $(SEIGTST) $(SCIGTST) $(AEIGTST) ../../$(LAPACKLIB); \	319	+ ../xeigtsts: $(SEIGTST) $(SCIGTST) $(AEIGTST) ../../$(LAPACKLIB); \
320	+ $(LOADER) $(LOADOPTS) -o xeigtsts \	320	+ $(LOADER) $(LOADOPTS) -o xeigtsts \
Lines 344-350 Link Here
344	+ $(SCIGTST): $(FRC)	344	+ $(SCIGTST): $(FRC)
345	+	345	+
346	+--- a/lapack-3.4.0/TESTING/LIN/Makefile 2011-11-01 07:21:11.000000000 +0900	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 2012-02-01 11:05:05.000000000 +0900	347	++++ lapack-3.4.0/TESTING/LIN/Makefile
348	+@@ -243,27 +243,27 @@	348	+@@ -243,27 +243,27 @@
349	+	349	+
350	+ xlintsts : $(ALINTST) $(SLINTST) $(SCLNTST) ../../$(LAPACKLIB)	350	+ xlintsts : $(ALINTST) $(SLINTST) $(SCLNTST) ../../$(LAPACKLIB)

Return to bug 205241

Lines 3-15 Link Here

(-)/usr/ports/math/gotoblas/Makefile (-3 / +4 lines)
3		3
4	PORTNAME= gotoblas	4	PORTNAME= gotoblas
5	PORTVERSION= 2.${GOTOBLAS2VER}.${LAPACKVER}	5	PORTVERSION= 2.${GOTOBLAS2VER}.${LAPACKVER}
6	PORTREVISION= 5	6	PORTREVISION= 6
7	CATEGORIES= math	7	CATEGORIES= math
8	MASTER_SITES= LOCAL/maho/gotoblas \	8	MASTER_SITES= LOCAL/maho/gotoblas \
9	NL/lapack:lapack NL/lapack/timing:lapack_tmg	9	NL/lapack:lapack NL/lapack/timing:lapack_tmg
10	DISTFILES= GotoBLAS2-${GOTOBLAS2VER}_bsd.tar.gz \	10	DISTFILES= GotoBLAS2-${GOTOBLAS2VER}_bsd.tar.gz \
11	lapack-${LAPACKVER}.tgz:lapack \	11	lapack-${LAPACKVER}.tgz:lapack \
12	large.tgz:lapack_tmg timing.tgz:lapack_tmg	12	large.tgz:lapack_tmg timing.tgz:lapack_tmg
		13	DIST_SUBDIR= gotoblas
13	EXTRACT_ONLY= ${GOTOBLAS2_SRCFILE}	14	EXTRACT_ONLY= ${GOTOBLAS2_SRCFILE}
14		15
15	MAINTAINER= cpm@fbsd.es	16	MAINTAINER= cpm@fbsd.es
Lines 18-24 Link Here
18	LICENSE= BSD2CLAUSE	19	LICENSE= BSD2CLAUSE
19	LICENSE_FILE= ${WRKSRC}/00License.txt	20	LICENSE_FILE= ${WRKSRC}/00License.txt
20		21
21	DIST_SUBDIR= gotoblas
22	GOTOBLAS2VER= 1.13	22	GOTOBLAS2VER= 1.13
23	GOTOBLAS2_SRCFILE= GotoBLAS2-${GOTOBLAS2VER}_bsd.tar.gz	23	GOTOBLAS2_SRCFILE= GotoBLAS2-${GOTOBLAS2VER}_bsd.tar.gz
24	LAPACKVER= 3.4.0	24	LAPACKVER= 3.4.0
Lines 28-34 Link Here
28	USE_LDCONFIG= yes	28	USE_LDCONFIG= yes
29	WRKSRC= ${WRKDIR}/GotoBLAS2	29	WRKSRC= ${WRKDIR}/GotoBLAS2
30		30
31	USES= gmake perl5	31	USES= fortran gmake perl5
32	USE_GCC= yes	32	USE_GCC= yes
33	USE_PERL5= build	33	USE_PERL5= build
34	GOTOLIBS= libgoto2 libgoto2p	34	GOTOLIBS= libgoto2 libgoto2p
Lines 105-110 Link Here
105	-e 's+%%_GCC_RUNTIME%%+${_GCC_RUNTIME}+' \	105	-e 's+%%_GCC_RUNTIME%%+${_GCC_RUNTIME}+' \
106	-e 's+$$(CROSS_SUFFIX)+${LOCALBASE}/bin/+' \	106	-e 's+$$(CROSS_SUFFIX)+${LOCALBASE}/bin/+' \
107	${WRKSRC}/Makefile.system	107	${WRKSRC}/Makefile.system
		108
108	.if ${PORT_OPTIONS:MOPENMP}	109	.if ${PORT_OPTIONS:MOPENMP}
109	${REINPLACE_CMD} -e "s+GOTO_NUM_THREADS+OMP_NUM_THREADS+g" \	110	${REINPLACE_CMD} -e "s+GOTO_NUM_THREADS+OMP_NUM_THREADS+g" \
110	${WRKSRC}/test/Makefile \	111	${WRKSRC}/test/Makefile \

Lines 1-6 Link Here

(-)/usr/ports/math/gotoblas/files/patch-Makefile (-6 / +6 lines)
1	--- Makefile.orig 2010-01-21 05:54:38.000000000 +0900	1	--- Makefile.orig 2010-01-20 20:54:38 UTC
2	+++ Makefile 2012-01-24 17:17:35.000000000 +0900	2	+++ Makefile
3	@@ -23,7 +23,7 @@	3	@@ -23,7 +23,7 @@ all :: libs netlib tests shared
4	@echo " GotoBLAS build complete."	4	@echo " GotoBLAS build complete."
5	@echo	5	@echo
6	@echo " OS ... $(OSNAME) "	6	@echo " OS ... $(OSNAME) "
Lines 9-15 Link Here
9	ifndef BINARY64	9	ifndef BINARY64
10	@echo " BINARY ... 32bit "	10	@echo " BINARY ... 32bit "
11	else	11	else
12	@@ -142,46 +142,41 @@	12	@@ -142,46 +142,41 @@ hpl_p :
13	fi; \	13	fi; \
14	done	14	done
15		15
Lines 79-85 Link Here
79	endif	79	endif
80		80
81	large.tgz :	81	large.tgz :
82	@@ -194,21 +189,21 @@	82	@@ -194,21 +189,21 @@ ifndef NOFORTRAN
83	-wget http://www.netlib.org/lapack/timing/timing.tgz	83	-wget http://www.netlib.org/lapack/timing/timing.tgz
84	endif	84	endif
85		85
Lines 111-117 Link Here
111		111
112	dummy :	112	dummy :
113		113
114	@@ -223,8 +218,8 @@	114	@@ -223,8 +218,8 @@ ifdef DYNAMIC_ARCH
115	endif	115	endif
116	@rm -f .$(LIBSUFFIX) .so ~ .exe getarch getarch_2nd .dll .lib .$(SUFFIX) .dwf libgoto2.$(LIBSUFFIX) libgoto2_p.$(LIBSUFFIX) *.lnk myconfig.h	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	117	@rm -f Makefile.conf config.h Makefile_kernel.conf config_kernel.h st* *.dylib

Lines 1-6 Link Here

(-)/usr/ports/math/gotoblas/files/patch-Makefile.system (-7 / +7 lines)
1	--- Makefile.system.orig 2010-01-28 15:11:08.000000000 -0500	1	--- Makefile.system.orig 2010-01-28 20:11:08 UTC
2	+++ Makefile.system 2011-09-05 12:30:26.000000000 -0400	2	+++ Makefile.system
3	@@ -93,6 +93,11 @@	3	@@ -93,6 +93,11 @@ ifeq ($(OSNAME), Linux)
4	EXTRALIB += -lm	4	EXTRALIB += -lm
5	endif	5	endif
6		6
Lines 12-18 Link Here
12	ifeq ($(OSNAME), AIX)	12	ifeq ($(OSNAME), AIX)
13	EXTRALIB += -lm	13	EXTRALIB += -lm
14	endif	14	endif
15	@@ -608,7 +612,7 @@	15	@@ -608,7 +613,7 @@ PATCH = patch
16	GREP = grep	16	GREP = grep
17	endif	17	endif
18		18
Lines 21-27 Link Here
21	AWK = awk	21	AWK = awk
22		22
23	REVISION = -r$(VERSION)	23	REVISION = -r$(VERSION)
24	@@ -631,15 +635,6 @@	24	@@ -631,15 +636,6 @@ ifndef LIBSUFFIX
25	LIBSUFFIX = a	25	LIBSUFFIX = a
26	endif	26	endif
27		27
Lines 37-43 Link Here
37	ifndef SMP	37	ifndef SMP
38	LIBNAME = $(LIBPREFIX)$(REVISION).$(LIBSUFFIX)	38	LIBNAME = $(LIBPREFIX)$(REVISION).$(LIBSUFFIX)
39	LIBNAME_P = $(LIBPREFIX)$(REVISION)_p.$(LIBSUFFIX)	39	LIBNAME_P = $(LIBPREFIX)$(REVISION)_p.$(LIBSUFFIX)
40	@@ -647,7 +642,6 @@	40	@@ -647,7 +643,6 @@ else
41	LIBNAME = $(LIBPREFIX)p$(REVISION).$(LIBSUFFIX)	41	LIBNAME = $(LIBPREFIX)p$(REVISION).$(LIBSUFFIX)
42	LIBNAME_P = $(LIBPREFIX)p$(REVISION)_p.$(LIBSUFFIX)	42	LIBNAME_P = $(LIBPREFIX)p$(REVISION)_p.$(LIBSUFFIX)
43	endif	43	endif
Lines 45-51 Link Here
45		45
46		46
47	LIBSONAME = $(LIBNAME:.$(LIBSUFFIX)=.so)	47	LIBSONAME = $(LIBNAME:.$(LIBSUFFIX)=.so)
48	@@ -661,7 +655,7 @@	48	@@ -661,7 +656,7 @@ LIBS = $(TOPDIR)/$(LIBNAME)
49	LIBS_P = $(TOPDIR)/$(LIBNAME_P)	49	LIBS_P = $(TOPDIR)/$(LIBNAME_P)
50		50
51	export OSNAME	51	export OSNAME

Line 0 Link Here

(-)/usr/ports/math/gotoblas/files/patch-driver_others_dynamic.c (+14 lines)
	1	--- driver/others/dynamic.c.orig 2010-11-05 13:57:49 UTC
	2	+++ driver/others/dynamic.c
	3	@@ -198,9 +198,9 @@ void gotoblas_dynamic_init(void) {
	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) {

Lines 1-14 Link Here

(-)/usr/ports/math/gotoblas/files/patch-dynamic.c (-14 lines)
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) {