[openblas] 04/11: Refresh patches.
Sébastien Villemot
sebastien at debian.org
Thu Mar 24 14:29:01 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 b44d59153df15038fd183ea55662f23bf00a9ddc
Author: Sébastien Villemot <sebastien at debian.org>
Date: Sat Mar 19 11:50:31 2016 +0100
Refresh patches.
Gbp-Dch: Ignore
---
debian/patches/always-run-testsuite.patch | 4 ++--
debian/patches/kfreebsd.patch | 14 +++++++-------
debian/patches/no-embedded-lapack.patch | 21 ++++++++++++++-------
debian/patches/remove-openmp-warning.patch | 2 +-
4 files changed, 24 insertions(+), 17 deletions(-)
diff --git a/debian/patches/always-run-testsuite.patch b/debian/patches/always-run-testsuite.patch
index 5854045..7d2e194 100644
--- a/debian/patches/always-run-testsuite.patch
+++ b/debian/patches/always-run-testsuite.patch
@@ -9,7 +9,7 @@ Last-Update: 2015-04-29
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/Makefile
+++ b/Makefile
-@@ -112,7 +112,6 @@ endif
+@@ -108,7 +108,6 @@ endif
tests :
ifndef NOFORTRAN
@@ -17,7 +17,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
ifndef CROSS
touch $(LIBNAME)
ifndef NO_FBLAS
-@@ -126,7 +125,6 @@ ifndef NO_CBLAS
+@@ -120,7 +119,6 @@ ifndef NO_CBLAS
endif
endif
endif
diff --git a/debian/patches/kfreebsd.patch b/debian/patches/kfreebsd.patch
index 8a3b0bf..cfc31e9 100644
--- a/debian/patches/kfreebsd.patch
+++ b/debian/patches/kfreebsd.patch
@@ -9,16 +9,16 @@ Last-Update: 2014-08-05
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/exports/Makefile
+++ b/exports/Makefile
-@@ -110,7 +110,7 @@ endif
+@@ -118,7 +118,7 @@ endif
dllinit.$(SUFFIX) : dllinit.c
$(CC) $(CFLAGS) -c -o $(@F) -s $<
--ifeq ($(OSNAME), Linux)
-+ifeq ($(OSNAME), $(filter $(OSNAME),Linux FreeBSD))
+-ifeq ($(OSNAME), $(filter $(OSNAME),Linux SunOS))
++ifeq ($(OSNAME), $(filter $(OSNAME),Linux SunOS FreeBSD))
so : ../$(LIBSONAME)
-@@ -138,7 +138,7 @@ endif
+@@ -146,7 +146,7 @@ endif
endif
#http://stackoverflow.com/questions/7656425/makefile-ifeq-logical-or
@@ -33,8 +33,8 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
#for install shared library
ifndef NO_SHARED
@echo Copying the shared library to $(DESTDIR)$(OPENBLAS_LIBRARY_DIR)
--ifeq ($(OSNAME), Linux)
-+ifeq ($(OSNAME), $(filter $(OSNAME),Linux FreeBSD))
+-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) ; \
ln -fs $(LIBSONAME) $(LIBPREFIX).so ; \
@@ -50,7 +50,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
@cd $(DESTDIR)$(OPENBLAS_LIBRARY_DIR) ; \
--- a/Makefile.system
+++ b/Makefile.system
-@@ -225,7 +225,7 @@ ifeq ($(OSNAME), NetBSD)
+@@ -229,7 +229,7 @@ ifeq ($(OSNAME), NetBSD)
MD5SUM = md5 -n
endif
diff --git a/debian/patches/no-embedded-lapack.patch b/debian/patches/no-embedded-lapack.patch
index d6c7e7a..7290a5f 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
-@@ -209,57 +209,14 @@ hpl_p :
+@@ -203,64 +203,14 @@ hpl_p :
fi; \
done
@@ -54,10 +54,14 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
- - 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)
+-ifeq ($(F_COMPILER), GFORTRAN)
- - at echo "TIMER = INT_ETIME" >> $(NETLIB_LAPACK_DIR)/make.inc
-ifdef SMP
+-ifeq ($(OSNAME), WINNT)
+- - at echo "LOADER = $(FC)" >> $(NETLIB_LAPACK_DIR)/make.inc
+-else
- - at echo "LOADER = $(FC) -pthread" >> $(NETLIB_LAPACK_DIR)/make.inc
+-endif
-else
- - at echo "LOADER = $(FC)" >> $(NETLIB_LAPACK_DIR)/make.inc
-endif
@@ -65,6 +69,9 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
- - at echo "TIMER = NONE" >> $(NETLIB_LAPACK_DIR)/make.inc
- - at echo "LOADER = $(FC)" >> $(NETLIB_LAPACK_DIR)/make.inc
-endif
+-ifeq ($(BUILD_LAPACK_DEPRECATED), 1)
+- - at echo "BUILD_DEPRECATED = 1" >> $(NETLIB_LAPACK_DIR)/make.inc
+-endif
- - at cat make.inc >> $(NETLIB_LAPACK_DIR)/make.inc
-endif
+clean::
@@ -72,7 +79,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
large.tgz :
ifndef NOFORTRAN
-@@ -314,9 +271,5 @@ ifeq ($(OSNAME), Darwin)
+@@ -325,9 +275,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
@@ -90,10 +97,10 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-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
+- @-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
diff --git a/debian/patches/remove-openmp-warning.patch b/debian/patches/remove-openmp-warning.patch
index 67fe548..250c0f9 100644
--- a/debian/patches/remove-openmp-warning.patch
+++ b/debian/patches/remove-openmp-warning.patch
@@ -8,7 +8,7 @@ Last-Update: 2014-02-17
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/driver/others/blas_server.c
+++ b/driver/others/blas_server.c
-@@ -756,16 +756,6 @@ int exec_blas(BLASLONG num, blas_queue_t
+@@ -751,16 +751,6 @@ int exec_blas(BLASLONG num, blas_queue_t
fprintf(STDERR, "Exec_blas is called. Number of executing threads : %ld\n", num);
#endif
--
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