- fix libstemmer detection and build on x32

- rel 2

diff --git a/libstemmer.patch b/libstemmer.patch
new file mode 100644 (file)
index 0000000..8858d5e
--- /dev/null
+++ b/libstemmer.patch
@@ -0,0 +1,11 @@
+--- sphinx-2.2.8-release/acinclude.m4~ 2013-11-12 12:53:36.000000000 +0100
++++ sphinx-2.2.8-release/acinclude.m4  2015-03-15 10:20:29.942336158 +0100
+@@ -322,7 +322,7 @@
+ includedirs="/usr/include /usr/include/libstemmer /usr/include/libstemmer_c"
+ 
+ # possible libdirs -- 64bit first in case of multiarch environments
+-libdirs="/usr/lib/x86_64-linux-gnu /usr/lib64 /usr/local/lib64 /usr/lib/i386-linux-gnu /usr/lib /usr/local/lib"
++libdirs="/usr/libx32 /usr/lib64 /usr/lib"
+ 
+ # possible libnames -- shared one first, then static one
+ libnames="stemmer stemmer_c"

diff --git a/sphinx.spec b/sphinx.spec
index 4f8360bc56a280029dc1e7969d25695434ea1cbf..5225a3145ef9eb8b2245bd05d1c981e651dd9f4e 100644 (file)
--- a/sphinx.spec
+++ b/sphinx.spec
@@ -17,7 +17,7 @@ Summary:      Free open-source SQL full-text search engine
 Summary(pl.UTF-8):     Silnik przeszukiwania pełnotekstowego SQL open-source
 Name:          sphinx
 Version:       2.2.8
-Release:       1
+Release:       2
 License:       GPL v2
 Group:         Applications/Databases
 Source0:       http://www.sphinxsearch.com/files/%{name}-%{version}-release.tar.gz
@@ -27,6 +27,8 @@ Source2:      %{name}.logrotate
 Source3:       %{name}.conf.sh
 Source4:       %{name}.tmpfiles
 Patch0:                bug-468.patch
+Patch1:                libstemmer.patch
+Patch2:                x32.patch
 URL:           http://www.sphinxsearch.com/
 BuildRequires: autoconf
 BuildRequires: automake >= 1:1.12
@@ -160,6 +162,8 @@ API Pythona dla Sphinksa.
 %prep
 %setup -q -n %{name}-%{version}-release
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 sed -i -e 's#AM_MAINTAINER_MODE#AM_MAINTAINER_MODE\nAM_PROG_AR#' configure.ac
 
@@ -171,6 +175,8 @@ sed -i -e '
 ' sphinx*.conf.in
 
 %build
+%{__aclocal}
+%{__autoconf}
 CPPFLAGS=-D_FILE_OFFSET_BITS=64
 %configure \
        --with%{!?with_libstemmer:out}-libstemmer \

diff --git a/x32.patch b/x32.patch
new file mode 100644 (file)
index 0000000..3402515
--- /dev/null
+++ b/x32.patch
@@ -0,0 +1,11 @@
+--- sphinx-2.2.8-release/src/sphinxutils.cpp~  2015-01-20 08:02:07.000000000 +0100
++++ sphinx-2.2.8-release/src/sphinxutils.cpp   2015-03-15 10:30:39.062340287 +0100
+@@ -2011,7 +2011,7 @@
+               __asm __volatile__ ( "movl %%ebp,%0":"=r"(pFramePointer):"r"(pFramePointer) );
+ #endif
+ 
+-#ifdef __x86_64__
++#if defined(__x86_64__) && !defined(__ILP32__)
+ #define SIGRETURN_FRAME_OFFSET 23
+               __asm __volatile__ ( "movq %%rbp,%0":"=r"(pFramePointer):"r"(pFramePointer) );
+ #endif