Attachment 164113 Details for Bug 205241 – Patch

[patch] Patch

gotoblas.diff (text/plain), 12.95 KB, created by Carlos J Puga Medina on 2015-12-11 10:38:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Carlos J Puga Medina

Created: 2015-12-11 10:38:50 UTC

Size: 12.95 KB

patch

obsolete

>diff -urN /usr/ports/math/gotoblas.old/Makefile /usr/ports/math/gotoblas/Makefile
>--- /usr/ports/math/gotoblas.old/Makefile	2015-05-14 12:15:04.000000000 +0200
>+++ /usr/ports/math/gotoblas/Makefile	2015-12-11 11:32:00.425701000 +0100
>@@ -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,7 +19,6 @@
> LICENSE=	BSD2CLAUSE
> LICENSE_FILE=	${WRKSRC}/00License.txt
> 
>-DIST_SUBDIR=	gotoblas
> GOTOBLAS2VER=	1.13
> GOTOBLAS2_SRCFILE=	GotoBLAS2-${GOTOBLAS2VER}_bsd.tar.gz
> LAPACKVER=	3.4.0
>@@ -28,7 +28,7 @@
> USE_LDCONFIG=	yes
> WRKSRC=		${WRKDIR}/GotoBLAS2
> 
>-USES=		gmake perl5
>+USES=		fortran gmake perl5
> USE_GCC=	yes
> USE_PERL5=	build
> GOTOLIBS=	libgoto2 libgoto2p
>@@ -105,6 +105,7 @@
> 	-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 -urN /usr/ports/math/gotoblas.old/files/patch-Makefile /usr/ports/math/gotoblas/files/patch-Makefile
>--- /usr/ports/math/gotoblas.old/files/patch-Makefile	2014-01-22 18:40:44.000000000 +0100
>+++ /usr/ports/math/gotoblas/files/patch-Makefile	2015-12-11 11:27:34.705780000 +0100
>@@ -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 -urN /usr/ports/math/gotoblas.old/files/patch-Makefile.rule /usr/ports/math/gotoblas/files/patch-Makefile.rule
>--- /usr/ports/math/gotoblas.old/files/patch-Makefile.rule	2014-01-22 18:40:44.000000000 +0100
>+++ /usr/ports/math/gotoblas/files/patch-Makefile.rule	2015-12-11 11:27:34.709485000 +0100
>@@ -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 -urN /usr/ports/math/gotoblas.old/files/patch-Makefile.system /usr/ports/math/gotoblas/files/patch-Makefile.system
>--- /usr/ports/math/gotoblas.old/files/patch-Makefile.system	2014-01-22 18:40:44.000000000 +0100
>+++ /usr/ports/math/gotoblas/files/patch-Makefile.system	2015-12-11 11:27:34.713112000 +0100
>@@ -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 -urN /usr/ports/math/gotoblas.old/files/patch-c_check /usr/ports/math/gotoblas/files/patch-c_check
>--- /usr/ports/math/gotoblas.old/files/patch-c_check	2014-01-22 18:40:44.000000000 +0100
>+++ /usr/ports/math/gotoblas/files/patch-c_check	2015-12-11 11:27:34.716971000 +0100
>@@ -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 -urN /usr/ports/math/gotoblas.old/files/patch-cpuid_ia64.c /usr/ports/math/gotoblas/files/patch-cpuid_ia64.c
>--- /usr/ports/math/gotoblas.old/files/patch-cpuid_ia64.c	2014-01-22 18:40:44.000000000 +0100
>+++ /usr/ports/math/gotoblas/files/patch-cpuid_ia64.c	2015-12-11 11:27:34.721104000 +0100
>@@ -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 -urN /usr/ports/math/gotoblas.old/files/patch-cpuid_sparc.c /usr/ports/math/gotoblas/files/patch-cpuid_sparc.c
>--- /usr/ports/math/gotoblas.old/files/patch-cpuid_sparc.c	2014-01-22 18:40:44.000000000 +0100
>+++ /usr/ports/math/gotoblas/files/patch-cpuid_sparc.c	2015-12-11 11:27:34.725198000 +0100
>@@ -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 -urN /usr/ports/math/gotoblas.old/files/patch-driver_others_dynamic.c /usr/ports/math/gotoblas/files/patch-driver_others_dynamic.c
>--- /usr/ports/math/gotoblas.old/files/patch-driver_others_dynamic.c	1970-01-01 01:00:00.000000000 +0100
>+++ /usr/ports/math/gotoblas/files/patch-driver_others_dynamic.c	2015-12-11 11:27:34.728882000 +0100
>@@ -0,0 +1,14 @@
>+--- 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) {
>diff -urN /usr/ports/math/gotoblas.old/files/patch-dynamic.c /usr/ports/math/gotoblas/files/patch-dynamic.c
>--- /usr/ports/math/gotoblas.old/files/patch-dynamic.c	2014-01-22 18:40:44.000000000 +0100
>+++ /usr/ports/math/gotoblas/files/patch-dynamic.c	1970-01-01 01:00:00.000000000 +0100
>@@ -1,14 +0,0 @@
>---- 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) {
>diff -urN /usr/ports/math/gotoblas.old/files/patch-exports+Makefile /usr/ports/math/gotoblas/files/patch-exports+Makefile
>--- /usr/ports/math/gotoblas.old/files/patch-exports+Makefile	2014-01-22 18:40:44.000000000 +0100
>+++ /usr/ports/math/gotoblas/files/patch-exports+Makefile	2015-12-11 11:27:34.732730000 +0100
>@@ -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 -urN /usr/ports/math/gotoblas.old/files/patch-f_check /usr/ports/math/gotoblas/files/patch-f_check
>--- /usr/ports/math/gotoblas.old/files/patch-f_check	2014-01-22 18:40:44.000000000 +0100
>+++ /usr/ports/math/gotoblas/files/patch-f_check	2015-12-11 11:27:34.737190000 +0100
>@@ -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 -urN /usr/ports/math/gotoblas.old/files/patch-patch.for_lapack-3.1.1 /usr/ports/math/gotoblas/files/patch-patch.for_lapack-3.1.1
>--- /usr/ports/math/gotoblas.old/files/patch-patch.for_lapack-3.1.1	2014-01-22 18:40:44.000000000 +0100
>+++ /usr/ports/math/gotoblas/files/patch-patch.for_lapack-3.1.1	2015-12-11 11:27:34.741199000 +0100
>@@ -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 -urN /usr/ports/math/gotoblas.old/files/patch-patch.for_lapack-3.4.0 /usr/ports/math/gotoblas/files/patch-patch.for_lapack-3.4.0
>--- /usr/ports/math/gotoblas.old/files/patch-patch.for_lapack-3.4.0	2014-01-22 18:40:44.000000000 +0100
>+++ /usr/ports/math/gotoblas/files/patch-patch.for_lapack-3.4.0	2015-12-11 11:27:34.744998000 +0100
>@@ -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)

Flags:

koobs: maintainer-approval+

Actions: View | Diff

Attachments on bug 205241: 164113 | 164392