[ompl] 03/03: Add patch to correct pkgconfig for multiarch library path

[Wookey]

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

wookey pushed a commit to branch master
in repository ompl.

commit 0630b3960870a6ec37e2ce42470eb5f63384a5a4
Author: Wookey <wookey at wookware.org>
Date:   Wed Oct 21 16:59:47 2015 +0100

    Add patch to correct pkgconfig for multiarch library path
---
 debian/patches/0002-Fixup-pkgconfig-for-multiarch.patch | 13 +++++++++++++
 debian/patches/series                                   |  1 +
 debian/rules                                            |  2 ++
 3 files changed, 16 insertions(+)

diff --git a/debian/patches/0002-Fixup-pkgconfig-for-multiarch.patch b/debian/patches/0002-Fixup-pkgconfig-for-multiarch.patch
new file mode 100644
index 0000000..a224022
--- /dev/null
+++ b/debian/patches/0002-Fixup-pkgconfig-for-multiarch.patch
@@ -0,0 +1,13 @@
+Index: git/CMakeModules/ompl.pc.in
+===================================================================
+--- git.orig/CMakeModules/ompl.pc.in
++++ git/CMakeModules/ompl.pc.in
+@@ -1,7 +1,7 @@
+ # This file was generated by CMake for @PROJECT_NAME@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=${prefix}
+-libdir=${prefix}/lib
++libdir=${prefix}/lib/@CMAKE_LIBRARY_ARCHITECTURE@
+ includedir=${prefix}/include
+ 
+ Name: @PKG_NAME@
diff --git a/debian/patches/series b/debian/patches/series
index 22a5d82..e898a7f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-Disabling-installPyPlusPlus.sh-stuff.patch
+0002-Fixup-pkgconfig-for-multiarch.patch
diff --git a/debian/rules b/debian/rules
index da570f1..8c03ebe 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,7 @@ CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS) $(CPPFLAGS)
 LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
 
 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 DEB_BUILD_OPTIONS += nocheck
 
 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
@@ -21,6 +22,7 @@ endif
 
 CMAKE_FLAGS = \
         -DCMAKE_INSTALL_PREFIX=/usr \
+        -DCMAKE_LIBRARY_ARCHITECTURE="$(DEB_HOST_MULTIARCH)" \
         -DCMAKE_VERBOSE_MAKEFILE=ON \
         -DCMAKE_C_FLAGS_RELEASE="$(CFLAGS)" \
         -DCMAKE_CXX_FLAGS_RELEASE="$(CXXFLAGS)" \

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