[packages/sphinx] - up to 2.0.6
arekm
arekm at pld-linux.org
Wed Jan 30 08:39:28 CET 2013
commit 4b8af78f38e021f6e8922a0381958fcbc20f90c7
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Wed Jan 30 08:39:21 2013 +0100
- up to 2.0.6
sphinx-system-libstemmer.patch | 175 -----------------------------------------
1 file changed, 175 deletions(-)
---
diff --git a/sphinx-system-libstemmer.patch b/sphinx-system-libstemmer.patch
deleted file mode 100644
index f4c5d7d..0000000
--- a/sphinx-system-libstemmer.patch
+++ /dev/null
@@ -1,175 +0,0 @@
-diff -burN sphinx-0.9.8.orig/acinclude.m4 sphinx-0.9.8/acinclude.m4
---- sphinx-0.9.8.orig/acinclude.m4 2008-08-03 02:22:01.000000000 +0200
-+++ sphinx-0.9.8/acinclude.m4 2008-08-05 03:57:54.000000000 +0200
-@@ -254,6 +254,83 @@
- ])
-
- dnl ---------------------------------------------------------------------------
-+dnl Macro: AC_CHECK_LIBSTEMMER
-+dnl Author: Adam Golebiowski <adamg at pld-linux.org>
-+dnl First check for custom libstemmer include path in --with-libstemmer=* option
-+dnl If not given, try to guess.
-+dnl ---------------------------------------------------------------------------
-+
-+AC_DEFUN([AC_CHECK_LIBSTEMMER],[
-+
-+# cflags and libs
-+LIBSTEMMER_CFLAGS=
-+LIBSTEMMER_LIBS=
-+
-+# possible includedir paths
-+includedirs="/usr/include /usr/include/libstemmer /usr/include/libstemmer_c"
-+
-+# possible libdirs -- 64bit first in case of multiarch environments
-+libdirs="/usr/lib64 /usr/local/lib64 /usr/lib /usr/local/lib"
-+
-+# possible libnames -- shared one first, then static one
-+libnames="stemmer stemmer_c"
-+
-+# was (include) path explicitely given?
-+if test [ -n "$ac_cv_use_libstemmer" -a x$ac_cv_use_libstemmer != xyes ]; then
-+ includedirs=$ac_cv_use_libstemmer
-+fi
-+
-+# try to find header files
-+for includedir in $includedirs
-+do
-+ if test [ -f $includedir/libstemmer.h ]; then
-+ LIBSTEMMER_CFLAGS="-I$includedir"
-+ break
-+ fi
-+done
-+
-+# try to find shared library
-+for libname in $libnames
-+do
-+ for libdir in $libdirs
-+ do
-+ if test [ -f $libdir/lib${libname}.so ]; then
-+ LIBSTEMMER_LIBS="-L$libdir -l$libname"
-+ break 2
-+ fi
-+ done
-+done
-+
-+# if not found, check static libs
-+if test [ -z "$LIBSTEMMER_LIBS" ]; then
-+ for libname in $libnames
-+ do
-+ for libdir in $libdirs
-+ do
-+ if test [ -f $libdir/lib${libname}.a ]; then
-+ LIBSTEMMER_LIBS="$libdir/lib${libname}.a"
-+ break 2
-+ fi
-+ done
-+ done
-+fi
-+
-+# if LIBSTEMMER_LIBS is not set at this moment,
-+# our last chance is to check for existance of internal copy of libstemmer_c
-+# in case it doesn't exist -- we lost
-+if test [ -z "$LIBSTEMMER_LIBS" ]; then
-+ if test [ -d ./libstemmer_c ]; then
-+ ac_cv_use_internal_libstemmer=1
-+ LIBSTEMMER_LIBS="\$(top_srcdir)/libstemmer_c/libstemmer.a"
-+ LIBSTEMMER_CFLAGS="-I\$(top_srcdir)/libstemmer_c/include"
-+ else
-+ AC_MSG_ERROR([not found])
-+ fi
-+fi
-+
-+])
-+
-+dnl ---------------------------------------------------------------------------
- dnl Macro: SPHINX_CONFIGURE_PART
- dnl
- dnl Tells what stage is ./configure running now, nicely formatted
-diff -burN sphinx-0.9.8.orig/configure.ac sphinx-0.9.8/configure.ac
---- sphinx-0.9.8.orig/configure.ac 2008-08-03 02:22:01.000000000 +0200
-+++ sphinx-0.9.8/configure.ac 2008-08-05 03:26:57.000000000 +0200
-@@ -142,9 +142,6 @@
- AM_CONDITIONAL(USE_PGSQL, test x$ac_cv_use_pgsql != xno)
-
-
--# we can now set preprocessor flags for both C and C++ compilers
--CPPFLAGS="$CPPFLAGS $MYSQL_CFLAGS $PGSQL_CFLAGS"
--
- dnl ---
-
- AC_MSG_CHECKING([whether to use 64-bit document/word IDs])
-@@ -169,22 +166,25 @@
-
- AC_MSG_CHECKING([whether to compile with libstemmer support])
- if test x$ac_cv_use_libstemmer != xno; then
-- if test -d libstemmer_c && test -f libstemmer_c/include/libstemmer.h; then
-+ ac_cv_use_internal_libstemmer=0
- AC_MSG_RESULT([yes])
-- AC_DEFINE(USE_LIBSTEMMER, 1, [libstemmer support])
-- else
-- AC_MSG_ERROR([missing libstemmer sources from libstemmer_c.
--
--Please download the C version of libstemmer library from
--http://snowball.tartarus.org/ and extract its sources over libstemmer_c/
--subdirectory in order to build Sphinx with libstemmer support.
--])
-- fi
-+ AC_CHECK_LIBSTEMMER([$ac_cv_use_listemmer])
-+ AC_DEFINE(USE_LIBSTEMMER, 1, [Define to 1 if you want to compile with libstemmer support])
-+ AC_DEFINE(USE_INTERNAL_LIBSTEMMER, $ac_cv_use_internal_libstemmer, [Define to 1 if you want to compile with internal libstemmer library])
-+ AC_SUBST([LIBSTEMMER_LIBS])
-+ AC_SUBST([LIBSTEMMER_CFLAGS])
- else
- AC_MSG_RESULT([no])
-- AC_DEFINE(USE_LIBSTEMMER, 0, [libstemmer support])
- fi
- AM_CONDITIONAL(USE_LIBSTEMMER, test x$ac_cv_use_libstemmer != xno)
-+AM_CONDITIONAL(USE_INTERNAL_LIBSTEMMER, test x$ac_cv_use_internal_libstemmer != x0)
-+
-+AM_PROG_AR
-+
-+dnl ---
-+
-+# we can now set preprocessor flags for both C and C++ compilers
-+CPPFLAGS="$CPPFLAGS $MYSQL_CFLAGS $PGSQL_CFLAGS $LIBSTEMMER_CFLAGS"
-
- dnl ---
-
-diff -burN sphinx-0.9.8.orig/Makefile.am sphinx-0.9.8/Makefile.am
---- sphinx-0.9.8.orig/Makefile.am 2008-08-03 02:22:01.000000000 +0200
-+++ sphinx-0.9.8/Makefile.am 2008-08-03 02:56:01.000000000 +0200
-@@ -1,4 +1,4 @@
--if USE_LIBSTEMMER
-+if USE_INTERNAL_LIBSTEMMER
- SUBDIRS = libstemmer_c src test doc
- else
- SUBDIRS = src test doc
-diff -burN sphinx-0.9.8.orig/src/Makefile.am sphinx-0.9.8/src/Makefile.am
---- sphinx-0.9.8.orig/src/Makefile.am 2008-08-03 02:22:01.000000000 +0200
-+++ sphinx-0.9.8/src/Makefile.am 2008-08-03 12:32:28.000000000 +0200
-@@ -21,13 +21,7 @@
- extract-version:
- /bin/sh svnxrev.sh ..
-
--if USE_LIBSTEMMER
--LIBSTEMMER_LIBS = $(top_srcdir)/libstemmer_c/libstemmer.a
--AM_CPPFLAGS = -I$(top_srcdir)/libstemmer_c/include -DSYSCONFDIR="\"$(sysconfdir)\"" -DDATADIR="\"$(localstatedir)/data\""
--else
--LIBSTEMMER_LIBS =
- AM_CPPFLAGS = -DSYSCONFDIR="\"$(sysconfdir)\"" -DDATADIR="\"$(localstatedir)/data\""
--endif
-
- COMMON_LIBS = libsphinx.a $(LIBSTEMMER_LIBS) $(MYSQL_LIBS) $(PGSQL_LIBS)
- LDADD = $(COMMON_LIBS)
-diff -burN sphinx-0.9.8.orig/src/sphinx.cpp sphinx-0.9.8/src/sphinx.cpp
---- sphinx-0.9.8.orig/src/sphinx.cpp 2008-08-03 02:22:01.000000000 +0200
-+++ sphinx-0.9.8/src/sphinx.cpp 2008-08-03 02:22:11.000000000 +0200
-@@ -31,7 +31,7 @@
- #include <float.h>
-
- #if USE_LIBSTEMMER
--#include "libstemmer.h"
-+#include <libstemmer.h>
- #endif
-
- #if USE_LIBEXPAT
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/sphinx.git/commitdiff/4b8af78f38e021f6e8922a0381958fcbc20f90c7
More information about the pld-cvs-commit
mailing list