Changeset 28416


Ignore:
Timestamp:
2011-10-11T18:02:28+02:00 (6 years ago)
Author:
nico
Message:

[packages] xapian-bindings: cleanup

provide PYTHON_LIB, instead of patching configure

Location:
packages/lang/xapian-bindings
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • packages/lang/xapian-bindings/Makefile

    r20398 r28416  
    11# 
    2 # Copyright (C) 2008-2010 OpenWrt.org 
     2# Copyright (C) 2008-2011 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    3232endef 
    3333 
    34 define Build/Configure 
    35   $(call Build/Configure/Default, --with-python) 
    36 endef 
     34CONFIGURE_ARGS+= \ 
     35        --with-python \ 
     36 
     37CONFIGURE_VARS+= \ 
     38        PYTHON_LIB="$(PYTHON_PKG_DIR)" \ 
    3739 
    3840define Package/python-xapian/install 
    3941        $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR) 
    40         $(CP) $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* $(1)$(PYTHON_PKG_DIR) 
     42        $(CP) $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* $(1)$(PYTHON_PKG_DIR)/ 
    4143endef 
    4244 
  • packages/lang/xapian-bindings/patches/010-build.patch

    r12563 r28416  
    1 diff -urN xapian-bindings-1.0.7.orig/configure xapian-bindings-1.0.7/configure 
    2 --- xapian-bindings-1.0.7.orig/configure        2008-08-26 18:19:07.000000000 +0200 
    3 +++ xapian-bindings-1.0.7/configure     2008-08-26 19:06:25.000000000 +0200 
    4 @@ -15079,7 +15079,7 @@ 
    5         { $as_echo "$as_me:$LINENO: checking for directory to install python bindings in" >&5 
    6  $as_echo_n "checking for directory to install python bindings in... " >&6; } 
    7         if test -z "$PYTHON_LIB" ; then 
    8 -         PYTHON_LIB=`$PYTHON -c 'import os,distutils.sysconfig;print(distutils.sysconfig.get_python_lib(1).replace(os.sep,"/"))'` 
    9 +         PYTHON_LIB=`$PYTHON -c "import os,distutils.sysconfig;print(distutils.sysconfig.get_python_lib(1, 0, chr(36)+'{exec_prefix}').replace(os.sep, '/'))"` 
    10         fi 
    11         { $as_echo "$as_me:$LINENO: result: $PYTHON_LIB" >&5 
    12  $as_echo "$PYTHON_LIB" >&6; } 
    13 diff -urN xapian-bindings-1.0.7.orig/configure.ac xapian-bindings-1.0.7/configure.ac 
    14 --- xapian-bindings-1.0.7.orig/configure.ac     2008-08-26 18:19:07.000000000 +0200 
    15 +++ xapian-bindings-1.0.7/configure.ac  2008-08-26 18:49:34.000000000 +0200 
    16 @@ -243,7 +243,9 @@ 
    17         AC_MSG_RESULT(yes) 
    18         AC_MSG_CHECKING([for directory to install python bindings in]) 
    19         if test -z "$PYTHON_LIB" ; then 
    20 -         PYTHON_LIB=`$PYTHON -c 'import os,distutils.sysconfig;print(distutils.sysconfig.get_python_lib(1).replace(os.sep,"/"))'` 
    21 +         PYTHON_LIB=`$PYTHON -c 'import os,distutils.sysconfig; 
    22 +      print(distutils.sysconfig.get_python_lib(1,  
    23 +      prefix='${exec_prefix}').replace(os.sep,"/"))'` 
    24         fi 
    25         AC_MSG_RESULT([$PYTHON_LIB]) 
    26         AC_ARG_VAR(PYTHON_LIB, [Directory to install python bindings in]) 
    27 diff -urN xapian-bindings-1.0.7.orig/python/Makefile.am xapian-bindings-1.0.7/python/Makefile.am 
    28 --- xapian-bindings-1.0.7.orig/python/Makefile.am       2008-08-26 18:19:07.000000000 +0200 
    29 +++ xapian-bindings-1.0.7/python/Makefile.am    2008-08-26 18:49:34.000000000 +0200 
    30 @@ -23,7 +23,7 @@ 
     1--- a/python/Makefile.am 
     2+++ b/python/Makefile.am 
     3@@ -23,7 +23,7 @@ pylibdir = @PYTHON_LIB@ 
    314  
    325 # Install as _DATA rather than _SCRIPTS because we don't want to make these 
     
    3710 pylib_LTLIBRARIES = _xapian.la 
    3811  
    39 @@ -53,20 +53,12 @@ 
     12@@ -53,20 +53,12 @@ _xapian_la_LIBADD = $(XAPIAN_LIBS) $(PYT 
    4013 xapian.py: modern/xapian.py 
    4114        cp `test -f modern/xapian.py || echo '$(srcdir)/'`modern/xapian.py . 
     
    5932 if MAINTAINER_MODE 
    6033 # We need to explicitly set -outdir because on Windows, SWIG splits paths at 
    61 diff -urN xapian-bindings-1.0.7.orig/python/Makefile.in xapian-bindings-1.0.7/python/Makefile.in 
    62 --- xapian-bindings-1.0.7.orig/python/Makefile.in       2008-08-26 18:19:07.000000000 +0200 
    63 +++ xapian-bindings-1.0.7/python/Makefile.in    2008-08-26 18:49:34.000000000 +0200 
    64 @@ -292,14 +292,14 @@ 
     34--- a/python/Makefile.in 
     35+++ b/python/Makefile.in 
     36@@ -292,14 +292,14 @@ pylibdir = @PYTHON_LIB@ 
    6537  
    6638 # Install as _DATA rather than _SCRIPTS because we don't want to make these 
     
    7951 @MAINTAINER_MODE_FALSE@MAINTAINERCLEANFILES = $(BUILT_SOURCES) 
    8052 all: $(BUILT_SOURCES) 
    81 @@ -819,14 +819,6 @@ 
     53@@ -819,14 +819,6 @@ uninstall-local: 
    8254 xapian.py: modern/xapian.py 
    8355        cp `test -f modern/xapian.py || echo '$(srcdir)/'`modern/xapian.py . 
Note: See TracChangeset for help on using the changeset viewer.