[sundials] 02/04: Use native cmake flags to disable RPATHs

[James Tocknell]

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

aragilar-guest pushed a commit to branch master
in repository sundials.

commit 0376efbf6978bec5151a6329c13f68e07a97852e
Author: James Tocknell <aragilar at gmail.com>
Date:   Thu Feb 23 21:41:55 2017 +1100

    Use native cmake flags to disable RPATHs
---
 debian/control |  1 -
 debian/rules   | 62 ++++++++++++++++++++++++----------------------------------
 2 files changed, 26 insertions(+), 37 deletions(-)

diff --git a/debian/control b/debian/control
index 58be03f..f704c52 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,6 @@ Section: libs
 Priority: optional
 Build-Depends: debhelper (>= 10),
                pkg-config,
-               chrpath,
                cmake,
                python,
                gfortran,
diff --git a/debian/rules b/debian/rules
index f18930e..f9cb2cc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,31 +7,32 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+bindnow
 
 DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
-extra_flags +=						\
-   -DCMAKE_Fortran_COMPILER=gfortran			\
-   -DBUILD_SHARED_LIBS:BOOL=ON				\
-   -DBUILD_STATIC_LIBS:BOOL=ON				\
-   -DFCMIX_ENABLE:BOOL=ON				\
-   -DMPI_ENABLE:BOOL=ON					\
-   -DLAPACK_ENABLE:BOOL=ON				\
-							\
-   -DEXAMPLES_ENABLE:BOOL=OFF				\
-   -DEXAMPLES_INSTALL:BOOL=OFF				\
-							\
-   -DOPENMP_ENABLE:BOOL=ON				\
-   -DPTHREAD_ENABLE:BOOL=ON				\
-                                                        \
-   -DKLU_ENABLE:BOOL=ON					\
-   -DKLU_INCLUDE_DIR=/usr/include/suitesparse		\
-   -DKLU_LIBRARY_DIR=/usr/lib/$(DEB_HOST_MULTIARCH)	\
-                                                        \
-   -DPETSC_ENABLE:BOOL=ON				\
-                                                        \
-   -DSUPERLUMT_ENABLE:BOOL=OFF				\
-                                                        \
-   -DHYPRE_ENABLE:BOOL=ON                               \
-   -DHYPRE_INCLUDE_DIR=/usr/include/hypre               \
-   -DHYPRE_LIBRARY='-lHYPRE -lHYPRE_IJ_mv -lHYPRE_utilities -lHYPRE_parcsr_mv -lHYPRE_seq_mv'
+extra_flags += \
+	-DCMAKE_SKIP_BUILD_RPATH:BOOL=ON \
+	-DCMAKE_Fortran_COMPILER=gfortran \
+	-DBUILD_SHARED_LIBS:BOOL=ON \
+	-DBUILD_STATIC_LIBS:BOOL=ON \
+	-DFCMIX_ENABLE:BOOL=ON \
+	-DMPI_ENABLE:BOOL=ON \
+	-DLAPACK_ENABLE:BOOL=ON \
+	\
+	-DEXAMPLES_ENABLE:BOOL=OFF \
+	-DEXAMPLES_INSTALL:BOOL=OFF \
+	\
+	-DOPENMP_ENABLE:BOOL=ON \
+	-DPTHREAD_ENABLE:BOOL=ON \
+	\
+	-DKLU_ENABLE:BOOL=ON \
+	-DKLU_INCLUDE_DIR=/usr/include/suitesparse \
+	-DKLU_LIBRARY_DIR=/usr/lib/$(DEB_HOST_GNU_TYPE) \
+	\
+	-DPETSC_ENABLE:BOOL=ON \
+	\
+	-DSUPERLUMT_ENABLE:BOOL=OFF \
+	\
+	-DHYPRE_ENABLE:BOOL=ON \
+	-DHYPRE_INCLUDE_DIR=/usr/include/hypre \
+	-DHYPRE_LIBRARY='-lHYPRE -lHYPRE_IJ_mv -lHYPRE_utilities -lHYPRE_parcsr_mv -lHYPRE_seq_mv'
 
 BUILDDIR = $(CURDIR)/debian/build
 
@@ -42,17 +43,6 @@ BUILDDIR = $(CURDIR)/debian/build
 override_dh_auto_configure:
 	dh_auto_configure -- $(extra_flags)
 
-override_dh_auto_install:
-	dh_auto_install
-# I strip out all the RPATH/RUNPATH tags from my shared objects. These all point
-# to libraries that actually live in standard locations, so the tags are not
-# needed
-	find debian/tmp/ -name '*.so' -o -name '*.so.*' -exec chrpath -d '{}' \;
-
-#
-#to generate symbols
-#	dpkg-gensymbols -plibsundials-parallel -O
-
 override_dh_compress:
 	dh_compress -Xexamples/
 

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