[vtk6] 03/04: Inject -Wl,--as-needed LDFLAGS.
Anton Gladky
gladk at moszumanska.debian.org
Sat May 10 10:49:36 UTC 2014
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository vtk6.
commit 15c0d269875188ce27c5c8572b38a203978008f7
Author: Anton Gladky <gladk at debian.org>
Date: Fri May 9 20:25:12 2014 +0200
Inject -Wl,--as-needed LDFLAGS.
---
debian/rules | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/debian/rules b/debian/rules
index d49b9e0..feb2540 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,8 +7,6 @@ export JAVA_HOME=/usr/lib/jvm/default-java
%:
dh $@ --buildsystem=cmake --builddirectory=$(BUILDDIR) --with python2 --with javahelper --parallel
-export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
-
extra_flags += \
-DCMAKE_VERBOSE_MAKEFILE:BOOL=$(DH_VERBOSE) \
-DBUILD_DOCUMENTATION=ON \
@@ -39,6 +37,11 @@ extra_flags += \
-DMPI_CXX_INCLUDE_PATH="/usr/include/mpi" \
-DVTK_INSTALL_LIBRARY_DIR="/usr/lib/$(DEB_HOST_MULTIARCH)" \
-DVTK_MAKE_INSTANTIATORS=ON \
+ -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed" \
+ -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed" \
+ -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
override_dh_auto_configure:
dh_auto_configure -- $(extra_flags)
@@ -66,7 +69,7 @@ override_dh_auto_install:
mv $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/vtk.jar $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/vtk6.jar
mv $(CURDIR)/debian/build/bin/vtkpython $(CURDIR)/debian/build/bin/vtk6python
sed -i -e "s/FATAL_ERROR/STATUS/g" $(CURDIR)/debian/tmp/usr/lib/cmake/vtk-6.0/VTKTargets.cmake
- sed -i -e "s/FATAL_ERROR/STATUS/g" $(CURDIR)/debian/tmp/usr/lib/cmake/vtk-6.0/VTKTargets-none.cmake
+ #sed -i -e "s/FATAL_ERROR/STATUS/g" $(CURDIR)/debian/tmp/usr/lib/cmake/vtk-6.0/VTKTargets-none.cmake
override_dh_shlibdeps:
dh_shlibdeps -a -l /usr/lib/jvm/default-java/lib
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/vtk6.git
More information about the debian-science-commits
mailing list