[lapack] 03/10: Package tmglib.

Sébastien Villemot sebastien at debian.org
Sat Oct 31 22:23:42 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 2db0c33a2e0a70ab58e43a7c79667ca1a94bb9ae
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Sat Oct 31 00:51:15 2015 +0100

    Package tmglib.
    
    + new libtmglib3 and libtmglib-dev packages.
    + now include libtmglib wrappers in lapacke. In particular, drop
      d/p/lapacke_no_matgen.patch.
    
    Closes: #772196
    Gbp-Dch: Full
---
 .gitignore                             |  6 ++++++
 debian/control                         | 23 +++++++++++++++++++++-
 debian/libtmglib-dev.install           |  2 ++
 debian/libtmglib3.install              |  2 ++
 debian/patches/lapacke_no_matgen.patch | 20 -------------------
 debian/patches/series                  |  1 -
 debian/rules                           | 35 +++++++++++++++++++++++++++++++---
 7 files changed, 64 insertions(+), 25 deletions(-)

diff --git a/.gitignore b/.gitignore
index fa39819..7d51a34 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,6 +35,12 @@ debian/liblapack-doc/
 debian/liblapack3gf.debhelper.log
 debian/liblapack3gf.substvars
 debian/liblapack3gf/
+debian/libtmglib-dev.debhelper.log
+debian/libtmglib-dev.substvars
+debian/libtmglib-dev/
+debian/libtmglib3.debhelper.log
+debian/libtmglib3.substvars
+debian/libtmglib3/
 lapack-netlib.pc
 DOCS/explore-html/
 DOCS/man/
diff --git a/debian/control b/debian/control
index e652441..ab3b905 100644
--- a/debian/control
+++ b/debian/control
@@ -56,7 +56,7 @@ Package: liblapacke-dev
 Section: libdevel
 Architecture: any
 Depends: ${misc:Depends}, liblapacke (= ${binary:Version}), libblas-dev | libblas.so,
-         liblapack-dev | liblapack.so
+         liblapack-dev | liblapack.so, libtmglib-dev
 Description: Library of linear algebra routines 3 - Headers
  LAPACK version 3.X is a comprehensive FORTRAN library that does
  linear algebra operations including matrix inversions, least
@@ -67,6 +67,27 @@ Description: Library of linear algebra routines 3 - Headers
  .
  This package contains the Standard C language headers for LAPACK.
 
+Package: libtmglib3
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: test matrix generators of LAPACK - shared version
+ libtmglib is a component of the LAPACK library, containing routines for
+ generation of input matrices for testing and timing of LAPACK.
+ .
+ This package contains a shared version of the library.
+
+Package: libtmglib-dev
+Section: libdevel
+Architecture: any
+Depends: ${misc:Depends}, libtmglib3 (= ${binary:Version}), libblas-dev | libblas.so,
+         liblapack-dev | liblapack.so
+Description: test matrix generators of LAPACK - development files
+ libtmglib is a component of the LAPACK library, containing routines for
+ generation of input matrices for testing and timing of LAPACK.
+ .
+ This package contains development files, including a static version of the
+ library.
+
 Package: liblapack-dev
 Section: libdevel
 Architecture: any
diff --git a/debian/libtmglib-dev.install b/debian/libtmglib-dev.install
new file mode 100644
index 0000000..5d024f5
--- /dev/null
+++ b/debian/libtmglib-dev.install
@@ -0,0 +1,2 @@
+libtmglib.a usr/lib/
+libtmglib.so usr/lib/
diff --git a/debian/libtmglib3.install b/debian/libtmglib3.install
new file mode 100644
index 0000000..bf78682
--- /dev/null
+++ b/debian/libtmglib3.install
@@ -0,0 +1,2 @@
+libtmglib.so.3.0 usr/lib/
+libtmglib.so.3 usr/lib/
diff --git a/debian/patches/lapacke_no_matgen.patch b/debian/patches/lapacke_no_matgen.patch
deleted file mode 100644
index fd3621e..0000000
--- a/debian/patches/lapacke_no_matgen.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Do not include wrappers for MATGEN functions in liblapacke
- These functions are not shipped with liblapack. Including wrappers to them in
- liblapacke makes that shared library unusable.
-Author: Sébastien Villemot <sebastien at debian.org>
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=680428
-Forwarded: not-needed
-Last-Update: 2012-07-06
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/lapacke/src/Makefile
-+++ b/lapacke/src/Makefile
-@@ -2061,7 +2061,7 @@
- lapacke_zlagsy.o \
- lapacke_zlagsy_work.o
- 
--ALLOBJ = $(SRC_OBJ) $(MATGEN_OBJ) 
-+ALLOBJ = $(SRC_OBJ)
- 
- ifdef USEXBLAS
- ALLXOBJ = $(SXLASRC) $(DXLASRC) $(CXLASRC) $(ZXLASRC)
diff --git a/debian/patches/series b/debian/patches/series
index ee7a626..f35140e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 lapack_testing.patch
 no_blas_manpages.patch
-lapacke_no_matgen.patch
 decouple_gcc.diff
 parallel_build.patch
 doxygen-exclude-binary-objects.patch
diff --git a/debian/rules b/debian/rules
index 64ad38f..510fb60 100755
--- a/debian/rules
+++ b/debian/rules
@@ -93,6 +93,32 @@ liblapack.a: make.inc
 	$(MAKE) lapack_install
 	$(MAKE) lib
 
+libtmglib_pic.a: make.inc
+	echo "Building libtmglib_pic.a"
+	cd TESTING/MATGEN; \
+	$(MAKE) clean; \
+	$(MAKE) PICOPTS=-fPIC
+	mv libtmglib.a $@
+
+libtmglib.so.$(VERS): libtmglib_pic.a
+	echo "Building libtmglib.so.$(VERS) from libtmglib_pic.a"
+	mkdir -p tmp
+	cd tmp && ar x ../$<
+	$(F77) -shared -Wl,-soname=libtmglib.so.$(SO) -o $@ tmp/*.o  -L. -lblas -llapack $(LDFLAGS)
+	rm -rf tmp
+
+libtmglib.so.$(SO): libtmglib.so.$(VERS)
+	ln -snf $< $@
+
+libtmglib.so: libtmglib.so.$(SO)
+	ln -snf $< $@
+
+libtmglib.a: make.inc
+	echo "Building libtmglib.a"
+	cd TESTING/MATGEN; \
+	$(MAKE) clean; \
+	$(MAKE)
+
 lapacke/liblapacke_pic.a: make.inc
 	echo "Building liblapacke_pic.a"
 	cd lapacke; \
@@ -105,7 +131,7 @@ lapacke/liblapacke.so.$(VERS): lapacke/liblapacke_pic.a
 	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 $(LDFLAGS); \
+	$(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.$(VERS)
@@ -151,13 +177,16 @@ override_dh_auto_clean: make.inc
 	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/
 	rm -f output_err
 	rm -f make.inc lapack-netlib.pc
 
-# liblapack_pic.a must come before liblapack.a, otherwise the latter will be overwritten
+# liblapack_pic.a must come before liblapack.a, otherwise the latter will be overwritten.
+# 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 lapacke/liblapacke_pic.a lapacke/liblapacke.a lapacke/liblapacke.so lapack-netlib.pc
+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

-- 
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