netlib blas, cblas and lapack

3 files changed, 40 insertions, 69 deletions

diff --git a/src/blas.mk b/src/blas.mk
index 5eb12e3..defce81 100644
--- a/src/blas.mk
+++ b/src/blas.mk
@@ -3,30 +3,20 @@
 PKG             := blas
 $(PKG)_WEBSITE  := http://www.netlib.org/blas/
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 3.5.0
-$(PKG)_CHECKSUM := ef7d775d380f255d1902bce374ff7c8a594846454fcaeae552292168af1aca24
-$(PKG)_SUBDIR   := BLAS-$($(PKG)_VERSION)
-$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tgz
-$(PKG)_URL      := http://www.netlib.org/$(PKG)/$($(PKG)_FILE)
-$(PKG)_DEPS     := cc openblas
-
-$(PKG)_MESSAGE  :=*** blas has been replaced by openblas ***
+$(PKG)_VERSION  := 3.8.0
+$(PKG)_CHECKSUM := a8ce4930cfc695a7c09118060f5f2aa3601130e5265b2f4572c0984d5f282e49
+$(PKG)_SUBDIR   := lapack-release-lapack-$($(PKG)_VERSION)
+$(PKG)_FILE     := lapack-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL      := https://github.com/Reference-LAPACK/lapack-release/archive/lapack-$($(PKG)_VERSION).tar.gz
+$(PKG)_DEPS     := cc
 
 define $(PKG)_UPDATE
-    echo 'Warning: blas has been replaced by openblas' >&2;
-    echo $(blas_VERSION)
+    echo 1
 endef
 
-define $(PKG)_DISABLED_BUILD
-    $(MAKE) -C '$(1)' -j '$(JOBS)' \
-        FORTRAN='$(TARGET)-gfortran' \
-        RANLIB='$(TARGET)-ranlib' \
-        ARCH='$(TARGET)-ar' \
-        BLASLIB='libblas.a'
-
-    $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib'
-    $(if $(BUILD_STATIC), \
-        $(INSTALL) -m644 '$(1)/libblas.a' '$(PREFIX)/$(TARGET)/lib/', \
-        $(MAKE_SHARED_FROM_STATIC) '$(1)/libblas.a' --ld '$(TARGET)-gfortran' \
-    )
+define $(PKG)_BUILD
+    cd '$(BUILD_DIR)' && '$(TARGET)-cmake' '$(SOURCE_DIR)' \
+        -DCMAKE_AR='$(PREFIX)/bin/$(TARGET)-ar' \
+        -DCMAKE_RANLIB='$(PREFIX)/bin/$(TARGET)-ranlib'
+    $(MAKE) -C '$(BUILD_DIR)/BLAS' -j '$(JOBS)' install
 endef
diff --git a/src/cblas.mk b/src/cblas.mk
index e6f7af9..df971e5 100644
--- a/src/cblas.mk
+++ b/src/cblas.mk
@@ -3,45 +3,31 @@
 PKG             := cblas
 $(PKG)_WEBSITE  := http://www.netlib.org/blas/
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1
-$(PKG)_CHECKSUM := 0f6354fd67fabd909baf57ced2ef84e962db58fae126e4f41b21dd4fec60a2a3
-$(PKG)_SUBDIR   := CBLAS
-$(PKG)_FILE     := $(PKG).tgz
-$(PKG)_URL      := http://www.netlib.org/blas/blast-forum/$($(PKG)_FILE)
-$(PKG)_URL_2    := https://ftp.eq.uc.pt/software/math/netlib/blas/blast-forum/$($(PKG)_FILE)
-$(PKG)_DEPS     := cc openblas
-
-$(PKG)_MESSAGE  :=*** cblas has been replaced by openblas ***
+$(PKG)_VERSION  := 3.8.0
+$(PKG)_CHECKSUM := a8ce4930cfc695a7c09118060f5f2aa3601130e5265b2f4572c0984d5f282e49
+$(PKG)_SUBDIR   := lapack-release-lapack-$($(PKG)_VERSION)
+$(PKG)_FILE     := lapack-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL      := https://github.com/Reference-LAPACK/lapack-release/archive/lapack-$($(PKG)_VERSION).tar.gz
+$(PKG)_DEPS     := cc blas
 
 define $(PKG)_UPDATE
-    echo 'Warning: cblas has been replaced by openblas' >&2;
-    echo $(cblas_VERSION)
+    echo 1
 endef
 
