[openblas] 04/10: Refresh patches.
Sébastien Villemot
sebastien at debian.org
Thu Jul 27 16:29:56 UTC 2017
This is an automated email from the git hooks/post-receive script.
sebastien pushed a commit to branch master
in repository openblas.
commit d75c6055cb72f653508d5cdc20f83b26f1f5addb
Author: Sébastien Villemot <sebastien at debian.org>
Date: Thu Jul 27 14:29:28 2017 +0200
Refresh patches.
Gbp-Dch: Ignore
---
debian/patches/arm-gcc-flags.patch | 12 +-
debian/patches/kfreebsd.patch | 14 +-
debian/patches/matgen-symbols-not-included.patch | 204 +++++++++++------------
debian/patches/no-embedded-lapack.patch | 28 +++-
debian/patches/order-files.patch | 4 +-
debian/patches/remove-openmp-warning.patch | 2 +-
debian/patches/shared-blas-lapack.patch | 2 +-
7 files changed, 138 insertions(+), 128 deletions(-)
diff --git a/debian/patches/arm-gcc-flags.patch b/debian/patches/arm-gcc-flags.patch
index 3ce87c6..32fc336 100644
--- a/debian/patches/arm-gcc-flags.patch
+++ b/debian/patches/arm-gcc-flags.patch
@@ -9,14 +9,14 @@ Last-Update: 2015-04-29
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/Makefile.arm
+++ b/Makefile.arm
-@@ -20,8 +20,8 @@ endif
+@@ -9,8 +9,8 @@ endif
endif
ifeq ($(CORE), ARMV6)
--CCOMMON_OPT += -marm -mfpu=vfp -mfloat-abi=hard -march=armv6
--FCOMMON_OPT += -marm -mfpu=vfp -mfloat-abi=hard -march=armv6
-+CCOMMON_OPT += -marm -mfpu=vfpv3-d16 -mfloat-abi=hard -march=armv7-a
-+FCOMMON_OPT += -marm -mfpu=vfpv3-d16 -mfloat-abi=hard -march=armv7-a
+-CCOMMON_OPT += -mfpu=vfp -march=armv6
+-FCOMMON_OPT += -mfpu=vfp -march=armv6
++CCOMMON_OPT += -mfpu=vfpv3-d16 -march=armv7-a
++FCOMMON_OPT += -mfpu=vfpv3-d16 -march=armv7-a
endif
-
+ ifeq ($(CORE), ARMV5)
diff --git a/debian/patches/kfreebsd.patch b/debian/patches/kfreebsd.patch
index dd00d9e..045c032 100644
--- a/debian/patches/kfreebsd.patch
+++ b/debian/patches/kfreebsd.patch
@@ -13,12 +13,12 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
dllinit.$(SUFFIX) : dllinit.c
$(CC) $(CFLAGS) -c -o $(@F) -s $<
--ifeq ($(OSNAME), $(filter $(OSNAME),Linux SunOS))
-+ifeq ($(OSNAME), $(filter $(OSNAME),Linux SunOS FreeBSD))
+-ifeq ($(OSNAME), $(filter $(OSNAME),Linux SunOS Android))
++ifeq ($(OSNAME), $(filter $(OSNAME),Linux SunOS Android FreeBSD))
so : ../$(LIBSONAME)
-@@ -146,7 +146,7 @@ endif
+@@ -152,7 +152,7 @@ endif
endif
#http://stackoverflow.com/questions/7656425/makefile-ifeq-logical-or
@@ -29,12 +29,12 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/Makefile.install
+++ b/Makefile.install
-@@ -64,17 +64,12 @@ endif
+@@ -66,17 +66,12 @@ endif
#for install shared library
ifndef NO_SHARED
@echo Copying the shared library to $(DESTDIR)$(OPENBLAS_LIBRARY_DIR)
--ifeq ($(OSNAME), $(filter $(OSNAME),Linux SunOS))
-+ifeq ($(OSNAME), $(filter $(OSNAME),Linux SunOS FreeBSD))
+-ifeq ($(OSNAME), $(filter $(OSNAME),Linux SunOS Android))
++ifeq ($(OSNAME), $(filter $(OSNAME),Linux SunOS Android 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
-@@ -229,7 +229,7 @@ ifeq ($(OSNAME), NetBSD)
+@@ -237,7 +237,7 @@ ifeq ($(OSNAME), NetBSD)
MD5SUM = md5 -n
endif
diff --git a/debian/patches/matgen-symbols-not-included.patch b/debian/patches/matgen-symbols-not-included.patch
index e47d667..138e235 100644
--- a/debian/patches/matgen-symbols-not-included.patch
+++ b/debian/patches/matgen-symbols-not-included.patch
@@ -8,105 +8,105 @@ Last-Update: 2016-03-24
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/exports/gensymbol
+++ b/exports/gensymbol
-@@ -463,24 +463,6 @@
- cggsvp3,
- cgsvj0,
- cgsvj1,
-- clagge,
-- claghe,
-- clagsy,
-- clahilb,
-- clakf2,
-- clarge,
-- clarnd,
-- claror,
-- clarot,
-- clatm1,
-- clatm2,
-- clatm3,
-- clatm5,
-- clatm6,
-- clatme,
-- clatmr,
-- clatms,
-- clatmt,
- cpotrf2,
- csbmv,
- cspr2,
-@@ -495,25 +477,6 @@
- dggsvd3,
- dggsvp3,
- dladiv2,
-- dlagge,
-- dlagsy,
-- dlahilb,
-- dlakf2,
-- dlaran,
-- dlarge,
-- dlarnd,
-- dlaror,
-- dlarot,
-- dlatm1,
-- dlatm2,
-- dlatm3,
-- dlatm5,
-- dlatm6,
-- dlatm7,
-- dlatme,
-- dlatmr,
-- dlatms,
-- dlatmt,
- dorm22,
- dpotrf2,
- dsecnd,
-@@ -527,25 +490,6 @@
- sggsvd3,
- sggsvp3,
- sladiv2,
-- slagge,
-- slagsy,
-- slahilb,
-- slakf2,
-- slaran,
-- slarge,
-- slarnd,
-- slaror,
-- slarot,
-- slatm1,
-- slatm2,
-- slatm3,
-- slatm5,
-- slatm6,
-- slatm7,
-- slatme,
-- slatmr,
-- slatms,
-- slatmt,
- sorm22,
- spotrf2,
- zgejsv,
-@@ -559,24 +503,6 @@
- zggsvp3,
- zgsvj0,
- zgsvj1,
-- zlagge,
-- zlaghe,
-- zlagsy,
-- zlahilb,
-- zlakf2,
-- zlarge,
-- zlarnd,
-- zlaror,
-- zlarot,
-- zlatm1,
-- zlatm2,
-- zlatm3,
-- zlatm5,
-- zlatm6,
-- zlatme,
-- zlatmr,
-- zlatms,
-- zlatmt,
- zpotrf2,
- zsbmv,
- zspr2,
+@@ -495,24 +495,6 @@
+ cggsvp3,
+ cgsvj0,
+ cgsvj1,
+- clagge,
+- claghe,
+- clagsy,
+- clahilb,
+- clakf2,
+- clarge,
+- clarnd,
+- claror,
+- clarot,
+- clatm1,
+- clatm2,
+- clatm3,
+- clatm5,
+- clatm6,
+- clatme,
+- clatmr,
+- clatms,
+- clatmt,
+ cpotrf2,
+ csbmv,
+ cspr2,
+@@ -527,25 +509,6 @@
+ dggsvd3,
+ dggsvp3,
+ dladiv2,
+- dlagge,
+- dlagsy,
+- dlahilb,
+- dlakf2,
+- dlaran,
+- dlarge,
+- dlarnd,
+- dlaror,
+- dlarot,
+- dlatm1,
+- dlatm2,
+- dlatm3,
+- dlatm5,
+- dlatm6,
+- dlatm7,
+- dlatme,
+- dlatmr,
+- dlatms,
+- dlatmt,
+ dorm22,
+ dpotrf2,
+ dsecnd,
+@@ -559,25 +522,6 @@
+ sggsvd3,
+ sggsvp3,
+ sladiv2,
+- slagge,
+- slagsy,
+- slahilb,
+- slakf2,
+- slaran,
+- slarge,
+- slarnd,
+- slaror,
+- slarot,
+- slatm1,
+- slatm2,
+- slatm3,
+- slatm5,
+- slatm6,
+- slatm7,
+- slatme,
+- slatmr,
+- slatms,
+- slatmt,
+ sorm22,
+ spotrf2,
+ zgejsv,
+@@ -591,24 +535,6 @@
+ zggsvp3,
+ zgsvj0,
+ zgsvj1,
+- zlagge,
+- zlaghe,
+- zlagsy,
+- zlahilb,
+- zlakf2,
+- zlarge,
+- zlarnd,
+- zlaror,
+- zlarot,
+- zlatm1,
+- zlatm2,
+- zlatm3,
+- zlatm5,
+- zlatm6,
+- zlatme,
+- zlatmr,
+- zlatms,
+- zlatmt,
+ zpotrf2,
+ zsbmv,
+ zspr2,
diff --git a/debian/patches/no-embedded-lapack.patch b/debian/patches/no-embedded-lapack.patch
index 95af232..f519b5e 100644
--- a/debian/patches/no-embedded-lapack.patch
+++ b/debian/patches/no-embedded-lapack.patch
@@ -1,14 +1,14 @@
-Description: Adapt build system for the absence of lapack-netlib/ directory.
+Description: Adapt build system for the absence of lapack-netlib/ and relapack directories.
Instead use the binary provided by package liblapack-pic, stripping from it the
symbols that are overriden by OpenBLAS.
Author: Sébastien Villemot <sebastien at debian.org>
Forwarded: not-needed
-Last-Update: 2014-08-05
+Last-Update: 2017-07-27
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/Makefile
+++ b/Makefile
-@@ -201,64 +201,14 @@ hpl_p :
+@@ -206,72 +206,14 @@ hpl_p :
fi; \
done
@@ -30,6 +30,14 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-endif
-endif
-
+-ifeq ($(NO_LAPACK), 1)
+-re_lapack :
+-
+-else
+-re_lapack :
+- @$(MAKE) -C relapack
+-endif
+-
-prof_lapack : lapack_prebuild
- @$(MAKE) -C $(NETLIB_LAPACK_DIR) lapack_prof
-
@@ -79,13 +87,14 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
large.tgz :
ifndef NOFORTRAN
-@@ -323,9 +273,5 @@ ifeq ($(OSNAME), Darwin)
+@@ -336,10 +278,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
+- @$(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.
@@ -102,10 +111,11 @@ 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
-@@ -2137,3 +2137,8 @@ cblas_cgeadd.$(SUFFIX) cblas_cgeadd.$(PS
- cblas_zgeadd.$(SUFFIX) cblas_zgeadd.$(PSUFFIX) : zgeadd.c
- $(CC) -c $(CFLAGS) -DCBLAS $< -o $(@F)
+@@ -2139,3 +2139,9 @@ cblas_zgeadd.$(SUFFIX) cblas_zgeadd.$(PS
+ 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
@@ -113,7 +123,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+ 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
+@@ -48,14 +48,6 @@ ifndef NO_CBLAS
@sed 's/common/openblas_config/g' cblas.h > "$(DESTDIR)$(OPENBLAS_INCLUDE_DIR)/cblas.h"
endif
@@ -121,7 +131,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
- @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_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
-
diff --git a/debian/patches/order-files.patch b/debian/patches/order-files.patch
index 471f1b2..a48c7b4 100644
--- a/debian/patches/order-files.patch
+++ b/debian/patches/order-files.patch
@@ -8,7 +8,7 @@ Last-Update: 2016-09-06
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/Makefile
+++ b/Makefile
-@@ -205,7 +205,7 @@ netlib :
+@@ -210,7 +210,7 @@ netlib :
mkdir lapack-netlib
cd lapack-netlib && ar -x /usr/lib/lapack/liblapack_pic.a
make -C interface delete-duplicate-lapack-objects
@@ -19,7 +19,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
rm -rf lapack-netlib
--- a/interface/Makefile
+++ b/interface/Makefile
-@@ -2153,7 +2153,7 @@ libblas.so.3: $(SBLAS1OBJS) $(SBLAS2OBJS
+@@ -2156,7 +2156,7 @@ libblas.so.3: $(SBLAS1OBJS) $(SBLAS2OBJS
# The prerequisites must match the symbols deleted in target delete-duplicate-lapack-objects
liblapack.so.3: $(SLAPACKOBJS) $(DLAPACKOBJS) $(CLAPACKOBJS) $(ZLAPACKOBJS) ../kernel/lsame.o ../driver/others/xerbla.o
diff --git a/debian/patches/remove-openmp-warning.patch b/debian/patches/remove-openmp-warning.patch
index 250c0f9..020794f 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
-@@ -751,16 +751,6 @@ int exec_blas(BLASLONG num, blas_queue_t
+@@ -790,16 +790,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 4203fca..6317c78 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
-@@ -2142,3 +2142,18 @@ cblas_zgeadd.$(SUFFIX) cblas_zgeadd.$(PS
+@@ -2145,3 +2145,18 @@ cblas_xerbla.$(SUFFIX) cblas_xerbla.$(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