[openblas] 03/07: Refresh patches.
Sébastien Villemot
sebastien at debian.org
Tue Apr 28 18:31:18 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastien pushed a commit to branch master
in repository openblas.
commit 1b25b301246e632548ccbcc05e6e01a8fc2f20d7
Author: Sébastien Villemot <sebastien at debian.org>
Date: Tue Apr 28 19:51:08 2015 +0200
Refresh patches.
Git-Dch: Ignore
---
debian/patches/arm-gcc-flags.patch | 3 ++-
debian/patches/kfreebsd.patch | 8 ++++----
debian/patches/no-embedded-lapack.patch | 17 ++++++++---------
debian/patches/remove-openmp-warning.patch | 2 +-
debian/patches/shared-blas-lapack.patch | 2 +-
5 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/debian/patches/arm-gcc-flags.patch b/debian/patches/arm-gcc-flags.patch
index a92bd96..e1042aa 100644
--- a/debian/patches/arm-gcc-flags.patch
+++ b/debian/patches/arm-gcc-flags.patch
@@ -6,7 +6,8 @@ Last-Update: 2014-06-15
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/Makefile.arm
+++ b/Makefile.arm
-@@ -1,12 +1,8 @@
+@@ -5,13 +5,9 @@ FCOMMON_OPT += -marm -mfpu=vfpv3 -mfloa
+ endif
ifeq ($(CORE), ARMV7)
-CCOMMON_OPT += -marm -mfpu=vfpv3 -mfloat-abi=hard -march=armv7-a
diff --git a/debian/patches/kfreebsd.patch b/debian/patches/kfreebsd.patch
index 82a1617..7729c89 100644
--- a/debian/patches/kfreebsd.patch
+++ b/debian/patches/kfreebsd.patch
@@ -9,7 +9,7 @@ Last-Update: 2014-08-05
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/exports/Makefile
+++ b/exports/Makefile
-@@ -99,7 +99,7 @@ $(LIBDYNNAME) : ../$(LIBNAME) osx.def
+@@ -110,7 +110,7 @@ endif
dllinit.$(SUFFIX) : dllinit.c
$(CC) $(CFLAGS) -c -o $(@F) -s $<
@@ -18,7 +18,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
so : ../$(LIBSONAME)
-@@ -121,7 +121,7 @@ endif
+@@ -138,7 +138,7 @@ endif
endif
#http://stackoverflow.com/questions/7656425/makefile-ifeq-logical-or
@@ -29,7 +29,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/Makefile.install
+++ b/Makefile.install
-@@ -60,17 +60,12 @@ endif
+@@ -63,17 +63,12 @@ endif
#for install shared library
ifndef NO_SHARED
@echo Copying the shared library to $(DESTDIR)$(OPENBLAS_LIBRARY_DIR)
@@ -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
-@@ -204,7 +204,7 @@ ifeq ($(OSNAME), NetBSD)
+@@ -212,7 +212,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 f722893..95d829e 100644
--- a/debian/patches/no-embedded-lapack.patch
+++ b/debian/patches/no-embedded-lapack.patch
@@ -84,16 +84,16 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
@echo Done.
--- a/Makefile.install
+++ b/Makefile.install
-@@ -42,14 +42,6 @@ ifndef NO_CBLAS
+@@ -45,14 +45,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
+- @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
@@ -112,11 +112,10 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
# - CC is an implicit variable so neither '?=' or 'ifndef' can be used.
--- a/interface/Makefile
+++ b/interface/Makefile
-@@ -2103,4 +2103,8 @@ zimatcopy.$(SUFFIX) zimatcopy.$(PSUFFIX)
- cblas_zimatcopy.$(SUFFIX) cblas_zimatcopy.$(PSUFFIX) : zimatcopy.c
+@@ -2137,3 +2137,8 @@ cblas_cgeadd.$(SUFFIX) cblas_cgeadd.$(PS
+ cblas_zgeadd.$(SUFFIX) cblas_zgeadd.$(PSUFFIX) : zgeadd.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
diff --git a/debian/patches/remove-openmp-warning.patch b/debian/patches/remove-openmp-warning.patch
index 6c55860..d596015 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
-@@ -740,16 +740,6 @@ int exec_blas(BLASLONG num, blas_queue_t
+@@ -741,16 +741,6 @@ int exec_blas(BLASLONG num, blas_queue_t
fprintf(STDERR, "Exec_blas is called. Number of executing threads : %ld\n", num);
#endif
diff --git a/debian/patches/shared-blas-lapack.patch b/debian/patches/shared-blas-lapack.patch
index 80ade63..4203fca 100644
--- a/debian/patches/shared-blas-lapack.patch
+++ b/debian/patches/shared-blas-lapack.patch
@@ -10,7 +10,7 @@ Last-Update: 2014-05-08
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/interface/Makefile
+++ b/interface/Makefile
-@@ -2108,3 +2108,18 @@ cblas_zimatcopy.$(SUFFIX) cblas_zimatcop
+@@ -2142,3 +2142,18 @@ cblas_zgeadd.$(SUFFIX) cblas_zgeadd.$(PS
# OpenBLAS (unfiltered) tarball
delete-duplicate-lapack-objects:
cd ../lapack-netlib && rm $(SLAPACKOBJS) $(DLAPACKOBJS) $(CLAPACKOBJS) $(ZLAPACKOBJS) lsame.o xerbla.o
--
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