diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-08-06 09:54:36 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-08-06 09:54:36 +0200 |
commit | 7e625170ad4fd86bb2ee338c7be9a352bf418b00 (patch) | |
tree | 255b053e743089df19bd413de519547ac617c35a /extra/blas | |
parent | 932031ec841dccbd40ce373d464391f579a11a42 (diff) | |
parent | 1613e8d1c11997f5507d90ecfc05213199aca3ed (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
extra/icedtea-web/PKGBUILD
extra/nasm/PKGBUILD
extra/qtiplot/PKGBUILD
testing/iproute2/PKGBUILD
testing/xf86-video-intel/PKGBUILD
Diffstat (limited to 'extra/blas')
-rw-r--r-- | extra/blas/Makefile.blas | 31 | ||||
-rwxr-xr-x | extra/blas/PKGBUILD | 10 |
2 files changed, 35 insertions, 6 deletions
diff --git a/extra/blas/Makefile.blas b/extra/blas/Makefile.blas index 0c6cd06d6..7126cbb19 100644 --- a/extra/blas/Makefile.blas +++ b/extra/blas/Makefile.blas @@ -137,6 +137,33 @@ ALLOBJ=$(SBLAS1) $(SBLAS2) $(SBLAS3) $(DBLAS1) $(DBLAS2) $(DBLAS3) \ $(CBLAS1) $(CBLAS2) $(CBLAS3) $(ZBLAS1) \ $(ZBLAS2) $(ZBLAS3) $(ALLBLAS) +$(BLASLIB): $(ALLOBJ) + $(ARCH) $(ARCHFLAGS) $@ $(ALLOBJ) + $(RANLIB) $@ + +single: $(SBLAS1) $(ALLBLAS) $(SBLAS2) $(SBLAS3) + $(ARCH) $(ARCHFLAGS) $(BLASLIB) $(SBLAS1) $(ALLBLAS) \ + $(SBLAS2) $(SBLAS3) + $(RANLIB) $(BLASLIB) + +double: $(DBLAS1) $(ALLBLAS) $(DBLAS2) $(DBLAS3) + $(ARCH) $(ARCHFLAGS) $(BLASLIB) $(DBLAS1) $(ALLBLAS) \ + $(DBLAS2) $(DBLAS3) + $(RANLIB) $(BLASLIB) + +complex: $(CBLAS1) $(CB1AUX) $(ALLBLAS) $(CBLAS2) $(CBLAS3) + $(ARCH) $(ARCHFLAGS) $(BLASLIB) $(CBLAS1) $(CB1AUX) \ + $(ALLBLAS) $(CBLAS2) $(CBLAS3) + $(RANLIB) $(BLASLIB) + +complex16: $(ZBLAS1) $(ZB1AUX) $(ALLBLAS) $(ZBLAS2) $(ZBLAS3) + $(ARCH) $(ARCHFLAGS) $(BLASLIB) $(ZBLAS1) $(ZB1AUX) \ + $(ALLBLAS) $(ZBLAS2) $(ZBLAS3) + $(RANLIB) $(BLASLIB) + +FRC: + @FRC=$(FRC) + clean: rm -f *.o libblas.a libblas.so* @@ -145,5 +172,7 @@ static: $(ALLOBJ) ranlib libblas.a shared: $(ALLOBJ) - cc $(CFLAGS) -shared -Wl,-soname,libblas.so.3 -o libblas.so.3.4.0 $(ALLOBJ) -lm -lgfortran -lc + cc $(CFLAGS) -shared -Wl,-soname,libblas.so.3 -o libblas.so.3.4.1 $(ALLOBJ) -lm -lgfortran -lc +#.f.o: +# $(FORTRAN) $(OPTS) -c $< -o $@ diff --git a/extra/blas/PKGBUILD b/extra/blas/PKGBUILD index 3f9a64e67..68c7103db 100755 --- a/extra/blas/PKGBUILD +++ b/extra/blas/PKGBUILD @@ -5,7 +5,7 @@ # Contributor: Jason Taylor <jftaylor21@gmail.com> pkgname=blas -pkgver=3.4.0 +pkgver=3.4.1 pkgrel=1 url="http://www.netlib.org/blas" makedepends=('gcc-fortran') @@ -16,8 +16,8 @@ license=("custom") source=(http://www.netlib.org/lapack/lapack-${pkgver}.tgz Makefile.blas LICENSE.blas) -sha1sums=('910109a931524f8dcc2734ce23fe927b00ca199f' - '85996f56c13991fc69481c0e88ef905a0dcefb49' +sha1sums=('c115223ac1bac9ab971aae865d3e95442bc979bc' + 'f9eb47d6713894eaaffbf2d9b2942a777e3f5ef9' '2491a151a37f0162b25fc4e4e9a8ac444b574a76') build() { @@ -29,8 +29,8 @@ build() { pushd BLAS/SRC make clean - FFLAGS="${CFLAGS/-O?/-O0}" make dcabs1.o - FFLAGS="${CFLAGS} -fPIC" CFLAGS="${CFLAGS} -fPIC" make shared +# FFLAGS="${CFLAGS/-O?/-O0}" make dcabs1.o + FFLAGS="${CFLAGS} -fPIC" CFLAGS="${CFLAGS} -fPIC" CXXFLAGS="${CXXFLAGS} -fPIC" make shared cp libblas.so.${pkgver} "${srcdir}/lapack-${pkgver}/" popd |