[lapack] 05/17: Adapt for uppercase subdirectories.
Sébastien Villemot
sebastien at debian.org
Thu Dec 24 20:39:58 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastien pushed a commit to branch master
in repository lapack.
commit 8a189d5c329b338c19c7747260b8a20da45cfb8e
Author: Sébastien Villemot <sebastien at debian.org>
Date: Tue Dec 22 20:32:12 2015 +0100
Adapt for uppercase subdirectories.
This is the consequence of using a pristine upstream tarball.
Gbp-Dch: Ignore
---
.gitignore | 46 +++++++--------
debian/liblapack-test.examples | 110 ++++++++++++++++++------------------
debian/liblapack-test.install | 30 +++++-----
debian/liblapack3.docs | 2 +-
debian/liblapacke-dev.install | 6 +-
debian/liblapacke.install | 2 +-
debian/patches/decouple_gcc.diff | 8 +--
debian/patches/parallel_build.patch | 12 ++--
debian/rules | 44 +++++++--------
9 files changed, 129 insertions(+), 131 deletions(-)
diff --git a/.gitignore b/.gitignore
index 5f77c50..0b077b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,28 +48,28 @@ debian/.debhelper/
lapack-netlib.pc
DOCS/explore-html/
DOCS/man/
-install/testdlamch
-install/testdsecnd
-install/testieee
-install/testlsame
-install/testsecond
-install/testslamch
-install/testversion
-lapacke/include/lapacke_mangling.h
+INSTALL/testdlamch
+INSTALL/testdsecnd
+INSTALL/testieee
+INSTALL/testlsame
+INSTALL/testsecond
+INSTALL/testslamch
+INSTALL/testversion
+LAPACKE/include/lapacke_mangling.h
make.inc
-testing/testing_results.txt
-testing/xeigtstc
-testing/xeigtstd
-testing/xeigtsts
-testing/xeigtstz
-testing/xlintstc
-testing/xlintstd
-testing/xlintsts
-testing/xlintstz
-testing/xlintstds
-testing/xlintstrfc
-testing/xlintstrfd
-testing/xlintstrfs
-testing/xlintstrfz
-testing/xlintstzc
+TESTING/testing_results.txt
+TESTING/xeigtstc
+TESTING/xeigtstd
+TESTING/xeigtsts
+TESTING/xeigtstz
+TESTING/xlintstc
+TESTING/xlintstd
+TESTING/xlintsts
+TESTING/xlintstz
+TESTING/xlintstds
+TESTING/xlintstrfc
+TESTING/xlintstrfd
+TESTING/xlintstrfs
+TESTING/xlintstrfz
+TESTING/xlintstzc
output_err
diff --git a/debian/liblapack-test.examples b/debian/liblapack-test.examples
index d5e02bb..d65db89 100644
--- a/debian/liblapack-test.examples
+++ b/debian/liblapack-test.examples
@@ -1,55 +1,55 @@
-testing/cbak.in
-testing/cbal.in
-testing/cbb.in
-testing/cec.in
-testing/ced.in
-testing/cgbak.in
-testing/cgbal.in
-testing/cgd.in
-testing/cgg.in
-testing/csb.in
-testing/csg.in
-testing/ctest.in
-testing/dbak.in
-testing/dbal.in
-testing/dbb.in
-testing/dec.in
-testing/ded.in
-testing/dgbak.in
-testing/dgbal.in
-testing/dgd.in
-testing/dgg.in
-testing/dsb.in
-testing/dsg.in
-testing/dtest.in
-testing/glm.in
-testing/gqr.in
-testing/gsv.in
-testing/lse.in
-testing/nep.in
-testing/sbak.in
-testing/sbal.in
-testing/sbb.in
-testing/sec.in
-testing/sed.in
-testing/sep.in
-testing/sgbak.in
-testing/sgbal.in
-testing/sgd.in
-testing/sgg.in
-testing/ssb.in
-testing/ssg.in
-testing/stest.in
-testing/svd.in
-testing/zbak.in
-testing/zbal.in
-testing/zbb.in
-testing/zec.in
-testing/zed.in
-testing/zgbak.in
-testing/zgbal.in
-testing/zgd.in
-testing/zgg.in
-testing/zsb.in
-testing/zsg.in
-testing/ztest.in
+TESTING/cbak.in
+TESTING/cbal.in
+TESTING/cbb.in
+TESTING/cec.in
+TESTING/ced.in
+TESTING/cgbak.in
+TESTING/cgbal.in
+TESTING/cgd.in
+TESTING/cgg.in
+TESTING/csb.in
+TESTING/csg.in
+TESTING/ctest.in
+TESTING/dbak.in
+TESTING/dbal.in
+TESTING/dbb.in
+TESTING/dec.in
+TESTING/ded.in
+TESTING/dgbak.in
+TESTING/dgbal.in
+TESTING/dgd.in
+TESTING/dgg.in
+TESTING/dsb.in
+TESTING/dsg.in
+TESTING/dtest.in
+TESTING/glm.in
+TESTING/gqr.in
+TESTING/gsv.in
+TESTING/lse.in
+TESTING/nep.in
+TESTING/sbak.in
+TESTING/sbal.in
+TESTING/sbb.in
+TESTING/sec.in
+TESTING/sed.in
+TESTING/sep.in
+TESTING/sgbak.in
+TESTING/sgbal.in
+TESTING/sgd.in
+TESTING/sgg.in
+TESTING/ssb.in
+TESTING/ssg.in
+TESTING/stest.in
+TESTING/svd.in
+TESTING/zbak.in
+TESTING/zbal.in
+TESTING/zbb.in
+TESTING/zec.in
+TESTING/zed.in
+TESTING/zgbak.in
+TESTING/zgbal.in
+TESTING/zgd.in
+TESTING/zgg.in
+TESTING/zsb.in
+TESTING/zsg.in
+TESTING/ztest.in
diff --git a/debian/liblapack-test.install b/debian/liblapack-test.install
index f8bee1c..26939f2 100644
--- a/debian/liblapack-test.install
+++ b/debian/liblapack-test.install
@@ -1,15 +1,15 @@
-testing/*.in usr/share/doc/liblapack-test/examples/
-testing/xeigtstc usr/lib/lapack/
-testing/xeigtstd usr/lib/lapack/
-testing/xeigtsts usr/lib/lapack/
-testing/xeigtstz usr/lib/lapack/
-testing/xlintstc usr/lib/lapack/
-testing/xlintstd usr/lib/lapack/
-testing/xlintsts usr/lib/lapack/
-testing/xlintstz usr/lib/lapack/
-testing/xlintstds usr/lib/lapack/
-testing/xlintstrfc usr/lib/lapack/
-testing/xlintstrfd usr/lib/lapack/
-testing/xlintstrfs usr/lib/lapack/
-testing/xlintstrfz usr/lib/lapack/
-testing/xlintstzc usr/lib/lapack/
+TESTING/*.in usr/share/doc/liblapack-test/examples/
+TESTING/xeigtstc usr/lib/lapack/
+TESTING/xeigtstd usr/lib/lapack/
+TESTING/xeigtsts usr/lib/lapack/
+TESTING/xeigtstz usr/lib/lapack/
+TESTING/xlintstc usr/lib/lapack/
+TESTING/xlintstd usr/lib/lapack/
+TESTING/xlintsts usr/lib/lapack/
+TESTING/xlintstz usr/lib/lapack/
+TESTING/xlintstds usr/lib/lapack/
+TESTING/xlintstrfc usr/lib/lapack/
+TESTING/xlintstrfd usr/lib/lapack/
+TESTING/xlintstrfs usr/lib/lapack/
+TESTING/xlintstrfz usr/lib/lapack/
+TESTING/xlintstzc usr/lib/lapack/
diff --git a/debian/liblapack3.docs b/debian/liblapack3.docs
index 2d525a7..26f268d 100644
--- a/debian/liblapack3.docs
+++ b/debian/liblapack3.docs
@@ -1,2 +1,2 @@
-testing/testing_results.txt
+TESTING/testing_results.txt
README
diff --git a/debian/liblapacke-dev.install b/debian/liblapacke-dev.install
index b15995b..1883498 100644
--- a/debian/liblapacke-dev.install
+++ b/debian/liblapacke-dev.install
@@ -1,3 +1,3 @@
-lapacke/include/*.h usr/include/
-lapacke/liblapacke.so usr/lib/
-lapacke/liblapacke.a usr/lib/
+LAPACKE/include/*.h usr/include/
+LAPACKE/liblapacke.so usr/lib/
+LAPACKE/liblapacke.a usr/lib/
diff --git a/debian/liblapacke.install b/debian/liblapacke.install
index 3193c6b..fee245f 100644
--- a/debian/liblapacke.install
+++ b/debian/liblapacke.install
@@ -1 +1 @@
-lapacke/liblapacke.so.* usr/lib/
+LAPACKE/liblapacke.so.* usr/lib/
diff --git a/debian/patches/decouple_gcc.diff b/debian/patches/decouple_gcc.diff
index 6efa88f..d53fa9e 100644
--- a/debian/patches/decouple_gcc.diff
+++ b/debian/patches/decouple_gcc.diff
@@ -1,8 +1,6 @@
-Index: lapack-3.4.2/install/make.inc.gfortran
-===================================================================
---- lapack-3.4.2.orig/install/make.inc.gfortran 2012-04-13 20:13:07.000000000 +0200
-+++ lapack-3.4.2/install/make.inc.gfortran 2012-09-26 12:58:45.025523212 +0200
-@@ -42,7 +42,7 @@
+--- a/INSTALL/make.inc.gfortran
++++ b/INSTALL/make.inc.gfortran
+@@ -46,7 +46,7 @@ TIMER = INT_ETIME
#
# CC is the C compiler, normally invoked with options CFLAGS.
#
diff --git a/debian/patches/parallel_build.patch b/debian/patches/parallel_build.patch
index 5a69f07..762ffe0 100644
--- a/debian/patches/parallel_build.patch
+++ b/debian/patches/parallel_build.patch
@@ -4,17 +4,17 @@ Forwarded: no
Last-Update: 2013-03-27
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/testing/Makefile
-+++ b/testing/Makefile
-@@ -582,3 +582,5 @@
+--- a/TESTING/Makefile
++++ b/TESTING/Makefile
+@@ -582,3 +582,5 @@ FRCEIG:
FRC:
@FRC=$(FRC)
+
+.NOTPARALLEL:
---- a/testing/LIN/Makefile
-+++ b/testing/LIN/Makefile
-@@ -339,3 +339,5 @@
+--- a/TESTING/LIN/Makefile
++++ b/TESTING/LIN/Makefile
+@@ -339,3 +339,5 @@ zchkaa.o: zchkaa.f
.f.o:
$(FORTRAN) $(OPTS) -c $< -o $@
diff --git a/debian/rules b/debian/rules
index 0cb85c3..a99b302 100755
--- a/debian/rules
+++ b/debian/rules
@@ -46,7 +46,7 @@ endif
#
#
-make.inc: install/make.inc.gfortran
+make.inc: INSTALL/make.inc.gfortran
cat $< | sed -e "s,\(^NOOPT *=\).*,\1 \$$(PICOPTS) $(FFLAGS_NOOPT),1" \
-e "s,\(^OPTS *=\).*,\1 \$$(PICOPTS) $(FFLAGS),1" \
-e "s/\(^LOADOPTS *=\).*/\1 $(LDFLAGS)/1" \
@@ -65,7 +65,7 @@ lapack-netlib.pc: lapack.pc.in
#
#
-liblapack_pic.a: make.inc testing/Makefile
+liblapack_pic.a: make.inc TESTING/Makefile
echo "Building liblapack_pic.a"
$(MAKE) cleanlib
$(MAKE) lapack_install PICOPTS=-fPIC
@@ -117,32 +117,32 @@ libtmglib.a: make.inc
$(MAKE) clean; \
$(MAKE)
-lapacke/liblapacke_pic.a: make.inc
+LAPACKE/liblapacke_pic.a: make.inc
echo "Building liblapacke_pic.a"
- cd lapacke; \
+ cd LAPACKE; \
$(MAKE) cleanlib; \
$(MAKE) PICOPTS=-fPIC; \
mv ../liblapacke.a $(@F)
-lapacke/liblapacke.so.$(DEB_VERSION_UPSTREAM): lapacke/liblapacke_pic.a
+LAPACKE/liblapacke.so.$(DEB_VERSION_UPSTREAM): LAPACKE/liblapacke_pic.a
echo "Building liblapacke.so.$(DEB_VERSION_UPSTREAM) from liblapacke_pic.a"
- cd lapacke; \
+ cd LAPACKE; \
mkdir -p tmp; \
cd tmp && ar x ../$(<F) && cd -; \
$(CC) -shared -Wl,-soname=liblapacke.so.$(SO) -o $(@F) tmp/*.o -L.. -lblas -llapack -ltmglib $(LDFLAGS); \
rm -rf tmp
-lapacke/liblapacke.so.$(SO): lapacke/liblapacke.so.$(DEB_VERSION_UPSTREAM)
- cd lapacke; \
+LAPACKE/liblapacke.so.$(SO): LAPACKE/liblapacke.so.$(DEB_VERSION_UPSTREAM)
+ cd LAPACKE; \
ln -snf $(<F) $(@F)
-lapacke/liblapacke.so: lapacke/liblapacke.so.$(SO)
- cd lapacke; \
+LAPACKE/liblapacke.so: LAPACKE/liblapacke.so.$(SO)
+ cd LAPACKE; \
ln -snf $(<F) $(@F)
-lapacke/liblapacke.a: make.inc
+LAPACKE/liblapacke.a: make.inc
echo "Building liblapacke.a"
- cd lapacke; \
+ cd LAPACKE; \
$(MAKE) cleanlib; \
$(MAKE) ; \
mv ../liblapacke.a $(@F)
@@ -153,7 +153,7 @@ lapacke/liblapacke.a: make.inc
#
#
-testing/testing_results.txt: liblapack.so
+TESTING/testing_results.txt: liblapack.so
LD_LIBRARY_PATH=$$(pwd):$$LD_LIBRARY_PATH \
$(MAKE) PICOPTS= OPTS="$(FFLAGS_TESTSUITE)" \
LLIB="-L $$(pwd) -llapack -lblas" lapack_testing
@@ -169,11 +169,11 @@ testing/testing_results.txt: liblapack.so
override_dh_auto_clean: make.inc
dh_testdir
- rm -rf debian/*_stamp debian/*_results lib* testing/*out
- rm -rf *.a install/test* debian/test/ debian/time/
- rm -f testing/tmp testing/testing_results.txt
- cd lapacke && $(MAKE) clean
- rm -f lapacke/*.a lapacke/*.so lapacke/*.so.* lapacke/include/lapacke_mangling.h
+ rm -rf debian/*_stamp debian/*_results lib* TESTING/*out
+ rm -rf *.a INSTALL/test* debian/test/ debian/time/
+ rm -f TESTING/tmp TESTING/testing_results.txt
+ cd LAPACKE && $(MAKE) clean
+ rm -f LAPACKE/*.a LAPACKE/*.so LAPACKE/*.so.* LAPACKE/include/lapacke_mangling.h
touch TESTING/xlinfoo TESTING/xeigfoo && $(MAKE) clean
$(MAKE) -C TESTING/MATGEN clean
rm -rf DOCS/explore-html/ DOCS/man/
@@ -184,18 +184,18 @@ override_dh_auto_clean: make.inc
# Same for libtmglib_pic.a before libtmglib.a, and liblapacke_pic.a before liblapacke.a.
# Moreover, shared libraries for liblapack, libtmglib and liblapacke must come in that order.
# We also build the test programs, in order to avoid FTBFS if DEB_BUILD_OPTIONS contains nocheck
-override_dh_auto_build-arch: liblapack_pic.a liblapack.a liblapack.so libtmglib_pic.a libtmglib.a libtmglib.so lapacke/liblapacke_pic.a lapacke/liblapacke.a lapacke/liblapacke.so lapack-netlib.pc
- make OPTS="$(FFLAGS_TESTSUITE)" -C testing xeigtstc xeigtstd xeigtsts xeigtstz xlintstc xlintstd xlintsts xlintstz xlintstds xlintstrfc xlintstrfd xlintstrfs xlintstrfz xlintstzc
+override_dh_auto_build-arch: liblapack_pic.a liblapack.a liblapack.so libtmglib_pic.a libtmglib.a libtmglib.so LAPACKE/liblapacke_pic.a LAPACKE/liblapacke.a LAPACKE/liblapacke.so lapack-netlib.pc
+ make OPTS="$(FFLAGS_TESTSUITE)" -C TESTING xeigtstc xeigtstd xeigtsts xeigtstz xlintstc xlintstd xlintsts xlintstz xlintstds xlintstrfc xlintstrfd xlintstrfs xlintstrfz xlintstzc
override_dh_auto_build-indep: make.inc
$(MAKE) html
$(MAKE) man
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-override_dh_auto_test-arch: testing/testing_results.txt
+override_dh_auto_test-arch: TESTING/testing_results.txt
else
override_dh_auto_test-arch:
- touch testing/testing_results.txt
+ touch TESTING/testing_results.txt
endif
override_dh_makeshlibs:
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/lapack.git
More information about the debian-science-commits
mailing list