[openblas] 03/03: Refresh patches.

Sébastien Villemot sebastien at debian.org
Tue Sep 6 09:10:55 UTC 2016


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

sebastien pushed a commit to branch master
in repository openblas.

commit 47048f3868df1446d09cae3b809f1f4a02e0a5b8
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Tue Sep 6 11:09:03 2016 +0200

    Refresh patches.
    
    Gbp-Dch: Ignore
---
 debian/patches/kfreebsd.patch           | 12 +++++------
 debian/patches/no-embedded-lapack.patch | 38 ++++++++++++++++-----------------
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/debian/patches/kfreebsd.patch b/debian/patches/kfreebsd.patch
index cfc31e9..dd00d9e 100644
--- a/debian/patches/kfreebsd.patch
+++ b/debian/patches/kfreebsd.patch
@@ -35,19 +35,19 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  	@echo Copying the shared library to $(DESTDIR)$(OPENBLAS_LIBRARY_DIR)
 -ifeq ($(OSNAME), $(filter $(OSNAME),Linux SunOS))
 +ifeq ($(OSNAME), $(filter $(OSNAME),Linux SunOS FreeBSD))
- 	@install -pm755 $(LIBSONAME) $(DESTDIR)$(OPENBLAS_LIBRARY_DIR)
- 	@cd $(DESTDIR)$(OPENBLAS_LIBRARY_DIR) ; \
+ 	@install -pm755 $(LIBSONAME) "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)"
+ 	@cd "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)" ; \
  	ln -fs $(LIBSONAME) $(LIBPREFIX).so ; \
  	ln -fs $(LIBSONAME) $(LIBPREFIX).so.$(MAJOR_VERSION)
  endif
 -ifeq ($(OSNAME), FreeBSD)
--	@cp $(LIBSONAME) $(DESTDIR)$(OPENBLAS_LIBRARY_DIR)
--	@cd $(DESTDIR)$(OPENBLAS_LIBRARY_DIR) ; \
+-	@cp $(LIBSONAME) "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)"
+-	@cd "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)" ; \
 -	ln -fs $(LIBSONAME) $(LIBPREFIX).so
 -endif
  ifeq ($(OSNAME), NetBSD)
- 	@cp $(LIBSONAME) $(DESTDIR)$(OPENBLAS_LIBRARY_DIR)
- 	@cd $(DESTDIR)$(OPENBLAS_LIBRARY_DIR) ; \
+ 	@cp $(LIBSONAME) "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)"
+ 	@cd "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)" ; \
 --- a/Makefile.system
 +++ b/Makefile.system
 @@ -229,7 +229,7 @@ ifeq ($(OSNAME), NetBSD)
diff --git a/debian/patches/no-embedded-lapack.patch b/debian/patches/no-embedded-lapack.patch
index 7290a5f..95af232 100644
--- a/debian/patches/no-embedded-lapack.patch
+++ b/debian/patches/no-embedded-lapack.patch
@@ -8,7 +8,7 @@ Last-Update: 2014-08-05
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/Makefile
 +++ b/Makefile
-@@ -203,64 +203,14 @@ hpl_p :
+@@ -201,64 +201,14 @@ hpl_p :
  	fi; \
  	done
  
@@ -79,7 +79,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
  large.tgz :
  ifndef NOFORTRAN
-@@ -325,9 +275,5 @@ ifeq ($(OSNAME), Darwin)
+@@ -323,9 +273,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
@@ -89,23 +89,6 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  	@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
-@@ -46,14 +46,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_INCLUDE_DIR)
--	@-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 $(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
- 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
@@ -128,3 +111,20 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 +# OpenBLAS (unfiltered) tarball
 +delete-duplicate-lapack-objects:
 +	cd ../lapack-netlib && rm $(SLAPACKOBJS) $(DLAPACKOBJS) $(CLAPACKOBJS) $(ZLAPACKOBJS) lsame.o xerbla.o
+--- a/Makefile.install
++++ b/Makefile.install
+@@ -46,14 +46,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_INCLUDE_DIR)
+-	@-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 "$(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
+ ifndef NO_STATIC
+ 	@echo Copying the static library to $(DESTDIR)$(OPENBLAS_LIBRARY_DIR)

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



More information about the debian-science-commits mailing list