[SCM] OCE packaging branch, debian, updated. debian/0.10-2
Denis Barbier
bouzim at gmail.com
Wed Aug 1 08:42:28 UTC 2012
The following commit has been merged in the debian branch:
commit a5ce2a0b84377d4a08b49d30e770a54a1c8731cf
Author: Denis Barbier <bouzim at gmail.com>
Date: Wed Aug 1 10:43:01 2012 +0200
Add multiarch dirs to CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
This is needed until #683484 is fixed, otherwise RPATH contains
/usr/lib/<triplet>.
diff --git a/debian/rules b/debian/rules
index b665055..5ffa0d7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,6 +18,7 @@ override_dh_auto_configure:
-DOCE_INSTALL_CMAKE_DATA_DIR:PATH=lib/$(DEB_HOST_MULTIARCH)/oce-0.10 \
-DOCE_DRAW:BOOL=ON \
-DOCE_RPATH_FILTER_SYSTEM_PATHS:BOOL=ON \
+ -DCMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES:STRING='/lib/$(DEB_HOST_MULTIARCH);/usr/lib/$(DEB_HOST_MULTIARCH)' \
-DCMAKE_C_FLAGS_RELEASE:STRING='$(CFLAGS)' \
-DCMAKE_CXX_FLAGS_RELEASE:STRING='$(CXXFLAGS)' \
-DCMAKE_SHARED_LINKER_FLAGS_RELEASE:STRING='$(LDFLAGS)' \
--
OCE packaging
More information about the debian-science-commits
mailing list