[lapack] 01/09: Reflect changes in upstream build system.
Sébastien Villemot
sebastien at debian.org
Tue Jul 4 14:08:44 UTC 2017
This is an automated email from the git hooks/post-receive script.
sebastien pushed a commit to branch master
in repository lapack.
commit b291db9632e15eef3152413518d0a95e4363324e
Author: Sébastien Villemot <sebastien at debian.org>
Date: Tue Jul 4 14:18:46 2017 +0200
Reflect changes in upstream build system.
Gbp-Dch: Ignore
---
debian/libblas-test.install | 40 +++++++++++++--------------
debian/liblapack-pic.install | 2 +-
debian/liblapack-test.install | 28 +++++++++----------
debian/rules | 63 +++++++++++++++++--------------------------
4 files changed, 60 insertions(+), 73 deletions(-)
diff --git a/debian/libblas-test.install b/debian/libblas-test.install
index cf55e09..a45fd05 100644
--- a/debian/libblas-test.install
+++ b/debian/libblas-test.install
@@ -1,23 +1,23 @@
-BLAS/xblat1c /usr/lib/libblas/
-BLAS/xblat2c /usr/lib/libblas/
-BLAS/xblat3c /usr/lib/libblas/
-BLAS/xblat1d /usr/lib/libblas/
-BLAS/xblat2d /usr/lib/libblas/
-BLAS/xblat3d /usr/lib/libblas/
-BLAS/xblat1s /usr/lib/libblas/
-BLAS/xblat2s /usr/lib/libblas/
-BLAS/xblat3s /usr/lib/libblas/
-BLAS/xblat1z /usr/lib/libblas/
-BLAS/xblat2z /usr/lib/libblas/
-BLAS/xblat3z /usr/lib/libblas/
-BLAS/cblat2.in /usr/lib/libblas/
-BLAS/cblat3.in /usr/lib/libblas/
-BLAS/dblat2.in /usr/lib/libblas/
-BLAS/dblat3.in /usr/lib/libblas/
-BLAS/sblat2.in /usr/lib/libblas/
-BLAS/sblat3.in /usr/lib/libblas/
-BLAS/zblat2.in /usr/lib/libblas/
-BLAS/zblat3.in /usr/lib/libblas/
+BLAS/TESTING/xblat1c /usr/lib/libblas/
+BLAS/TESTING/xblat2c /usr/lib/libblas/
+BLAS/TESTING/xblat3c /usr/lib/libblas/
+BLAS/TESTING/xblat1d /usr/lib/libblas/
+BLAS/TESTING/xblat2d /usr/lib/libblas/
+BLAS/TESTING/xblat3d /usr/lib/libblas/
+BLAS/TESTING/xblat1s /usr/lib/libblas/
+BLAS/TESTING/xblat2s /usr/lib/libblas/
+BLAS/TESTING/xblat3s /usr/lib/libblas/
+BLAS/TESTING/xblat1z /usr/lib/libblas/
+BLAS/TESTING/xblat2z /usr/lib/libblas/
+BLAS/TESTING/xblat3z /usr/lib/libblas/
+BLAS/TESTING/cblat2.in /usr/lib/libblas/
+BLAS/TESTING/cblat3.in /usr/lib/libblas/
+BLAS/TESTING/dblat2.in /usr/lib/libblas/
+BLAS/TESTING/dblat3.in /usr/lib/libblas/
+BLAS/TESTING/sblat2.in /usr/lib/libblas/
+BLAS/TESTING/sblat3.in /usr/lib/libblas/
+BLAS/TESTING/zblat2.in /usr/lib/libblas/
+BLAS/TESTING/zblat3.in /usr/lib/libblas/
CBLAS/testing/xccblat1 /usr/lib/libblas/
CBLAS/testing/xccblat2 /usr/lib/libblas/
CBLAS/testing/xccblat3 /usr/lib/libblas/
diff --git a/debian/liblapack-pic.install b/debian/liblapack-pic.install
index 9473332..642a54f 100644
--- a/debian/liblapack-pic.install
+++ b/debian/liblapack-pic.install
@@ -1 +1 @@
-liblapack_pic.a usr/lib/lapack/
+pic/liblapack_pic.a usr/lib/lapack/
diff --git a/debian/liblapack-test.install b/debian/liblapack-test.install
index 256ad9d..4be6ae4 100644
--- a/debian/liblapack-test.install
+++ b/debian/liblapack-test.install
@@ -1,16 +1,16 @@
TESTING/*.in usr/lib/lapack/
-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/EIG/xeigtstc usr/lib/lapack/
+TESTING/EIG/xeigtstd usr/lib/lapack/
+TESTING/EIG/xeigtsts usr/lib/lapack/
+TESTING/EIG/xeigtstz usr/lib/lapack/
+TESTING/LIN/xlintstc usr/lib/lapack/
+TESTING/LIN/xlintstd usr/lib/lapack/
+TESTING/LIN/xlintsts usr/lib/lapack/
+TESTING/LIN/xlintstz usr/lib/lapack/
+TESTING/LIN/xlintstds usr/lib/lapack/
+TESTING/LIN/xlintstrfc usr/lib/lapack/
+TESTING/LIN/xlintstrfd usr/lib/lapack/
+TESTING/LIN/xlintstrfs usr/lib/lapack/
+TESTING/LIN/xlintstrfz usr/lib/lapack/
+TESTING/LIN/xlintstzc usr/lib/lapack/
lapack_testing.py usr/lib/lapack/
diff --git a/debian/rules b/debian/rules
index a1a7104..ec49c0e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,9 +2,6 @@
include /usr/share/dpkg/default.mk
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
SO:=3
# xerblas_ and LAPACK_xerblas must be overrideable by applications
@@ -63,8 +60,8 @@ make.inc: INSTALL/make.inc.gfortran
echo "BUILD_DEPRECATED=1" >> $@
override_dh_auto_clean: make.inc
- $(MAKE) cleanall
- rm -rf debian/*_stamp debian/*_results lib*.so*
+ $(MAKE) clean
+ rm -rf debian/*_stamp debian/*_results lib*.so* pic/
rm -rf debian/test/ debian/time/
rm -f TESTING/tmp TESTING/testing_results.txt
rm -f LAPACKE/include/lapacke_mangling.h
@@ -77,33 +74,34 @@ override_dh_auto_clean: make.inc
override_dh_auto_configure: make.inc
# Create lapack-netlib.pc
sed -e "s%@LAPACK_VERSION@%$(DEB_VERSION_UPSTREAM)%" \
- -e "s%@prefix@%/usr%" \
- -e "s%@libdir@%/usr/lib%" < lapack.pc.in > lapack-netlib.pc
+ -e "s%@CMAKE_INSTALL_FULL_INCLUDEDIR@%/usr/include%" \
+ -e "s%@CMAKE_INSTALL_FULL_LIBDIR@%/usr/lib%" < lapack.pc.in > lapack-netlib.pc
# Create lapacke.pc
sed -e "s%@LAPACK_VERSION@%$(DEB_VERSION_UPSTREAM)%" \
- -e "s%@prefix@%/usr%" \
- -e "s%@libdir@%/usr/lib%" < LAPACKE/lapacke.pc.in > LAPACKE/lapacke.pc
+ -e "s%@CMAKE_INSTALL_FULL_INCLUDEDIR@%/usr/include%" \
+ -e "s%@CMAKE_INSTALL_FULL_LIBDIR@%/usr/lib%" < LAPACKE/lapacke.pc.in > LAPACKE/lapacke.pc
# Create blas-netlib.pc
sed -e "s%@LAPACK_VERSION@%$(DEB_VERSION_UPSTREAM)%" \
- -e "s%@prefix@%/usr%" \
- -e "s%@libdir@%/usr/lib%" < BLAS/blas.pc.in > BLAS/blas-netlib.pc
+ -e "s%@CMAKE_INSTALL_FULL_INCLUDEDIR@%/usr/include%" \
+ -e "s%@CMAKE_INSTALL_FULL_LIBDIR@%/usr/lib%" < BLAS/blas.pc.in > BLAS/blas-netlib.pc
override_dh_auto_build-arch:
# Build pic libraries
$(MAKE) cleanlib
$(MAKE) blaslib cblaslib lapacklib tmglib lapackelib PICOPTS=-fPIC
- mv librefblas.a librefblas_pic.a
- mv libcblas.a libcblas_pic.a
- mv liblapack.a liblapack_pic.a
- mv libtmglib.a libtmglib_pic.a
- mv liblapacke.a liblapacke_pic.a
+ mkdir -p pic
+ mv librefblas.a pic/librefblas_pic.a
+ mv libcblas.a pic/libcblas_pic.a
+ mv liblapack.a pic/liblapack_pic.a
+ mv libtmglib.a pic/libtmglib_pic.a
+ mv liblapacke.a pic/liblapacke_pic.a
# Build libblas.so.*
- ar d librefblas_pic.a xerbla.o # We want to use the xerbla.o from libcblas_pic.a
+ ar d pic/librefblas_pic.a xerbla.o # We want to use the xerbla.o from libcblas_pic.a
mkdir -p tmp
- cd tmp && ar x ../librefblas_pic.a && ar x ../libcblas_pic.a
+ cd tmp && ar x ../pic/librefblas_pic.a && ar x ../pic/libcblas_pic.a
$(F77) -shared -Wl,-soname=libblas.so.$(SO) -o libblas.so.$(DEB_VERSION_UPSTREAM) tmp/*.o $(LDFLAGS)
rm -rf tmp
ln -s libblas.so.$(DEB_VERSION_UPSTREAM) libblas.so.$(SO)
@@ -111,7 +109,7 @@ override_dh_auto_build-arch:
# Build liblapack.so.*
mkdir -p tmp
- cd tmp && ar x ../liblapack_pic.a
+ cd tmp && ar x ../pic/liblapack_pic.a
$(F77) -shared -Wl,-soname=liblapack.so.$(SO) -o liblapack.so.$(DEB_VERSION_UPSTREAM) tmp/*.o -L. -lblas $(LDFLAGS)
rm -rf tmp
ln -s liblapack.so.$(DEB_VERSION_UPSTREAM) liblapack.so.$(SO)
@@ -119,7 +117,7 @@ override_dh_auto_build-arch:
# Build libtmglib.so.*
mkdir -p tmp
- cd tmp && ar x ../libtmglib_pic.a
+ cd tmp && ar x ../pic/libtmglib_pic.a
$(F77) -shared -Wl,-soname=libtmglib.so.$(SO) -o libtmglib.so.$(DEB_VERSION_UPSTREAM) tmp/*.o -L. -lblas -llapack $(LDFLAGS)
rm -rf tmp
ln -s libtmglib.so.$(DEB_VERSION_UPSTREAM) libtmglib.so.$(SO)
@@ -127,7 +125,7 @@ override_dh_auto_build-arch:
# Build liblapacke.so.*
mkdir -p tmp
- cd tmp && ar x ../liblapacke_pic.a
+ cd tmp && ar x ../pic/liblapacke_pic.a
$(CC) -shared -Wl,-soname=liblapacke.so.$(SO) -o liblapacke.so.$(DEB_VERSION_UPSTREAM) tmp/*.o -L. -lblas -llapack -ltmglib $(LDFLAGS)
rm -rf tmp
ln -s liblapacke.so.$(DEB_VERSION_UPSTREAM) liblapacke.so.$(SO)
@@ -145,14 +143,12 @@ override_dh_auto_build-arch:
rm -rf tmp
# Build the test programs, in order to avoid FTBFS if DEB_BUILD_OPTIONS contains nocheck
- $(MAKE) OPTS="$(FFLAGS_BLAS_TESTSUITE)" BLASLIB="../../libblas.so" -C BLAS/TESTING -f Makeblat1
- $(MAKE) OPTS="$(FFLAGS_BLAS_TESTSUITE)" BLASLIB="../../libblas.so" -C BLAS/TESTING -f Makeblat2
- $(MAKE) OPTS="$(FFLAGS_BLAS_TESTSUITE)" BLASLIB="../../libblas.so" -C BLAS/TESTING -f Makeblat3
+ $(MAKE) OPTS="$(FFLAGS_BLAS_TESTSUITE)" BLASLIB="../../libblas.so" -C BLAS/TESTING
$(MAKE) OPTS="$(FFLAGS_BLAS_TESTSUITE)" BLASLIB="../../libblas.so" CBLASLIB="" -C CBLAS/testing
- $(MAKE) OPTS="$(FFLAGS_LAPACK_TESTSUITE)" BLASLIB="../../libblas.so" LAPACKLIB="liblapack.so" TMGLIB="libtmglib.so" -C TESTING xeigtstc xeigtstd xeigtsts xeigtstz xlintstc xlintstd xlintsts xlintstz xlintstds xlintstrfc xlintstrfd xlintstrfs xlintstrfz xlintstzc
+ $(MAKE) OPTS="$(FFLAGS_LAPACK_TESTSUITE)" BLASLIB="../../libblas.so" LAPACKLIB="liblapack.so" TMGLIB="libtmglib.so" -C TESTING EIG/xeigtstc EIG/xeigtstd EIG/xeigtsts EIG/xeigtstz LIN/xlintstc LIN/xlintstd LIN/xlintsts LIN/xlintstz LIN/xlintstds LIN/xlintstrfc LIN/xlintstrfd LIN/xlintstrfs LIN/xlintstrfz LIN/xlintstzc
-ifeq (,$(filter nodoc,$(DEB_BUILD_OPTIONS)))
override_dh_auto_build-indep:
+ifeq (,$(filter nodoc,$(DEB_BUILD_OPTIONS)))
$(MAKE) html
# Remove useless doxygen-generated files
find DOCS/explore-html/ \( -name '*.map' -or -name '*.md5' \) -delete
@@ -161,17 +157,14 @@ override_dh_auto_build-indep:
# Remove directory reference files, because they include local build pathnames
# (but don't delete some __*__.3 files)
rm DOCS/man/man3/_[a-zA-Z]*
-else
-override_dh_auto_build-indep:
- mkdir -p DOCS/explore-html DOCS/man/man3
endif
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
override_dh_auto_test-arch:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
# Run BLAS tests, output the result, and stop if one test fails
LD_LIBRARY_PATH=$$(pwd):$$LD_LIBRARY_PATH $(MAKE) blas_testing
- cat BLAS/*.out
- ! grep -q -i fail BLAS/*.out
+ cat BLAS/TESTING/*.out
+ ! grep -q -i fail BLAS/TESTING/*.out
# Run CBLAS tests, output the result, and stop if one test fails
LD_LIBRARY_PATH=$$(pwd):$$LD_LIBRARY_PATH $(MAKE) cblas_testing
@@ -181,9 +174,6 @@ override_dh_auto_test-arch:
# Run LAPACK tests, but don't stop if one test fails
# Only a summary is displayed; full test results in TESTING/testing_results.txt
LD_LIBRARY_PATH=$$(pwd):$$LD_LIBRARY_PATH $(MAKE) lapack_testing
-else
-override_dh_auto_test-arch:
- touch TESTING/testing_results.txt
endif
override_dh_makeshlibs:
@@ -193,6 +183,3 @@ override_dh_makeshlibs:
override_dh_shlibdeps:
dh_shlibdeps -a -l $$(pwd)
-
-override_dh_strip:
- dh_strip --dbgsym-migration='liblapack-dbg (<< 3.6.0-1~)'
--
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