-define $(PKG)_DISABLED_BUILD
-    $(SED) -i 's, make , $(MAKE) ,g' '$(1)/Makefile'
-    $(MAKE) -C '$(1)' -j '$(JOBS)' \
-        CBDIR='$(1)' \
-        CBLIB='$(1)/lib/libcblas.a' \
-        CC='$(TARGET)-gcc' \
-        FC='$(TARGET)-gfortran' \
-        ARCH='$(TARGET)-ar' \
-        RANLIB='$(TARGET)-ranlib' \
-        alllib
-
-    $(INSTALL) -d                               '$(PREFIX)/$(TARGET)/lib'
-    $(INSTALL) -m644 '$(1)/lib/libcblas.a'      '$(PREFIX)/$(TARGET)/lib/'
-    $(INSTALL) -d                               '$(PREFIX)/$(TARGET)/include'
-    $(INSTALL) -m644 '$(1)/include/cblas.h'     '$(PREFIX)/$(TARGET)/include/'
-    $(INSTALL) -m644 '$(1)/include/cblas_f77.h' '$(PREFIX)/$(TARGET)/include/'
+define $(PKG)_BUILD
+    cd '$(BUILD_DIR)' && '$(TARGET)-cmake' '$(SOURCE_DIR)' \
+        -DCMAKE_AR='$(PREFIX)/bin/$(TARGET)-ar' \
+        -DCMAKE_RANLIB='$(PREFIX)/bin/$(TARGET)-ranlib' \
+        -DCBLAS=ON
+    $(MAKE) -C '$(BUILD_DIR)/CBLAS' -j '$(JOBS)' install
 
     '$(TARGET)-gcc' \
         -W -Wall -Werror -ansi -pedantic \
-        '$(1)/examples/cblas_example1.c' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \
+        '$(SOURCE_DIR)/CBLAS/examples/cblas_example1.c' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \
         -lcblas -lblas -lgfortran -lquadmath
 
     '$(TARGET)-gcc' \
         -W -Wall -Werror -ansi -pedantic \
-        '$(1)/examples/cblas_example2.c' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG)-F77.exe' \
+        '$(SOURCE_DIR)/CBLAS/examples/cblas_example2.c' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG)-F77.exe' \
         -lcblas -lblas -lgfortran -lquadmath -DADD_
 endef
diff --git a/src/lapack.mk b/src/lapack.mk
index 260b54f..8f6a3d8 100644
--- a/src/lapack.mk
+++ b/src/lapack.mk
@@ -2,30 +2,25 @@
 
 PKG             := lapack
 $(PKG)_WEBSITE  := http://www.netlib.org/lapack/
-$(PKG)_VERSION  := 3.6.0
-$(PKG)_CHECKSUM := a9a0082c918fe14e377bbd570057616768dca76cbdc713457d8199aaa233ffc3
-$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
-$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tgz
-$(PKG)_URL      := http://www.netlib.org/$(PKG)/$($(PKG)_FILE)
-$(PKG)_URL_2    := https://ftp.eq.uc.pt/software/math/netlib/$(PKG)/$($(PKG)_FILE)
-$(PKG)_DEPS     := cc openblas
-
-$(PKG)_MESSAGE  :=*** lapack has been replaced by openblas ***
+$(PKG)_IGNORE   :=
+$(PKG)_VERSION  := 3.8.0
+$(PKG)_CHECKSUM := a8ce4930cfc695a7c09118060f5f2aa3601130e5265b2f4572c0984d5f282e49
+$(PKG)_SUBDIR   := lapack-release-$(PKG)-$($(PKG)_VERSION)
+$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL      := https://github.com/Reference-LAPACK/lapack-release/archive/$(PKG)-$($(PKG)_VERSION).tar.gz
+$(PKG)_DEPS     := cc cblas
 
 define $(PKG)_UPDATE
-    echo 'Warning: lapack has been replaced by openblas' >&2;
-    echo $(lapack_VERSION)
+    echo 1
 endef
 
-define $(PKG)_DISABLED_BUILD
-    cd '$(1)' && '$(TARGET)-cmake' \
+define $(PKG)_BUILD
+    cd '$(BUILD_DIR)' && '$(TARGET)-cmake' '$(SOURCE_DIR)' \
         -DCMAKE_AR='$(PREFIX)/bin/$(TARGET)-ar' \
         -DCMAKE_RANLIB='$(PREFIX)/bin/$(TARGET)-ranlib' \
-        -DLAPACKE=ON \
-        .
-    cp '$(1)/LAPACKE/include/lapacke_mangling_with_flags.h' '$(1)/LAPACKE/include/lapacke_mangling.h'
-    $(MAKE) -C '$(1)/SRC'     -j '$(JOBS)' install
-    $(MAKE) -C '$(1)/LAPACKE' -j '$(JOBS)' install
+        -DLAPACKE=ON
+    $(MAKE) -C '$(BUILD_DIR)/SRC'     -j '$(JOBS)' install
+    $(MAKE) -C '$(BUILD_DIR)/LAPACKE' -j '$(JOBS)' install
 
     '$(TARGET)-gfortran' \
         -W -Wall -Werror -pedantic \