summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--math/gotoblas/Makefile9
-rw-r--r--math/gotoblas/files/patch-Makefile12
-rw-r--r--math/gotoblas/files/patch-Makefile.rule6
-rw-r--r--math/gotoblas/files/patch-Makefile.system14
-rw-r--r--math/gotoblas/files/patch-c_check8
-rw-r--r--math/gotoblas/files/patch-cpuid_ia64.c4
-rw-r--r--math/gotoblas/files/patch-cpuid_sparc.c6
-rw-r--r--math/gotoblas/files/patch-exports+Makefile6
-rw-r--r--math/gotoblas/files/patch-f_check8
-rw-r--r--math/gotoblas/files/patch-patch.for_lapack-3.1.110
-rw-r--r--math/gotoblas/files/patch-patch.for_lapack-3.4.014
11 files changed, 48 insertions, 49 deletions
diff --git a/math/gotoblas/Makefile b/math/gotoblas/Makefile
index 50244ce0c257..444966cdb287 100644
--- a/math/gotoblas/Makefile
+++ b/math/gotoblas/Makefile
@@ -3,13 +3,14 @@
PORTNAME= gotoblas
PORTVERSION= 2.${GOTOBLAS2VER}.${LAPACKVER}
-PORTREVISION= 5
+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
@@ -18,9 +19,6 @@ COMMENT= Fast implementation of Basic Linear Algebra Subprograms
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/00License.txt
-BROKEN= fails to build, does not respect DISABLE_MAKE_JOBS
-
-DIST_SUBDIR= gotoblas
GOTOBLAS2VER= 1.13
GOTOBLAS2_SRCFILE= GotoBLAS2-${GOTOBLAS2VER}_bsd.tar.gz
LAPACKVER= 3.4.0
@@ -30,7 +28,7 @@ TIMING_FILE= timing.tgz
USE_LDCONFIG= yes
WRKSRC= ${WRKDIR}/GotoBLAS2
-USES= gmake perl5
+USES= fortran gmake perl5
USE_GCC= yes
USE_PERL5= build
GOTOLIBS= libgoto2 libgoto2p
@@ -107,6 +105,7 @@ post-patch:
-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 \
diff --git a/math/gotoblas/files/patch-Makefile b/math/gotoblas/files/patch-Makefile
index b2c5c0ecfde5..c58e5b73d3ed 100644
--- a/math/gotoblas/files/patch-Makefile
+++ b/math/gotoblas/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig 2010-01-21 05:54:38.000000000 +0900
-+++ Makefile 2012-01-24 17:17:35.000000000 +0900
-@@ -23,7 +23,7 @@
+--- 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) "
@@ -9,7 +9,7 @@
ifndef BINARY64
@echo " BINARY ... 32bit "
else
-@@ -142,46 +142,41 @@
+@@ -142,46 +142,41 @@ hpl_p :
fi; \
done
@@ -79,7 +79,7 @@
endif
large.tgz :
-@@ -194,21 +189,21 @@
+@@ -194,21 +189,21 @@ ifndef NOFORTRAN
-wget http://www.netlib.org/lapack/timing/timing.tgz
endif
@@ -111,7 +111,7 @@
dummy :
-@@ -223,8 +218,8 @@
+@@ -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
diff --git a/math/gotoblas/files/patch-Makefile.rule b/math/gotoblas/files/patch-Makefile.rule
index c5b2ff6ab5d0..68b556e7326a 100644
--- a/math/gotoblas/files/patch-Makefile.rule
+++ b/math/gotoblas/files/patch-Makefile.rule
@@ -1,6 +1,6 @@
---- Makefile.rule 2009-12-16 11:26:22.000000000 +0900
-+++ Makefile.rule 2009-12-31 19:16:48.000000000 +0900
-@@ -14,10 +14,10 @@
+--- Makefile.rule.orig 2010-02-05 16:02:04 UTC
++++ Makefile.rule
+@@ -14,10 +14,10 @@ VERSION = 1.13
# C compiler including binary type(32bit / 64bit). Default is gcc.
# Don't use Intel Compiler or PGI, it won't generate right codes as I expect.
diff --git a/math/gotoblas/files/patch-Makefile.system b/math/gotoblas/files/patch-Makefile.system
index 8537dc55a37d..5f8d56a36c57 100644
--- a/math/gotoblas/files/patch-Makefile.system
+++ b/math/gotoblas/files/patch-Makefile.system
@@ -1,6 +1,6 @@
---- Makefile.system.orig 2010-01-28 15:11:08.000000000 -0500
-+++ Makefile.system 2011-09-05 12:30:26.000000000 -0400
-@@ -93,6 +93,11 @@
+--- Makefile.system.orig 2010-01-28 20:11:08 UTC
++++ Makefile.system
+@@ -93,6 +93,11 @@ ifeq ($(OSNAME), Linux)
EXTRALIB += -lm
endif
@@ -12,7 +12,7 @@
ifeq ($(OSNAME), AIX)
EXTRALIB += -lm
endif
-@@ -608,7 +612,7 @@
+@@ -608,7 +613,7 @@ PATCH = patch
GREP = grep
endif
@@ -21,7 +21,7 @@
AWK = awk
REVISION = -r$(VERSION)
-@@ -631,15 +635,6 @@
+@@ -631,15 +636,6 @@ ifndef LIBSUFFIX
LIBSUFFIX = a
endif
@@ -37,7 +37,7 @@
ifndef SMP
LIBNAME = $(LIBPREFIX)$(REVISION).$(LIBSUFFIX)
LIBNAME_P = $(LIBPREFIX)$(REVISION)_p.$(LIBSUFFIX)
-@@ -647,7 +642,6 @@
+@@ -647,7 +643,6 @@ else
LIBNAME = $(LIBPREFIX)p$(REVISION).$(LIBSUFFIX)
LIBNAME_P = $(LIBPREFIX)p$(REVISION)_p.$(LIBSUFFIX)
endif
@@ -45,7 +45,7 @@
LIBSONAME = $(LIBNAME:.$(LIBSUFFIX)=.so)
-@@ -661,7 +655,7 @@
+@@ -661,7 +656,7 @@ LIBS = $(TOPDIR)/$(LIBNAME)
LIBS_P = $(TOPDIR)/$(LIBNAME_P)
export OSNAME
diff --git a/math/gotoblas/files/patch-c_check b/math/gotoblas/files/patch-c_check
index cf155b27db4f..bac33c89f532 100644
--- a/math/gotoblas/files/patch-c_check
+++ b/math/gotoblas/files/patch-c_check
@@ -1,5 +1,5 @@
---- c_check~ 2009-08-27 01:40:47.000000000 +0900
-+++ c_check 2009-09-03 15:44:04.000000000 +0900
+--- c_check.orig 2010-01-28 19:26:25 UTC
++++ c_check
@@ -2,7 +2,7 @@
# Checking cross compile
@@ -8,8 +8,8 @@
+$hostarch = `uname -m | sed -e s/i.86/x86/ | sed -e s/amd64/x86_64/` ;chop($hostarch);
$binary = $ENV{"BINARY"};
-
-@@ -143,7 +143,7 @@
+
+@@ -215,7 +215,7 @@ open(CONFFILE, "> $config" ) || die "Ca
# print $data, "\n";
print MAKEFILE "OSNAME=$os\n";
diff --git a/math/gotoblas/files/patch-cpuid_ia64.c b/math/gotoblas/files/patch-cpuid_ia64.c
index 9b72d3f46ea0..c9322c3b232d 100644
--- a/math/gotoblas/files/patch-cpuid_ia64.c
+++ b/math/gotoblas/files/patch-cpuid_ia64.c
@@ -1,5 +1,5 @@
---- cpuid_ia64.c.orig 2011-09-23 10:47:22.000000000 -0400
-+++ cpuid_ia64.c 2011-09-23 10:48:08.000000000 -0400
+--- cpuid_ia64.c.orig 2010-11-05 13:57:49 UTC
++++ cpuid_ia64.c
@@ -38,7 +38,9 @@
#include <stdio.h>
diff --git a/math/gotoblas/files/patch-cpuid_sparc.c b/math/gotoblas/files/patch-cpuid_sparc.c
index 8f66914be4dd..b6d2ca600432 100644
--- a/math/gotoblas/files/patch-cpuid_sparc.c
+++ b/math/gotoblas/files/patch-cpuid_sparc.c
@@ -1,6 +1,6 @@
---- cpuid_sparc.c.orig 2010-11-05 09:57:49.000000000 -0400
-+++ cpuid_sparc.c 2011-09-23 13:10:18.000000000 -0400
-@@ -49,6 +49,7 @@
+--- cpuid_sparc.c.orig 2010-11-05 13:57:49 UTC
++++ cpuid_sparc.c
+@@ -49,6 +49,7 @@ void get_subdirname(void){
}
void get_cpuconfig(void){
diff --git a/math/gotoblas/files/patch-exports+Makefile b/math/gotoblas/files/patch-exports+Makefile
index c7ed4098c7f3..c01806223cf8 100644
--- a/math/gotoblas/files/patch-exports+Makefile
+++ b/math/gotoblas/files/patch-exports+Makefile
@@ -1,6 +1,6 @@
---- exports/Makefile~ 2011-08-09 13:19:10.000000000 +0900
-+++ exports/Makefile 2011-08-09 13:57:42.000000000 +0900
-@@ -106,6 +106,7 @@
+--- exports/Makefile.orig 2010-02-05 16:01:00 UTC
++++ exports/Makefile
+@@ -106,6 +106,7 @@ so : ../$(LIBSONAME)
endif
ifeq ($(OSNAME), FreeBSD)
diff --git a/math/gotoblas/files/patch-f_check b/math/gotoblas/files/patch-f_check
index ac35a581c493..e887f5ca0576 100644
--- a/math/gotoblas/files/patch-f_check
+++ b/math/gotoblas/files/patch-f_check
@@ -1,6 +1,6 @@
---- f_check.orig 2011-09-05 09:17:18.000000000 -0400
-+++ f_check 2011-09-05 09:21:09.000000000 -0400
-@@ -240,7 +240,7 @@
+--- f_check.orig 2009-11-11 18:05:49 UTC
++++ f_check
+@@ -240,7 +240,7 @@ if ($link ne "") {
foreach $flags (@flags) {
if (
@@ -9,7 +9,7 @@
&& ($flags !~ /^-LIST:/)
&& ($flags !~ /^-LANG:/)
) {
-@@ -263,7 +263,7 @@
+@@ -263,7 +263,7 @@ if ($link ne "") {
}
if (
diff --git a/math/gotoblas/files/patch-patch.for_lapack-3.1.1 b/math/gotoblas/files/patch-patch.for_lapack-3.1.1
index 87477798efbe..23a771c492d0 100644
--- a/math/gotoblas/files/patch-patch.for_lapack-3.1.1
+++ b/math/gotoblas/files/patch-patch.for_lapack-3.1.1
@@ -1,6 +1,6 @@
---- patch.for_lapack-3.1.1.org 2010-02-02 11:11:11.000000000 +0900
-+++ patch.for_lapack-3.1.1 2010-02-02 11:13:40.000000000 +0900
-@@ -30,7 +30,7 @@
+--- patch.for_lapack-3.1.1.orig 2009-12-16 20:41:30 UTC
++++ patch.for_lapack-3.1.1
+@@ -30,7 +30,7 @@ diff -ruN lapack-3.1.1.old/Makefile lapa
diff -ruN lapack-3.1.1.old/SRC/Makefile lapack-3.1.1/SRC/Makefile
--- lapack-3.1.1.old/SRC/Makefile 2007-02-23 15:33:05.000000000 -0600
+++ lapack-3.1.1/SRC/Makefile 2009-12-16 14:41:09.000000000 -0600
@@ -9,7 +9,7 @@
#
#######################################################################
-@@ -531,17 +531,35 @@
+@@ -531,17 +531,35 @@ diff -ruN lapack-3.1.1.old/SRC/Makefile
+ALLOBJ_P = $(ALLOBJ:.$(SUFFIX)=.$(PSUFFIX))
+
../$(LAPACKLIB): $(ALLOBJ)
@@ -52,7 +52,7 @@
$(DZLAUX)
$(RANLIB) ../$(LAPACKLIB)
-@@ -570,115 +588,4 @@
+@@ -570,115 +588,4 @@ diff -ruN lapack-3.1.1.old/SRC/Makefile
+slaruv.$(PSUFFIX): slaruv.f ; $(FORTRAN) $(PNOOPT) -O0 -c $< -o $@
+dlaruv.$(PSUFFIX): dlaruv.f ; $(FORTRAN) $(PNOOPT) -O0 -c $< -o $@
diff --git a/math/gotoblas/files/patch-patch.for_lapack-3.4.0 b/math/gotoblas/files/patch-patch.for_lapack-3.4.0
index fb0f2dac5309..8c9ab4fc44e6 100644
--- a/math/gotoblas/files/patch-patch.for_lapack-3.4.0
+++ b/math/gotoblas/files/patch-patch.for_lapack-3.4.0
@@ -1,9 +1,9 @@
---- /dev/null 2012-02-01 12:00:00.000000000 +0900
-+++ patch.for_lapack-3.4.0 2012-02-01 11:59:44.000000000 +0900
+--- patch.for_lapack-3.4.0.orig 2015-12-11 10:27:29 UTC
++++ patch.for_lapack-3.4.0
@@ -0,0 +1,378 @@
+
+--- a/lapack-3.4.0/INSTALL/Makefile 2011-10-01 11:37:03.000000000 +0900
-++++ lapack-3.4.0/INSTALL/Makefile 2012-02-01 11:05:05.000000000 +0900
+++++ lapack-3.4.0/INSTALL/Makefile
+@@ -27,7 +27,7 @@
+ $(LOADER) $(LOADOPTS) -o testversion ilaver.o LAPACK_version.o
+
@@ -15,7 +15,7 @@
+
+diff -ur /work/ports/va/lapack-3.4.0/Makefile lapack-3.4.0/Makefile
+--- a/lapack-3.4.0/Makefile 2011-11-12 06:08:04.000000000 +0900
-++++ lapack-3.4.0/Makefile 2012-02-01 11:05:05.000000000 +0900
+++++ lapack-3.4.0/Makefile
+@@ -20,9 +20,12 @@
+ blaslib:
+ ( cd BLAS/SRC; $(MAKE) )
@@ -32,7 +32,7 @@
+
+
+--- a/lapack-3.4.0/SRC/Makefile 2011-10-04 11:58:05.000000000 +0900
-++++ lapack-3.4.0/SRC/Makefile 2012-02-01 11:58:55.000000000 +0900
+++++ lapack-3.4.0/SRC/Makefile
+@@ -54,9 +54,9 @@
+ #
+ #######################################################################
@@ -314,7 +314,7 @@
+ cla_wwaddw.o: cla_wwaddw.f ; $(FORTRAN) $(NOOPT) -c $< -o $@
+
+--- a/lapack-3.4.0/TESTING/EIG/Makefile 2011-09-27 06:52:31.000000000 +0900
-++++ lapack-3.4.0/TESTING/EIG/Makefile 2012-02-01 11:05:05.000000000 +0900
+++++ lapack-3.4.0/TESTING/EIG/Makefile
+@@ -129,22 +129,22 @@
+ ../xeigtsts: $(SEIGTST) $(SCIGTST) $(AEIGTST) ../../$(LAPACKLIB); \
+ $(LOADER) $(LOADOPTS) -o xeigtsts \
@@ -344,7 +344,7 @@
+ $(SCIGTST): $(FRC)
+
+--- a/lapack-3.4.0/TESTING/LIN/Makefile 2011-11-01 07:21:11.000000000 +0900
-++++ lapack-3.4.0/TESTING/LIN/Makefile 2012-02-01 11:05:05.000000000 +0900
+++++ lapack-3.4.0/TESTING/LIN/Makefile
+@@ -243,27 +243,27 @@
+
+ xlintsts : $(ALINTST) $(SLINTST) $(SCLNTST) ../../$(LAPACKLIB)
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-23 22:35:21 +0000