rpcd: iwinfo plugin fixes
[openwrt/svn-archive/archive.git] / patches / 010-build.patch
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 @@
31
32 # Install as _DATA rather than _SCRIPTS because we don't want to make these
33 # executable (they don't have a #! line).
34 -pylib_DATA = xapian.py xapian.pyc xapian.pyo
35 +pylib_DATA = xapian.py
36
37 pylib_LTLIBRARIES = _xapian.la
38
39 @@ -53,20 +53,12 @@
40 xapian.py: modern/xapian.py
41 cp `test -f modern/xapian.py || echo '$(srcdir)/'`modern/xapian.py .
42
43 -# We "import _xapian" first so that if we fail to import the glue library
44 -# we don't generate a broken xapian.pyc or xapian.pyo.
45 -xapian.pyc: xapian.py _xapian$(PYTHON_SO)
46 - PYTHONPATH=. $(PYTHON) -c "import _xapian;import xapian"
47 -
48 -xapian.pyo: xapian.py _xapian$(PYTHON_SO)
49 - PYTHONPATH=. $(PYTHON) -O -c "import _xapian;import xapian"
50 -
51 _xapian$(PYTHON_SO): _xapian.la
52 $(LIBTOOL) --config > libtoolconfig.tmp
53 . ./libtoolconfig.tmp; cp $$objdir/_xapian$(PYTHON_SO) .
54 rm -f libtoolconfig.tmp
55
56 -CLEANFILES = _xapian$(PYTHON_SO) xapian.py xapian.pyc xapian.pyo testsuite.pyc
57 +CLEANFILES = _xapian$(PYTHON_SO) xapian.py testsuite.pyc
58
59 if MAINTAINER_MODE
60 # 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 @@
65
66 # Install as _DATA rather than _SCRIPTS because we don't want to make these
67 # executable (they don't have a #! line).
68 -pylib_DATA = xapian.py xapian.pyc xapian.pyo
69 +pylib_DATA = xapian.py
70 pylib_LTLIBRARIES = _xapian.la
71 AM_CPPFLAGS = -I$(PYTHON_INC)
72 AM_CXXFLAGS = $(SWIG_CXXFLAGS) $(XAPIAN_CXXFLAGS)
73 _xapian_la_LDFLAGS = -avoid-version -module -shrext "$(PYTHON_SO)" $(NO_UNDEFINED)
74 _xapian_la_SOURCES = modern/xapian_wrap.cc
75 _xapian_la_LIBADD = $(XAPIAN_LIBS) $(PYTHON_LIBS)
76 -CLEANFILES = _xapian$(PYTHON_SO) xapian.py xapian.pyc xapian.pyo \
77 +CLEANFILES = _xapian$(PYTHON_SO) xapian.py \
78 testsuite.pyc $(am__append_2)
79 @MAINTAINER_MODE_FALSE@MAINTAINERCLEANFILES = $(BUILT_SOURCES)
80 all: $(BUILT_SOURCES)
81 @@ -819,14 +819,6 @@
82 xapian.py: modern/xapian.py
83 cp `test -f modern/xapian.py || echo '$(srcdir)/'`modern/xapian.py .
84
85 -# We "import _xapian" first so that if we fail to import the glue library
86 -# we don't generate a broken xapian.pyc or xapian.pyo.
87 -xapian.pyc: xapian.py _xapian$(PYTHON_SO)
88 - PYTHONPATH=. $(PYTHON) -c "import _xapian;import xapian"
89 -
90 -xapian.pyo: xapian.py _xapian$(PYTHON_SO)
91 - PYTHONPATH=. $(PYTHON) -O -c "import _xapian;import xapian"
92 -
93 _xapian$(PYTHON_SO): _xapian.la
94 $(LIBTOOL) --config > libtoolconfig.tmp
95 . ./libtoolconfig.tmp; cp $$objdir/_xapian$(PYTHON_SO) .