[silo-llnl] 72/96: CXXFLAGS needs -fPIC too

[Alastair McKinstry]

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

mckinstry pushed a commit to branch debian/master
in repository silo-llnl.

commit a7d830ad9af2e6c558457aa0e0f6ac5e2045b6e6
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Thu May 1 15:25:14 2014 +0100

    CXXFLAGS needs -fPIC too
---
 debian/rules | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/debian/rules b/debian/rules
index 1aff8b6..5da7d71 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,18 +25,23 @@ QT:=qt5
 PYVERS:= `pyversions -s`
 PY3VERS:= `py3versions -s`
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-
 QT_BINDIR=/usr/lib/$(DEB_HOST_MULTIARCH)/bin
+LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
+
 override_dh_autoreconf:
 	libtoolize -c -f
 	dh_autoreconf
 
+# Note: Since QT headers now include C++ features, configure must be called with g++ as the C compiler.
+# But use $(CC) as the C compiler later when actually building.
+# -Wl,--as-needed removed from LDFLAGS for the moment.
+
 override_dh_auto_configure:
 	LDFLAGS="$(LDFLAGS)" dh_auto_configure -- \
 		--enable-versioned-symbol --enable-silex --enable-pythonmodule \
 		--with-hdf5=/usr/include,/usr/lib \
 		--with-Qt-bin=$(QT_BINDIR) --with-Qt-include=/usr/include/$(QT) \
-		CC=$(CXX) CXX=$(CXX) CFLAGS="$(CFLAGS) -fPIC " \
+		CC=$(CXX) CXX=$(CXX) CFLAGS="$(CFLAGS) -fPIC " CXXFLAGS="$(CXXFLAGS) -fPIC " \
 		CPPFLAGS=" -I/usr/include/$(QT) -I/usr/include/$(QT)/QtGui -I/usr/include/$(QT)/QtCore -I/usr/include/$(QT)/QtWidgets -I$(MPI_INC) $(CPPFLAGS)"  
 
 override_dh_auto_build:
@@ -55,10 +60,10 @@ override_dh_auto_install:
 		chrpath -d debian/Silo.so.$$p ; \
 		cp debian/Silo.so.$$p debian/python-silo/usr/lib/$$p/site-packages/Silo.so ; \
 	done
-	dh_link -p libsiloh5-0 /usr/lib/${DEB_HOST_MULTIARCH}/libsiloh5.so.0.0.0 /usr/lib/${DEB_HOST_MULTIARCH}/libsiloh5.so.0
-	dh_link -p libsilo-dev /usr/lib/${DEB_HOST_MULTIARCH}/libsiloh5.so.0.0.0 /usr/lib/${DEB_HOST_MULTIARCH}/libsiloh5.so
-	mkdir -p debian/libsilo-dev/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig
-	cp silo.pc debian/libsilo-dev/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig
+	dh_link -p libsiloh5-0 $(LIBDIR)/libsiloh5.so.0.0.0 $(LIBDIR)/libsiloh5.so.0
+	dh_link -p libsilo-dev $(LIBDIR)/libsiloh5.so.0.0.0 $(LIBDIR)/libsiloh5.so
+	mkdir -p debian/libsilo-dev/$(LIBDIR)/pkgconfig
+	cp silo.pc debian/libsilo-dev/$(LIBDIR)/pkgconfig
 
 override_dh_auto_clean:
 	dh_clean

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