[backfire/packages] merge [28415] & [28416]

SVN-Revision: 28417

diff --git a/lang/xapian-bindings/Makefile b/lang/xapian-bindings/Makefile
index bef714b12d0aa85a7b133ca09eec5dec20445299..85cbba0924c6f5f4acb3afd37b1be81ac00e7882 100644 (file)
--- a/lang/xapian-bindings/Makefile
+++ b/lang/xapian-bindings/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2008-2010 OpenWrt.org
+# Copyright (C) 2008-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -31,13 +31,15 @@ define Package/python-xapian
   DEPENDS:=+python-mini +libxapian
 endef
 
-define Build/Configure
-  $(call Build/Configure/Default, --with-python)
-endef
+CONFIGURE_ARGS+= \
+       --with-python \
+
+CONFIGURE_VARS+= \
+       PYTHON_LIB="$(PYTHON_PKG_DIR)" \
 
 define Package/python-xapian/install
        $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)
-       $(CP) $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* $(1)$(PYTHON_PKG_DIR)
+       $(CP) $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* $(1)$(PYTHON_PKG_DIR)/
 endef
 
 $(eval $(call BuildPackage,python-xapian))

diff --git a/lang/xapian-bindings/patches/010-build.patch b/lang/xapian-bindings/patches/010-build.patch
index e926d21e318238539eb52dbda231cfb08e603e09..32428f6f3a1181114b7a72bc152adcf06488d584 100644 (file)
--- a/lang/xapian-bindings/patches/010-build.patch
+++ b/lang/xapian-bindings/patches/010-build.patch
@@ -1,33 +1,6 @@
-diff -urN xapian-bindings-1.0.7.orig/configure xapian-bindings-1.0.7/configure
---- xapian-bindings-1.0.7.orig/configure       2008-08-26 18:19:07.000000000 +0200
-+++ xapian-bindings-1.0.7/configure    2008-08-26 19:06:25.000000000 +0200
-@@ -15079,7 +15079,7 @@
-       { $as_echo "$as_me:$LINENO: checking for directory to install python bindings in" >&5
- $as_echo_n "checking for directory to install python bindings in... " >&6; }
-       if test -z "$PYTHON_LIB" ; then
--        PYTHON_LIB=`$PYTHON -c 'import os,distutils.sysconfig;print(distutils.sysconfig.get_python_lib(1).replace(os.sep,"/"))'`
-+        PYTHON_LIB=`$PYTHON -c "import os,distutils.sysconfig;print(distutils.sysconfig.get_python_lib(1, 0, chr(36)+'{exec_prefix}').replace(os.sep, '/'))"`
-       fi
-       { $as_echo "$as_me:$LINENO: result: $PYTHON_LIB" >&5
- $as_echo "$PYTHON_LIB" >&6; }
-diff -urN xapian-bindings-1.0.7.orig/configure.ac xapian-bindings-1.0.7/configure.ac
---- xapian-bindings-1.0.7.orig/configure.ac    2008-08-26 18:19:07.000000000 +0200
-+++ xapian-bindings-1.0.7/configure.ac 2008-08-26 18:49:34.000000000 +0200
-@@ -243,7 +243,9 @@
-       AC_MSG_RESULT(yes)
-       AC_MSG_CHECKING([for directory to install python bindings in])
-       if test -z "$PYTHON_LIB" ; then
--        PYTHON_LIB=`$PYTHON -c 'import os,distutils.sysconfig;print(distutils.sysconfig.get_python_lib(1).replace(os.sep,"/"))'`
-+        PYTHON_LIB=`$PYTHON -c 'import os,distutils.sysconfig;
-+      print(distutils.sysconfig.get_python_lib(1, 
-+      prefix='${exec_prefix}').replace(os.sep,"/"))'`
-       fi
-       AC_MSG_RESULT([$PYTHON_LIB])
-       AC_ARG_VAR(PYTHON_LIB, [Directory to install python bindings in])
-diff -urN xapian-bindings-1.0.7.orig/python/Makefile.am xapian-bindings-1.0.7/python/Makefile.am
---- xapian-bindings-1.0.7.orig/python/Makefile.am      2008-08-26 18:19:07.000000000 +0200
-+++ xapian-bindings-1.0.7/python/Makefile.am   2008-08-26 18:49:34.000000000 +0200
-@@ -23,7 +23,7 @@
+--- a/python/Makefile.am
++++ b/python/Makefile.am
+@@ -23,7 +23,7 @@ pylibdir = @PYTHON_LIB@
  
  # Install as _DATA rather than _SCRIPTS because we don't want to make these
  # executable (they don't have a #! line).
@@ -36,7 +9,7 @@ diff -urN xapian-bindings-1.0.7.orig/python/Makefile.am xapian-bindings-1.0.7/py
  
  pylib_LTLIBRARIES = _xapian.la
  
