Adapt build system for the absence of lapack-netlib/ and relapack directories.

Forwarded: not-needed
Last-Update: 2017-07-27

Instead use the binary provided by package liblapack-pic, stripping from it the
symbols that are overridden by OpenBLAS.
Last-Update: 2017-07-27
Gbp-Pq: Name no-embedded-lapack.patch

diff --git a/Makefile b/Makefile
index 54dd3be41ac997ce45d6c41203458f3dc747c8ec..eac6adf33bcf56b3c46cc10d22880802c3dfa01e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -235,92 +235,21 @@ hpl_p :
        fi; \
        done
 
-ifeq ($(NO_LAPACK), 1)
 netlib :
-
-else
-netlib : lapack_prebuild
-ifeq ($(NOFORTRAN), $(filter 0,$(NOFORTRAN)))
-       @$(MAKE) -C $(NETLIB_LAPACK_DIR) lapacklib
-       @$(MAKE) -C $(NETLIB_LAPACK_DIR) tmglib
-endif
-ifneq ($(NO_LAPACKE), 1)
-       @$(MAKE) -C $(NETLIB_LAPACK_DIR) lapackelib
-endif
-endif
-
-ifeq ($(NO_LAPACK), 1)
-re_lapack :
-
+ifeq (,$(findstring 64,$(LIBNAME)))
+       mkdir lapack-netlib
+       cd lapack-netlib && ar -x /usr/lib/$$(dpkg-architecture -q DEB_HOST_MULTIARCH)/liblapack_pic.a
+       make -C interface delete-duplicate-lapack-objects
+       ar -ru $(LIBNAME) `LC_ALL=C ls lapack-netlib/*`
 else
-re_lapack :
-       @$(MAKE) -C relapack
+       mkdir lapack64-netlib
+       cd lapack64-netlib && ar -x /usr/lib/$$(dpkg-architecture -q DEB_HOST_MULTIARCH)/liblapack64_pic.a
+       make -C interface delete-duplicate-lapack-objects
+       ar -ru $(LIBNAME) `LC_ALL=C ls lapack64-netlib/*`
 endif
 
