Date: Sunday, June 14, 2015 @ 13:24:40 Author: arojas Revision: 135285
Fix missing variable in sdsdot.f (FS#45325) Added: cblas/trunk/fPIC.patch cblas/trunk/sdsdot.patch cblas/trunk/shared.patch Modified: cblas/trunk/PKGBUILD Deleted: cblas/trunk/Makefile.in cblas/trunk/cblas.patch --------------+ Makefile.in | 52 ---------------------------------------------------- PKGBUILD | 37 ++++++++++++++++++++----------------- cblas.patch | 11 ----------- fPIC.patch | 23 +++++++++++++++++++++++ sdsdot.patch | 19 +++++++++++++++++++ shared.patch | 11 +++++++++++ 6 files changed, 73 insertions(+), 80 deletions(-) Deleted: Makefile.in =================================================================== --- Makefile.in 2015-06-14 10:26:00 UTC (rev 135284) +++ Makefile.in 2015-06-14 11:24:40 UTC (rev 135285) @@ -1,52 +0,0 @@ -# -# Makefile.LINUX -# -# -# If you compile, change the name to Makefile.in. -# -# - -#----------------------------------------------------------------------------- -# Shell -#----------------------------------------------------------------------------- - -SHELL = /bin/sh - -#----------------------------------------------------------------------------- -# Platform -#----------------------------------------------------------------------------- - -PLAT = LINUX - -#----------------------------------------------------------------------------- -# Libraries and includs -#----------------------------------------------------------------------------- - -BLLIB = libblas.so -CBDIR = $(PWD) -CBLIBDIR = $(CBDIR)/lib -CBLIB = $(CBLIBDIR)/libcblas.a -CBSHLIB = $(CBLIBDIR)/libcblas.so - -#----------------------------------------------------------------------------- -# Compilers -#----------------------------------------------------------------------------- - -CC = gcc -FC = gfortran -LOADER = $(FC) - -#----------------------------------------------------------------------------- -# Flags for Compilers -#----------------------------------------------------------------------------- - -CFLAGS = -O3 -DADD_ -fPIC -FFLAGS = -O3 -fPIC - -#----------------------------------------------------------------------------- -# Archive programs and flags -#----------------------------------------------------------------------------- - -ARCH = ar -ARCHFLAGS = r -RANLIB = echo Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-06-14 10:26:00 UTC (rev 135284) +++ PKGBUILD 2015-06-14 11:24:40 UTC (rev 135285) @@ -5,17 +5,19 @@ pkgname=cblas pkgver=3.5.0 -pkgrel=2 +pkgrel=3 pkgdesc="C interface to BLAS" url="http://www.netlib.org/blas"; -arch=('i686' 'x86_64') -license=('custom') -depends=('blas') -makedepends=('gcc-fortran') -options=('staticlibs') # needed by fflas-ffpack -source=('http://www.netlib.org/blas/blast-forum/cblas.tgz' 'cblas.patch' 'Makefile.in' 'LICENSE') +arch=(i686 x86_64) +license=(custom) +depends=(blas) +makedepends=(gcc-fortran) +options=(staticlibs) # needed by fflas-ffpack +source=('http://www.netlib.org/blas/blast-forum/cblas.tgz' 'shared.patch' 'fPIC.patch' 'sdsdot.patch' 'Makefile.in' 'LICENSE') md5sums=('1e8830f622d2112239a4a8a83b84209a' 'e779fc195f8f48672656522bcfd642e4' + 'de4a0cf18b0e748e85d3305845f7f99b' + '733dcdded7ce1ec6d1ec01ceca200426' 'a4dc51bcd46f80b921be46f1fa855f00' '38b6acb8ed5691d25863319d30a8b365') @@ -22,14 +24,19 @@ prepare() { cd CBLAS - /bin/cp $srcdir/Makefile.in . - patch -p0 -i $srcdir/cblas.patch +# Compile with -fPIC + patch -p1 -i "$srcdir"/fPIC.patch +# Compile shared lib + patch -p0 -i "$srcdir"/shared.patch +# Fix missing variable in sdsdotstub + patch -p1 -i "$srcdir"/sdsdot.patch - install -d src/lib + cp Makefile.{LINUX,in} } build() { cd CBLAS + make alllib } @@ -37,13 +44,9 @@ install -d "$pkgdir"/usr/lib install -d "$pkgdir"/usr/include - install -m755 CBLAS/src/lib/* "$pkgdir"/usr/lib - install -m644 CBLAS/include/cblas.h "$pkgdir"/usr/include + install -m644 CBLAS/lib/* "$pkgdir"/usr/lib/ + install -m644 CBLAS/include/*.h "$pkgdir"/usr/include -# fix permissions - chmod 644 "$pkgdir"/usr/lib/libcblas.a - - install -m755 -d "$pkgdir"/usr/share/licenses/cblas + install -d "$pkgdir"/usr/share/licenses/cblas install -m644 LICENSE "$pkgdir"/usr/share/licenses/cblas/ } - Deleted: cblas.patch =================================================================== --- cblas.patch 2015-06-14 10:26:00 UTC (rev 135284) +++ cblas.patch 2015-06-14 11:24:40 UTC (rev 135285) @@ -1,11 +0,0 @@ ---- src/Makefile.orig 2011-01-05 11:39:24.000000000 +0100 -+++ src/Makefile 2011-01-05 11:42:20.000000000 +0100 -@@ -234,7 +234,7 @@ - all: $(alev) - $(ARCH) $(ARCHFLAGS) $(CBLIB) $(alev) - $(RANLIB) $(CBLIB) -- -+ $(CC) $(CCFLAGS) -shared -Wl,--allow-multiple-definition -o $(CBSHLIB) $(alev) -lm -lc -lblas - - .SUFFIXES: .o .c .f - Added: fPIC.patch =================================================================== --- fPIC.patch (rev 0) +++ fPIC.patch 2015-06-14 11:24:40 UTC (rev 135285) @@ -0,0 +1,23 @@ +--- CBLAS/Makefile.LINUX.orig 2015-06-14 12:25:24.099556681 +0200 ++++ CBLAS/Makefile.LINUX 2015-06-14 12:25:52.819706410 +0200 +@@ -23,7 +23,8 @@ + #----------------------------------------------------------------------------- + + BLLIB = libblas.a +-CBLIB = ../lib/cblas_$(PLAT).a ++CBLIB = ../lib/libcblas.a ++CBSHLIB= ../lib/libcblas.so + + #----------------------------------------------------------------------------- + # Compilers +@@ -37,8 +38,8 @@ + # Flags for Compilers + #----------------------------------------------------------------------------- + +-CFLAGS = -O3 -DADD_ +-FFLAGS = -O3 ++CFLAGS = -O3 -DADD_ -fPIC ++FFLAGS = -O3 -fPIC + + #----------------------------------------------------------------------------- + # Archive programs and flags Added: sdsdot.patch =================================================================== --- sdsdot.patch (rev 0) +++ sdsdot.patch 2015-06-14 11:24:40 UTC (rev 135285) @@ -0,0 +1,19 @@ +--- CBLAS/src/sdsdotsub.f.orig 2015-06-14 13:13:11.353896469 +0200 ++++ CBLAS/src/sdsdotsub.f 2015-06-14 13:13:44.830675890 +0200 +@@ -3,13 +3,13 @@ + c The program is a fortran wrapper for sdsdot. + c Witten by Keita Teranishi. 2/11/1998 + c +- subroutine sdsdotsub(n,x,incx,y,incy,dot) ++ subroutine sdsdotsub(n,sb,x,incx,y,incy,dot) + c + external sdsdot +- real sdsdot,dot ++ real sb,sdsdot,dot + integer n,incx,incy + real x(*),y(*) + c +- dot=sdsdot(n,x,incx,y,incy) ++ dot=sdsdot(n,sb,x,incx,y,incy) + return + end Added: shared.patch =================================================================== --- shared.patch (rev 0) +++ shared.patch 2015-06-14 11:24:40 UTC (rev 135285) @@ -0,0 +1,11 @@ +--- src/Makefile.orig 2011-01-05 11:39:24.000000000 +0100 ++++ src/Makefile 2011-01-05 11:42:20.000000000 +0100 +@@ -234,7 +234,7 @@ + all: $(alev) + $(ARCH) $(ARCHFLAGS) $(CBLIB) $(alev) + $(RANLIB) $(CBLIB) +- ++ $(CC) $(CCFLAGS) -shared -Wl,--allow-multiple-definition -o $(CBSHLIB) $(alev) -lm -lc -lblas + + .SUFFIXES: .o .c .f +
