[atlas] 01/01: shared_libraries.diff: no longer include ATLAS-specific symbols in libblas.so and liblapack.so.

[Sébastien Villemot]

This is an automated email from the git hooks/post-receive script.

sebastien pushed a commit to branch master
in repository atlas.

commit 5094dda9050ff5b02b5d65037e7ec2e3fcf6f1cb
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Wed Jul 16 20:47:40 2014 +0200

    shared_libraries.diff: no longer include ATLAS-specific symbols in libblas.so and liblapack.so.
    
    Rather dynamically link those libraries with libatlas.so. This makes it
    possible to use liblapack.so from ATLAS with a libblas.so coming from somewhere
    else. Thanks to Guillem Jover for suggesting this solution.
    
    Closes: #576972
---
 debian/patches/shared_libraries.diff | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/debian/patches/shared_libraries.diff b/debian/patches/shared_libraries.diff
index 2df7ef9..cbc9263 100644
--- a/debian/patches/shared_libraries.diff
+++ b/debian/patches/shared_libraries.diff
@@ -1,11 +1,12 @@
 Description: Create shared versions of the libraries
 Author: David Evans
-Last-Update: 2013-06-05
+        Sébastien Villemot <sebastien at debian.org>
+Last-Update: 2014-07-16
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/makes/Make.lib
 +++ b/makes/Make.lib
-@@ -33,6 +33,73 @@
+@@ -33,6 +33,79 @@ $(tarnam).tar.bz2 :
  	rm -rf $(ARCH)
  	$(BZIP) --best $(tarnam).tar
  
@@ -60,10 +61,16 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 +atlas/libblas.so.3: atlas/libblas.so.3.0
 +	(cd atlas && ln -sf libblas.so.3.0 libblas.so.3)
 +
-+atlas/libblas.so.3.0: atlas/libblas.a libatlas.so.3.0
-+	ld $(LDFLAGS) -shared -soname libblas.so.3 -o $@ \
-+	   --whole-archive atlas/libblas.a \
-+           --no-whole-archive $(F77SYSLIB) -lm -lc
++atlas/libblas.so.3.0: libf77blas.a libcblas.a libatlas.so.3.0
++	if test -f libptf77blas.a -a -f libptcblas.a; then \
++		ld $(LDFLAGS) -shared -soname libblas.so.3 -o $@ \
++		   --whole-archive libptf77blas.a libptcblas.a \
++	           --no-whole-archive -L. -latlas $(F77SYSLIB) -lm -lc; \
++	else \
++		ld $(LDFLAGS) -shared -soname libblas.so.3 -o $@ \
++		   --whole-archive libf77blas.a libcblas.a \
++	           --no-whole-archive -L. -latlas $(F77SYSLIB) -lm -lc; \
++	fi
 +
 +atlas/liblapack.so: atlas/liblapack.so.3
 +	(cd atlas && ln -sf liblapack.so.3 liblapack.so)
@@ -71,17 +78,17 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 +atlas/liblapack.so.3: atlas/liblapack.so.3.0
 +	(cd atlas && ln -sf liblapack.so.3.0 liblapack.so.3)
 +
-+atlas/liblapack.so.3.0: atlas/liblapack.a atlas/libblas.so
++atlas/liblapack.so.3.0: atlas/liblapack.a atlas/libblas.so libatlas.so.3.0
 +	ld $(LDFLAGS) -shared -soname liblapack.so.3 -o $@ \
 +	   --whole-archive atlas/liblapack.a \
-+           --no-whole-archive -L . -lblas $(F77SYSLIB) -lm -lc
++           --no-whole-archive -L . -lblas -latlas $(F77SYSLIB) -lm -lc
 +
  # ===================================================================
  # The following commands are to build dynamic/shared objects on Linux
  # using the gnu gcc or ld
 --- a/Make.top
 +++ b/Make.top
-@@ -16,6 +16,7 @@
+@@ -16,6 +16,7 @@ build:
  	cd bin/ ; ./xatlas_build $(INSTFLAGS)
  	cd lib/ ; $(MAKE) atlas/libblas.a
  	cd lib/ ; $(MAKE) atlas/liblapack.a
@@ -89,7 +96,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
  time: 
  	./xatlbench -dc $(BLDdir)/bin/INSTALL_LOG -dp $(BLDdir)/ARCHS/$(ARCH)
-@@ -683,3 +684,21 @@
+@@ -683,3 +684,21 @@ install_static_lib:
  	- cp $(LIBdir)/libsatlas.so $(INSTdir)/.
  	- cp $(LIBdir)/libtatlas.so $(INSTdir)/.
  
@@ -113,7 +120,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 +	done;
 --- a/CONFIG/src/Makefile
 +++ b/CONFIG/src/Makefile
-@@ -576,6 +576,7 @@
+@@ -576,6 +576,7 @@ $(LIBINSTdir) :
  install : $(INCINSTdir) $(LIBINSTdir) $(INCINSTdir)/atlas
  	$(MAKE) -f Make.top install_inc INSTdir=$(INCINSTdir) 
  	$(MAKE) -f Make.top install_static_lib INSTdir=$(LIBINSTdir)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/atlas.git