-prof_lapack : lapack_prebuild
-       @$(MAKE) -C $(NETLIB_LAPACK_DIR) lapack_prof
-
-lapack_prebuild :
-ifeq ($(NOFORTRAN), $(filter 0,$(NOFORTRAN)))
-       -@echo "FC          = $(FC)" > $(NETLIB_LAPACK_DIR)/make.inc
-       -@echo "FFLAGS      = $(LAPACK_FFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc
-       -@echo "FFLAGS_DRV  = $(LAPACK_FFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc
-       -@echo "POPTS       = $(LAPACK_FPFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc
-       -@echo "FFLAGS_NOOPT       = -O0 $(LAPACK_NOOPT)" >> $(NETLIB_LAPACK_DIR)/make.inc
-       -@echo "PNOOPT      = $(LAPACK_FPFLAGS) -O0" >> $(NETLIB_LAPACK_DIR)/make.inc
-ifeq ($(C_COMPILER)$(F_COMPILER)$(USE_OPENMP), CLANGGFORTRAN1)
-       -@echo "LDFLAGS     = $(FFLAGS) $(EXTRALIB) -lomp" >> $(NETLIB_LAPACK_DIR)/make.inc
-else
-       -@echo "LDFLAGS     = $(FFLAGS) $(EXTRALIB)" >> $(NETLIB_LAPACK_DIR)/make.inc
-endif
-       -@echo "CC          = $(CC)" >> $(NETLIB_LAPACK_DIR)/make.inc
-       -@echo "override CFLAGS      = $(LAPACK_CFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc
-       -@echo "AR          = $(AR)" >> $(NETLIB_LAPACK_DIR)/make.inc
-       -@echo "ARFLAGS     = $(ARFLAGS) -ru" >> $(NETLIB_LAPACK_DIR)/make.inc
-       -@echo "RANLIB      = $(RANLIB)" >> $(NETLIB_LAPACK_DIR)/make.inc
-       -@echo "LAPACKLIB   = ../../$(LIBNAME)" >> $(NETLIB_LAPACK_DIR)/make.inc
-       -@echo "TMGLIB      = ../../../$(LIBNAME)" >> $(NETLIB_LAPACK_DIR)/make.inc
-       -@echo "BLASLIB     = ../../../$(LIBNAME)" >> $(NETLIB_LAPACK_DIR)/make.inc
-       -@echo "LAPACKELIB  = ../../../$(LIBNAME)" >> $(NETLIB_LAPACK_DIR)/make.inc
-       -@echo "LAPACKLIB_P = ../$(LIBNAME_P)" >> $(NETLIB_LAPACK_DIR)/make.inc
-       -@echo "SUFFIX      = $(SUFFIX)" >> $(NETLIB_LAPACK_DIR)/make.inc
-       -@echo "PSUFFIX     = $(PSUFFIX)" >> $(NETLIB_LAPACK_DIR)/make.inc
-       -@echo "CEXTRALIB   = $(EXTRALIB)" >> $(NETLIB_LAPACK_DIR)/make.inc
-ifeq ($(F_COMPILER), GFORTRAN)
-       -@echo "TIMER       = INT_ETIME" >> $(NETLIB_LAPACK_DIR)/make.inc
-ifdef SMP
-ifeq ($(OSNAME), WINNT)
-       -@echo "LOADER      = $(FC)" >> $(NETLIB_LAPACK_DIR)/make.inc
-else ifeq ($(OSNAME), Haiku)
-       -@echo "LOADER      = $(FC)" >> $(NETLIB_LAPACK_DIR)/make.inc
-else
-       -@echo "LOADER      = $(FC) -pthread" >> $(NETLIB_LAPACK_DIR)/make.inc
-endif
-else
-       -@echo "LOADER      = $(FC)" >> $(NETLIB_LAPACK_DIR)/make.inc
-endif
-else
-       -@echo "TIMER       = NONE" >> $(NETLIB_LAPACK_DIR)/make.inc
-       -@echo "LOADER      = $(FC)" >> $(NETLIB_LAPACK_DIR)/make.inc
-endif
-ifeq ($(BUILD_LAPACK_DEPRECATED), 1)
-       -@echo "BUILD_DEPRECATED      = 1" >> $(NETLIB_LAPACK_DIR)/make.inc
-endif
-ifeq ($(BUILD_SINGLE), 1)
-       -@echo "BUILD_SINGLE      = 1" >> $(NETLIB_LAPACK_DIR)/make.inc
-endif
-ifeq ($(BUILD_DOUBLE), 1)
-       -@echo "BUILD_DOUBLE      = 1" >> $(NETLIB_LAPACK_DIR)/make.inc
-endif
-ifeq ($(BUILD_COMPLEX), 1)
-       -@echo "BUILD_COMPLEX      = 1" >> $(NETLIB_LAPACK_DIR)/make.inc
-endif
-ifeq ($(BUILD_COMPLEX16), 1)
-       -@echo "BUILD_COMPLEX16      = 1" >> $(NETLIB_LAPACK_DIR)/make.inc
-endif
-       -@echo "LAPACKE_WITH_TMG      = 1" >> $(NETLIB_LAPACK_DIR)/make.inc
-       -@cat  make.inc >> $(NETLIB_LAPACK_DIR)/make.inc
-endif
+clean::
+       rm -rf lapack-netlib
 
 large.tgz :
 ifeq ($(NOFORTRAN), $(filter 0,$(NOFORTRAN)))
@@ -387,10 +316,5 @@ ifeq ($(OSNAME), Darwin)
 endif
        @rm -f Makefile.conf config.h Makefile_kernel.conf config_kernel.h st* *.dylib
        @rm -f cblas.tmp cblas.tmp2
