From 05f08d5148e4df8c5bed13023824f030efebf26e Mon Sep 17 00:00:00 2001
From: Martin Schwenke <martin@meltin.net>
Date: Tue, 2 Sep 2014 16:18:01 +1000
Subject: [PATCH] ctdb-build: Don't try to set lib64 directory automatically in
 build

Just install into lib/ and let packagers decide on this policy, since
it can vary between distributions.  Update our packaging files
accordingly.

A secondary matter is that things are incorrectly installed into
lib64/ when building with 32-bit userspace on a 64-bit kernel.  If
this is done then it should depend on the architecture of the
compiler.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
---
 ctdb/configure.rpm              | 8 ++++++++
 ctdb/packaging/RPM/ctdb.spec.in | 1 +
 ctdb/wscript                    | 4 ----
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ctdb/configure.rpm b/ctdb/configure.rpm
index 9cecb86e046..32e6673d310 100755
--- a/ctdb/configure.rpm
+++ b/ctdb/configure.rpm
@@ -1,9 +1,17 @@
+#!/bin/sh
+
+if gcc -dM -E - </dev/null | grep -Eq '__(x86_64|powerpc64)__' ; then
+	_libdir=/usr/lib64
+else
+	_libdir=/usr/lib
+fi
 
 CFLAGS="-Wall -g -D_GNU_SOURCE" ./configure \
 	--builtin-libraries=replace,popt \
 	--bundled-libraries=!talloc,!tevent,!tdb \
 	--minimum-library-version=talloc:2.0.8,tdb:1.2.11,tevent:0.9.16 \
 	--prefix=/usr \
+	--libdir=${_libdir} \
 	--sysconfdir=/etc \
 	--mandir=/usr/man \
 	--localstatedir=/var \
diff --git a/ctdb/packaging/RPM/ctdb.spec.in b/ctdb/packaging/RPM/ctdb.spec.in
index d7adb59653e..101a7133c24 100644
--- a/ctdb/packaging/RPM/ctdb.spec.in
+++ b/ctdb/packaging/RPM/ctdb.spec.in
@@ -95,6 +95,7 @@ CFLAGS="$RPM_OPT_FLAGS $EXTRA -D_GNU_SOURCE" ./buildtools/bin/waf configure \
 	--enable-pmda \
 %endif
 	--prefix=%{_prefix} \
+	--libdir=%{_libdir} \
 	--sysconfdir=%{_sysconfdir} \
 	--mandir=%{_mandir} \
 	--localstatedir="/var"
diff --git a/ctdb/wscript b/ctdb/wscript
index 3ced41612fb..d185e7135a6 100755
--- a/ctdb/wscript
+++ b/ctdb/wscript
@@ -125,10 +125,6 @@ def configure(conf):
     conf.env.CTDB_VARDIR = os.path.join(conf.env.LOCALSTATEDIR, 'lib/ctdb')
     conf.env.CTDB_RUNDIR = os.path.join(conf.env.LOCALSTATEDIR, 'run/ctdb')
 
-    machine = os.uname()[4]
-    if machine in ['x86_64', 'ppc64', 'powerpc64']:
-        conf.env.LIBDIR = conf.env.LIBDIR + '64'
-
     if Options.options.ctdb_logdir:
         conf.env.CTDB_LOGDIR = Options.options.ctdb_logdir
     else:
-- 
2.11.4.GIT