-@@ -53,20 +53,12 @@
+@@ -53,20 +53,12 @@ _xapian_la_LIBADD = $(XAPIAN_LIBS) $(PYT
  xapian.py: modern/xapian.py
        cp `test -f modern/xapian.py || echo '$(srcdir)/'`modern/xapian.py .
  
@@ -58,10 +31,9 @@ diff -urN xapian-bindings-1.0.7.orig/python/Makefile.am xapian-bindings-1.0.7/py
  
  if MAINTAINER_MODE
  # We need to explicitly set -outdir because on Windows, SWIG splits paths at
-diff -urN xapian-bindings-1.0.7.orig/python/Makefile.in xapian-bindings-1.0.7/python/Makefile.in
---- xapian-bindings-1.0.7.orig/python/Makefile.in      2008-08-26 18:19:07.000000000 +0200
-+++ xapian-bindings-1.0.7/python/Makefile.in   2008-08-26 18:49:34.000000000 +0200
-@@ -292,14 +292,14 @@
+--- a/python/Makefile.in
++++ b/python/Makefile.in
+@@ -292,14 +292,14 @@ pylibdir = @PYTHON_LIB@
  
  # Install as _DATA rather than _SCRIPTS because we don't want to make these
  # executable (they don't have a #! line).
@@ -78,7 +50,7 @@ diff -urN xapian-bindings-1.0.7.orig/python/Makefile.in xapian-bindings-1.0.7/py
        testsuite.pyc $(am__append_2)
  @MAINTAINER_MODE_FALSE@MAINTAINERCLEANFILES = $(BUILT_SOURCES)
  all: $(BUILT_SOURCES)
-@@ -819,14 +819,6 @@
+@@ -819,14 +819,6 @@ uninstall-local:
  xapian.py: modern/xapian.py
        cp `test -f modern/xapian.py || echo '$(srcdir)/'`modern/xapian.py .
  

diff --git a/libs/libxapian/patches/004-xapian_config_no_ltlibs.patch b/libs/libxapian/patches/004-xapian_config_no_ltlibs.patch
new file mode 100644 (file)
index 0000000..cdcf5f5
--- /dev/null
+++ b/libs/libxapian/patches/004-xapian_config_no_ltlibs.patch
@@ -0,0 +1,51 @@
+Index: xapian-core-1.0.7/m4-macros/xapian.m4
+===================================================================
+--- xapian-core-1.0.7.orig/m4-macros/xapian.m4 2011-10-11 16:11:04.000000000 +0200
++++ xapian-core-1.0.7/m4-macros/xapian.m4      2011-10-11 16:12:00.000000000 +0200
+@@ -47,14 +47,12 @@
+       [$2])
+   else
+     AC_MSG_CHECKING([$XAPIAN_CONFIG works])
+-    dnl check for --ltlibs but not --libs as "xapian-config --libs" will
+-    dnl fail if xapian isn't installed...
+ 
+     dnl run with exec to avoid leaking output on "real" bourne shells
+-    if (exec >&5 2>&5 ; $XAPIAN_CONFIG --ltlibs --cxxflags; exit $?) then
++    if (exec >&5 2>&5 ; $XAPIAN_CONFIG --libs --cxxflags; exit $?) then
+       AC_MSG_RESULT(yes)
+     else
+-      AC_MSG_ERROR([\`$XAPIAN_CONFIG --ltlibs --cxxflags' doesn't work, aborting])
++      AC_MSG_ERROR([\`$XAPIAN_CONFIG --libs --cxxflags' doesn't work, aborting])
+     fi
+ 
+ dnl If LT_INIT, AC_PROG_LIBTOOL or the deprecated older version
+@@ -64,11 +62,11 @@
+     XAPIAN_VERSION=`$XAPIAN_CONFIG --version|sed 's/.* //;s/_svn[[0-9]]*$//'`
+     XAPIAN_CXXFLAGS=`$XAPIAN_CONFIG --cxxflags`
+     AC_PROVIDE_IFELSE([LT_INIT],
+-      [XAPIAN_LIBS=`$XAPIAN_CONFIG --ltlibs`],
++      [XAPIAN_LIBS=`$XAPIAN_CONFIG --libs`],
+       [AC_PROVIDE_IFELSE([AC_PROG_LIBTOOL],
+-      [XAPIAN_LIBS=`$XAPIAN_CONFIG --ltlibs`],
++      [XAPIAN_LIBS=`$XAPIAN_CONFIG --libs`],
+       [AC_PROVIDE_IFELSE([AM_PROG_LIBTOOL],
+-        [XAPIAN_LIBS=`$XAPIAN_CONFIG --ltlibs`],
++        [XAPIAN_LIBS=`$XAPIAN_CONFIG --libs`],
+         dnl Pass magic option so xapian-config knows we called it (so it
+         dnl can choose a more appropriate error message if asked to link
+         dnl with an uninstalled libxapian).  Also pass ac_top_srcdir
+@@ -76,11 +74,11 @@
+         dnl "configure.in" according to which is in use.
+         [XAPIAN_LIBS=`ac_top_srcdir="$ac_top_srcdir" $XAPIAN_CONFIG --from-xo-lib-xapian --libs`
+         define([LT_INIT], defn([LT_INIT])
+-               [XAPIAN_LIBS=`$XAPIAN_CONFIG --ltlibs`])
++               [XAPIAN_LIBS=`$XAPIAN_CONFIG --libs`])
+         define([AC_PROG_LIBTOOL], defn([AC_PROG_LIBTOOL])
+-               [XAPIAN_LIBS=`$XAPIAN_CONFIG --ltlibs`])
++               [XAPIAN_LIBS=`$XAPIAN_CONFIG --libs`])
+         define([AM_PROG_LIBTOOL], defn([AM_PROG_LIBTOOL])
+-               [XAPIAN_LIBS=`$XAPIAN_CONFIG --ltlibs`])])])])
++               [XAPIAN_LIBS=`$XAPIAN_CONFIG --libs`])])])])
+     ifelse([$1], , :, [$1])
+   fi
+   AC_SUBST(XAPIAN_CXXFLAGS)