[silo-llnl] 70/96: Build against qt5. Temp. disable as-needed

[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 d199aa38d57430d28e2d1a407b08459690c5bc48
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Thu May 1 15:03:16 2014 +0100

    Build against qt5. Temp. disable as-needed
---
 debian/changelog |  1 +
 debian/control   |  9 +++++----
 debian/rules     | 34 ++++++++++++++++++++++++----------
 3 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1e147f0..2d983ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ silo-llnl (4.9.1-1) UNRELEASED; urgency=low
   * Patch for typo spotted by Lintian.
   * Add Python3 support
   * Now use xz compression.
+  * Build against Qt5 rather than Qt4.
 
  -- Alastair McKinstry <mckinstry at debian.org>  Wed, 30 Apr 2014 16:48:49 +0100
 
diff --git a/debian/control b/debian/control
index 9ba2085..40fc76e 100644
--- a/debian/control
+++ b/debian/control
@@ -3,12 +3,13 @@ Section: science
 Priority: optional
 Maintainer: Alastair McKinstry <mckinstry at debian.org>
 Build-Depends: debhelper (>= 9), libreadline-dev, libhdf5-mpi-dev | libhdf5-dev, zlib1g-dev, 
-  libqt4-dev (<< 4:4.9~), gfortran, chrpath, python-all-dev, mpi-default-dev, autoconf-archive, autoconf, automake, libtool, 
-  dh-autoreconf (>= 4~), python3-dev, python3-all-dev
-Build-Conflicts: qt3-dev-tools
+  gfortran, chrpath, python-all-dev, mpi-default-dev, autoconf-archive, autoconf, automake, libtool, 
+  dh-autoreconf (>= 4~), python3-dev, python3-all-dev,
+  qbase5-dev
+Build-Conflicts: qt3-dev-tools, qt4-dev-tools
 X-Python-Version: >= 2.6
 X-Python3-Version: >= 3.2
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Homepage:  https://wci.llnl.gov/codes/silo
 
 Package: libsilo-dev
diff --git a/debian/rules b/debian/rules
index b1a0666..e2b75eb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,31 +12,45 @@ include /usr/share/mpi-default-dev/debian_defaults
 MPI_INC=/usr/lib/$(ARCH_DEFAULT_MPI_IMPL)/include
 
 ifeq ($(ARCH_DEFAULT_MPI_IMPL),lam)
-  CC:=mpic++.lam
+  CC:=mpicc.lam
+  CXX:=mpic++.lam
 else
-  CC:=mpic++
+  CXX:=mpic++
+  CC:=mpicc
 endif
 
+# QT version 4 or 5
+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
 override_dh_autoreconf:
 	libtoolize -c -f
-	dh_autoreconf --as-needed
+	dh_autoreconf
 
 override_dh_auto_configure:
-	LDFLAGS="$(LDFLAGS) -Wl,--as-needed" dh_auto_configure -- --enable-pythonmodule --enable-silex --with-qt=/usr --enable-pythonmodule --enable-silex --with-Qt-bin=/usr/bin --with-Qt-include=/usr/include/qt4 --with-hdf5=/usr/include,/usr/lib CPPFLAGS=" -I/usr/include/qt4 -I/usr/include/qt4/QtGui -I/usr/include/qt4/QtCore -I$(MPI_INC) $(CPPFLAGS)"  CC=$(CC)  CFLAGS="$(CFLAGS) -fpermissive"
+	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 " \
+		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:
 	dh_auto_build
 	set -e ; for p in $(PYVERS) ; do   \
-		 LDFLAGS=" -Wl,--as-needed $(LDFLAGS)" dh_auto_configure -- \
-			--enable-pythonmodule --enable-silex \
-			--with-Qt=/usr --with-Qt-bin=/usr/bin --with-Qt-include=/usr/include/qt4 \
-			 --with-hdf5=/usr/include,/usr/lib PYTHON=$$p CPPFLAGS=" -I$(MPI_INC) $(CPPFLAGS)" CC=$(CC)  CFLAGS="$(CFLAGS) -fpermissive" ; 
-		$(MAKE) -C tools/browser CXX=$(CC) ; \
-		$(MAKE) -C tools/python ; \
+		 LDFLAGS="$(LDFLAGS)" dh_auto_configure -- \
+			--enable-pythonmodule --enable-silex --enable-versioned-symbol \
+			--with-hdf5=/usr/include,/usr/lib \
+			--with-Qt=/usr --with-Qt-bin=$(QT_BINDIR) --with-Qt-include=/usr/include/$(QT) \
+			PYTHON=$$p CPPFLAGS=" -I/usr/include/$(QT)/QtWidgets  -I$(MPI_INC) $(CPPFLAGS)" CC=$(CC) CXX=$(CXX)  \
+			CFLAGS="$(CFLAGS) -fPIC" ; \
+		$(MAKE) CC=$(CC) CXX=$(CXX) ;\
+		$(MAKE) -C tools/browser CC=$(CC) CXX=$(CXX) ;\
+		$(MAKE) -C tools/python CC=$(CC) CXX=$(CXX) ; \
 		mkdir -p  debian/tmp/usr/lib/pyshared/$$p ;  \
 		cp tools/python/.libs/Silo.so debian/Silo.so.$$p  ; \
 	done

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