-       @touch $(NETLIB_LAPACK_DIR)/make.inc
-       @$(MAKE) -C $(NETLIB_LAPACK_DIR) clean
-       @rm -f $(NETLIB_LAPACK_DIR)/make.inc $(NETLIB_LAPACK_DIR)/lapacke/include/lapacke_mangling.h
-       @$(MAKE) -C relapack clean
        @rm -f *.grd Makefile.conf_last config_last.h
-       @(cd $(NETLIB_LAPACK_DIR)/TESTING && rm -f x* *.out testing_results.txt)
        @echo Done.

diff --git a/Makefile.install b/Makefile.install
index e8b64465f49e7b1d48f887bc98f564193c79d10d..363345ae703ed45226e22cea3231748db888e662 100644 (file)
--- a/Makefile.install
+++ b/Makefile.install
@@ -72,15 +72,6 @@ endif
 endif
 
 ifneq ($(OSNAME), AIX)
-ifndef NO_LAPACKE
-       @echo Copying LAPACKE header files to $(DESTDIR)$(OPENBLAS_INCLUDE_DIR)
-       @-install -pm644 $(NETLIB_LAPACK_DIR)/LAPACKE/include/lapack.h "$(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/lapack.h"
-       @-install -pm644 $(NETLIB_LAPACK_DIR)/LAPACKE/include/lapacke.h "$(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/lapacke.h"
-       @-install -pm644 $(NETLIB_LAPACK_DIR)/LAPACKE/include/lapacke_config.h "$(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/lapacke_config.h"
-       @-install -pm644 $(NETLIB_LAPACK_DIR)/LAPACKE/include/lapacke_mangling_with_flags.h.in "$(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/lapacke_mangling.h"
-       @-install -pm644 $(NETLIB_LAPACK_DIR)/LAPACKE/include/lapacke_utils.h "$(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/lapacke_utils.h"
-endif
-
 #for install static library
 ifneq ($(NO_STATIC),1)
        @echo Copying the static library to $(DESTDIR)$(OPENBLAS_LIBRARY_DIR)

diff --git a/Makefile.system b/Makefile.system
index 84c667e0459b091f77c02ea7c8a2e81714b551ec..87520388a172924efdc069f823fc94d740157784 100644 (file)
--- a/Makefile.system
+++ b/Makefile.system
@@ -35,8 +35,6 @@ else ifeq ($(ARCH), zarch)
 override ARCH=zarch
 endif
 
-NETLIB_LAPACK_DIR = $(TOPDIR)/lapack-netlib
-
 # Default C compiler
 # - Only set if not specified on the command line or inherited from the environment.
 # - CC is an implicit variable so neither '?=' or 'ifndef' can be used.

diff --git a/interface/Makefile b/interface/Makefile
index 597956fdb286e77de4f937d59260813f7898e7ec..34fb83cdf64bce8fd3feb7c2af7aa71ffa226db6 100644 (file)
--- a/interface/Makefile
+++ b/interface/Makefile
@@ -2323,3 +2323,11 @@ cblas_zgeadd.$(SUFFIX) cblas_zgeadd.$(PSUFFIX) : zgeadd.c
 cblas_xerbla.$(SUFFIX) cblas_xerbla.$(PSUFFIX) : xerbla.c
        $(CC) -c $(CFLAGS) -DCBLAS $< -o $(@F)
 
+# The list of symbols to be removed can be seen in the diff between LAPACK's
+# original SRC/Makefile and the version of that same file that is included in
+# OpenBLAS (unfiltered) tarball
+delete-duplicate-lapack-objects:
+       if test -d ../lapack-netlib; then cd ../lapack-netlib \
+               && rm $(SLAPACKOBJS) $(DLAPACKOBJS) $(CLAPACKOBJS) $(ZLAPACKOBJS) lsame.o xerbla.o; fi
+       if test -d ../lapack64-netlib; then cd ../lapack64-netlib \
+               && rm $(SLAPACKOBJS) $(DLAPACKOBJS) $(CLAPACKOBJS) $(ZLAPACKOBJS) lsame.o xerbla.o; fi