- fix boost detection on x32

- rel 2

diff --git a/gearmand.spec b/gearmand.spec
index a12bfda3da713ce9d5e88e95eeac8f418c24aab8..5af13bd3465fe950176dfa091447d396a0bea519 100644 (file)
--- a/gearmand.spec
+++ b/gearmand.spec
@@ -25,7 +25,7 @@
 Summary:       A distributed job system
 Name:          gearmand
 Version:       1.1.18
-Release:       1
+Release:       2
 License:       BSD
 Group:         Daemons
 Source0:       https://github.com/gearman/gearmand/archive/%{version}/%{name}-%{version}.tar.gz
@@ -34,6 +34,7 @@ Source1:      %{name}.init
 Source2:       %{name}.sysconfig
 Source3:       %{name}.service
 Patch0:                no-git.patch
+Patch1:                x32.patch
 URL:           http://www.gearman.org
 BuildRequires: autoconf
 BuildRequires: autoconf-archive
@@ -110,6 +111,9 @@ Development headers for %{name}.
 %prep
 %setup -q
 %patch0 -p1
+%ifarch x32
+%patch1 -p1
+%endif
 
 echo "m4_define([VERSION_NUMBER], %{version})" > version.m4
 

diff --git a/x32.patch b/x32.patch
new file mode 100644 (file)
index 0000000..59c1b3e
--- /dev/null
+++ b/x32.patch
@@ -0,0 +1,11 @@
+--- gearmand-1.1.18/m4/ax_boost_base.m4.orig   2017-12-11 15:00:27.000000000 +0100
++++ gearmand-1.1.18/m4/ax_boost_base.m4        2018-03-19 10:55:09.617855982 +0100
+@@ -93,7 +93,7 @@
+     ax_arch=`uname -m`
+     case $ax_arch in
+       x86_64|ppc64|s390x|sparc64|aarch64)
+-        libsubdirs="lib64 lib lib64"
++        libsubdirs="libx32 lib64 lib lib64"
+         ;;
+     esac
+