[atlas] 04/08: Use configure's --shared instead of manually adding -fPIC.

[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 a71c965c0bc2d7dc74b4ff59b5b967ef223f527a
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Thu Aug 3 11:29:22 2017 +0200

    Use configure's --shared instead of manually adding -fPIC.
    
    Gbp-Dch: Ignore
---
 debian/rules | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/rules b/debian/rules
index 6ba0150..b6db7a7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,6 +18,7 @@ GFORTRAN_LIB_PATH := $(shell $(CC) -print-search-dirs | grep ^install: | awk '{p
 CONFIGURE_FLAGS := --prefix="$(CURDIR)/debian/tmp"			 	\
 	--incdir="$(CURDIR)/debian/tmp/usr/include/"				\
 	--libdir="$(CURDIR)/debian/tmp/usr/lib/atlas-base/"			\
+	--shared								\
 	-D c -DWALL 								\
 	-Ss f77lib "-L$(GFORTRAN_LIB_PATH) -lgfortran -lgcc_s -lpthread"	\
 	-Ss pmake '$(PMAKE)'							\
@@ -79,17 +80,15 @@ CONFIGURE_FLAGS +=	 					\
 	--cc="$(CC)" 						\
 	--cflags="$(CPPFLAGS) $(CFLAGS)"			\
 	-C acg gcc						\
-	-F acg "$(CPPFLAGS) $(CFLAGS) -fPIC"			\
+	-F acg "$(CPPFLAGS) $(CFLAGS)"				\
 	-C if gfortran						\
-	-F if "$(FFLAGS) -fPIC"					\
+	-F if "$(FFLAGS)"					\
 	-Ss ADdir ../../debian/archdefs/$(DEB_HOST_ARCH_CPU)	\
 	--cripple-atlas-performance
 
 else
 # Flags specific to the custom package
 
-CONFIGURE_FLAGS += -Fa alg '-fPIC'
-
 # Uncomment the following if the ATLAS build system still complains after you
 # have set all the CPU governors to "performance"
 #CONFIGURE_FLAGS += --cripple-atlas-performance
@@ -124,6 +123,8 @@ override_dh_auto_test:
 override_dh_auto_install:
 	make -C build install # The build system does not support setting DESTDIR at install time
 	mv debian/tmp/usr/include/*.h debian/tmp/usr/include/atlas/
+	# Do not ship the *.so created by ATLAS build system, they have an incorrect SONAME
+	rm -f debian/tmp/usr/lib/atlas-base/libsatlas.so debian/tmp/usr/lib/atlas-base/libtatlas.so
 
 # We want packages using libblas/liblapack to depend on any BLAS/LAPACK
 # alternative, and we want packages depending on ATLAS-specific libraries

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