[Debian-ha-commits] [pacemaker] 52/69: New patch Don-t-override-a-libdir-containing.patch

[Christoph Berg]

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

myon pushed a commit to branch debian/master
in repository pacemaker.

commit 286053ecb4ee720fb8ad7dab6acdfc0fd9966e79
Author: Ferenc Wágner <wferi at niif.hu>
Date:   Sat Jan 9 20:00:55 2016 +0100

    New patch Don-t-override-a-libdir-containing.patch
    
    Don't override a libdir containing $prefix.  Specifying libdir manually
    required substantial code in debian/rules, which can go now.
---
 .../Don-t-override-a-libdir-containing.patch        | 21 +++++++++++++++++++++
 debian/patches/series                               |  1 +
 debian/rules                                        |  8 +-------
 3 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/debian/patches/Don-t-override-a-libdir-containing.patch b/debian/patches/Don-t-override-a-libdir-containing.patch
new file mode 100644
index 0000000..8913e0d
--- /dev/null
+++ b/debian/patches/Don-t-override-a-libdir-containing.patch
@@ -0,0 +1,21 @@
+From: =?utf-8?q?Ferenc_W=C3=A1gner?= <wferi at niif.hu>
+Date: Sat, 9 Jan 2016 19:57:35 +0100
+Subject: Don't override a libdir containing
+
+---
+ configure.ac |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index b9a863a..1d1dc3d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -378,7 +378,7 @@ AC_SUBST(INITDIR)
+ AC_MSG_NOTICE(Sanitizing libdir: ${libdir})
+ case $libdir in
+   dnl For consistency with Heartbeat, map NONE->$prefix
+-  *prefix*|NONE)
++  prefix|NONE)
+     AC_MSG_CHECKING(which lib directory to use)
+     for aDir in lib64 lib
+     do
diff --git a/debian/patches/series b/debian/patches/series
index 0299125..933152e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ Synchronize-the-provided-name-with-the-filename.patch
 Add-description-to-the-pacemaker_remote-RA-for-prope.patch
 Restarting-pacemaker-adds-confusion-only.patch
 Enable-redirecting-etc-init.d-script-calls-to-system.patch
+Don-t-override-a-libdir-containing.patch
diff --git a/debian/rules b/debian/rules
index c598508..481b4c6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,10 +11,6 @@ export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs
 # Avoid useless dependencies in the utilities
 export DEB_LDFLAGS_MAINT_APPEND+=-Wl,--as-needed
 
-# Below we specify --libdir without ${prefix} to stop configure "sanitizing"
-# it to /usr/lib.  This is a workaround for an upstream bug.
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-
 %:
 	dh $@ --with autoreconf,systemd
 
@@ -24,9 +20,7 @@ override_dh_autoreconf:
 	dh_autoreconf --as-needed autoreconf -- -vif -Wno-portability
 
 override_dh_auto_configure:
-	dh_auto_configure -- \
-	    --disable-static \
-	    --libdir=/usr/lib/$(DEB_HOST_MULTIARCH)
+	dh_auto_configure -- --disable-static
 
 override_dh_auto_build:
 	dh_auto_build

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/pacemaker.git