[openblas] 05/07: no-embedded-lapack.patch: new patch.

[Sébastien Villemot]

This is an automated email from the git hooks/post-receive script.

sebastien pushed a commit to branch master
in repository openblas.

commit 652cd2ff841cbf68d7ae8a4c1035976020ca2ccd
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Tue Jul 29 20:29:55 2014 +0200

    no-embedded-lapack.patch: new patch.
    
    Adapts build system for the absence of lapack-netlib/ directory.
    
    Git-Dch: Full
---
 debian/patches/no-embedded-lapack.patch | 105 ++++++++++++++++++++++++++++++++
 debian/patches/series                   |   1 +
 2 files changed, 106 insertions(+)

diff --git a/debian/patches/no-embedded-lapack.patch b/debian/patches/no-embedded-lapack.patch
new file mode 100644
index 0000000..1b9f3ca
--- /dev/null
+++ b/debian/patches/no-embedded-lapack.patch
@@ -0,0 +1,105 @@
+Description: Adapt build system for the absence of lapack-netlib/ directory.
+Author: Sébastien Villemot <sebastien at debian.org>
+Forwarded: not-needed
+Last-Update: 2014-07-29
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/Makefile
++++ b/Makefile
+@@ -207,58 +207,8 @@ hpl_p :
+ 	fi; \
+ 	done
+ 
+-ifeq ($(NO_LAPACK), 1)
+ netlib :
+ 
+-else
+-netlib : lapack_prebuild
+-ifndef NOFORTRAN
+-	@$(MAKE) -C $(NETLIB_LAPACK_DIR) lapacklib
+-	@$(MAKE) -C $(NETLIB_LAPACK_DIR) tmglib
+-endif
+-ifndef NO_LAPACKE
+-	@$(MAKE) -C $(NETLIB_LAPACK_DIR) lapackelib
+-endif
+-endif
+-
+-prof_lapack : lapack_prebuild
+-	@$(MAKE) -C $(NETLIB_LAPACK_DIR) lapack_prof
+-
+-lapack_prebuild :
+-ifndef NOFORTRAN
+-	- at echo "FORTRAN     = $(FC)" > $(NETLIB_LAPACK_DIR)/make.inc
+-	- at echo "OPTS        = $(LAPACK_FFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc
+-	- at echo "POPTS       = $(LAPACK_FPFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc
+-	- at echo "NOOPT       = $(LAPACK_FFLAGS) -O0" >> $(NETLIB_LAPACK_DIR)/make.inc
+-	- at echo "PNOOPT      = $(LAPACK_FPFLAGS) -O0" >> $(NETLIB_LAPACK_DIR)/make.inc
+-	- at echo "LOADOPTS    = $(FFLAGS) $(EXTRALIB)" >> $(NETLIB_LAPACK_DIR)/make.inc
+-	- at echo "CC          = $(CC)" >> $(NETLIB_LAPACK_DIR)/make.inc
+-	- at echo "override CFLAGS      = $(LAPACK_CFLAGS)" >> $(NETLIB_LAPACK_DIR)/make.inc
+-	- at echo "ARCH        = $(AR)" >> $(NETLIB_LAPACK_DIR)/make.inc
+-	- at echo "ARCHFLAGS   = -ru" >> $(NETLIB_LAPACK_DIR)/make.inc
+-	- at echo "RANLIB      = $(RANLIB)" >> $(NETLIB_LAPACK_DIR)/make.inc
+-	- at echo "LAPACKLIB   = ../$(LIBNAME)" >> $(NETLIB_LAPACK_DIR)/make.inc
+-	- at echo "TMGLIB      = ../$(LIBNAME)" >> $(NETLIB_LAPACK_DIR)/make.inc
+-	- at echo "BLASLIB     = ../../../$(LIBNAME)" >> $(NETLIB_LAPACK_DIR)/make.inc
+-	- at echo "LAPACKELIB  = ../$(LIBNAME)" >> $(NETLIB_LAPACK_DIR)/make.inc
+-	- at echo "LAPACKLIB_P = ../$(LIBNAME_P)" >> $(NETLIB_LAPACK_DIR)/make.inc
+-	- at echo "SUFFIX      = $(SUFFIX)" >> $(NETLIB_LAPACK_DIR)/make.inc
+-	- at echo "PSUFFIX     = $(PSUFFIX)" >> $(NETLIB_LAPACK_DIR)/make.inc
+-	- at echo "CEXTRALIB   = $(EXTRALIB)" >> $(NETLIB_LAPACK_DIR)/make.inc
+-ifeq ($(FC), GFORTRAN)
+-	- at echo "TIMER       = INT_ETIME" >> $(NETLIB_LAPACK_DIR)/make.inc
+-ifdef SMP
+-	- at echo "LOADER      = $(FC) -pthread" >> $(NETLIB_LAPACK_DIR)/make.inc
+-else
+-	- at echo "LOADER      = $(FC)" >> $(NETLIB_LAPACK_DIR)/make.inc
+-endif
+-else
+-	- at echo "TIMER       = NONE" >> $(NETLIB_LAPACK_DIR)/make.inc
+-	- at echo "LOADER      = $(FC)" >> $(NETLIB_LAPACK_DIR)/make.inc
+-endif
+-	- at cat  make.inc >> $(NETLIB_LAPACK_DIR)/make.inc
+-endif
+-
+ large.tgz :
+ ifndef NOFORTRAN
+ 	if [ ! -a $< ]; then
+@@ -312,9 +262,5 @@ ifeq ($(OSNAME), Darwin)
+ 	@rm -rf getarch.dSYM getarch_2nd.dSYM
+ endif
+ 	@rm -f Makefile.conf config.h Makefile_kernel.conf config_kernel.h st* *.dylib
+-	@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
+ 	@rm -f *.grd Makefile.conf_last config_last.h
+-	@(cd $(NETLIB_LAPACK_DIR)/TESTING && rm -f x* *.out testing_results.txt)
+ 	@echo Done.
+--- a/Makefile.install
++++ b/Makefile.install
+@@ -42,14 +42,6 @@ ifndef NO_CBLAS
+ 	@sed 's/common/openblas_config/g' cblas.h > $(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/cblas.h
+ endif
+ 
+-ifndef NO_LAPACKE
+-	@echo Copying LAPACKE header files to $(DESTDIR)$(OPENBLAS_LIBRARY_DIR)
+-	@-install -pDm644 $(NETLIB_LAPACK_DIR)/lapacke/include/lapacke.h $(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/lapacke.h
+-	@-install -pDm644 $(NETLIB_LAPACK_DIR)/lapacke/include/lapacke_config.h $(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/lapacke_config.h
+-	@-install -pDm644 $(NETLIB_LAPACK_DIR)/lapacke/include/lapacke_mangling_with_flags.h $(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/lapacke_mangling.h
+-	@-install -pDm644 $(NETLIB_LAPACK_DIR)/lapacke/include/lapacke_utils.h $(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/lapacke_utils.h
+-endif
+-
+ #for install static library
+ ifndef NO_STATIC
+ 	@echo Copying the static library to $(DESTDIR)$(OPENBLAS_LIBRARY_DIR)
+--- a/Makefile.system
++++ b/Makefile.system
+@@ -9,8 +9,6 @@ ifndef TOPDIR
+ TOPDIR = .
+ 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/debian/patches/series b/debian/patches/series
index e8e6750..559ad41 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ kfreebsd-soname.patch
 libblas3-soname.patch
 test-custom-package.patch
 remove-openmp-warning.patch
+no-embedded-lapack.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/openblas.git