Author: shadzik Date: Fri Nov 2 11:33:06 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- glen says pkgconfig is always better then scanning /usr/include, so i figured
out this solution,
maybe it's evil (I'm sure it is) but works
---- Files affected:
SOURCES:
python-pysvn-apr_util.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: SOURCES/python-pysvn-apr_util.patch
diff -u SOURCES/python-pysvn-apr_util.patch:1.1
SOURCES/python-pysvn-apr_util.patch:1.2
--- SOURCES/python-pysvn-apr_util.patch:1.1 Fri Nov 2 09:57:57 2007
+++ SOURCES/python-pysvn-apr_util.patch Fri Nov 2 12:33:00 2007
@@ -1,63 +1,14 @@
--- Source/setup.py 2007-07-01 12:30:50.000000000 +0200
-+++ Source/setup.py.new 2007-10-23 08:46:23.000000000 +0200
-@@ -55,6 +55,7 @@
- --enable-debug
- --pycxx-dir=<dir>
- --apr-inc-dir=<dir>
-+ --apr-util-inc-dir=<dir>
- --svn-root-dir=<dir>
- --svn-inc-dir=<dir>
- --svn-lib-dir=<dir>
-@@ -139,6 +140,8 @@
- include_dir_list.append( svn_include )
- # add APR include
- include_dir_list.append( self.find_apr_inc( argv ) )
-+ # add ARP util include
-+ include_dir_list.append( self.find_apr_util_inc( argv ) )
-
- # add source dir
- include_dir_list.append( '.' )
-@@ -642,6 +645,43 @@
- last_exception = e
- raise last_exception
-
-+ def find_apr_util_inc( self, argv ):
-+ last_exception = None
-+ for apr_ver in ['apr-util-1', 'apr-util-0']:
-+ try:
-+ return self.find_dir( argv,
-+ 'APR include',
-+ '--apr-util-inc-dir=',
-+ 'include/%s' % apr_ver,
-+ [
-+ ],
-+ 'apr_xlate.h' )
-+ except SetupError:
-+ pass
-+
-+ for apr_ver in ['apr-1', 'apr-0']:
-+ try:
-+ return self.find_dir( argv,
-+ 'APR include',
-+ '--apr-util-inc-dir=',
-+ None,
-+ [
-+ '/opt/local/include/%s' % apr_ver, # Darwin -
darwin ports
-+ '/sw/include/%s' % apr_ver, # Darwin -
fink
-+ '/usr/include/%s' % apr_ver, # typical
Linux
-+ '/usr/local/apr/include/%s' % apr_ver, # Mac OS X
www.metissian.com
-+ '/usr/pkg/include/%s' % apr_ver, # netbsd
-+ '/usr/include/apache2', # alternate
Linux
-+ '/usr/include/httpd', # alternate
Linux
-+ '/usr/include/apr-util', # alternate
PLD Linux
-+ '/usr/local/include/apr0', # typical *BSD
-+ '/usr/local/include/apache2', # alternate
*BSD
-+ ],
-+ 'apr_xlate.h' )
-+ except SetupError, e:
-+ last_exception = e
-+ raise last_exception
-+
- def find_apr_lib( self, argv ):
- last_exception = None
- lib_list = [(self.get_lib_name_for_platform( 'libapr-1' ), 'apr-1'),
++++ Source/setup.py-new 2007-11-02 12:04:55.000000000 +0100
+@@ -322,9 +322,9 @@
+ PYTHON=%(python_exe)s
+ SVN_INCLUDE=%(svn_include)s
+ CCC=g++ -c
+-CCCFLAGS=-Wall -fPIC -fexceptions -frtti %(includes)s %(py_cflags)s
%(debug_cflags)s
++CCCFLAGS=-Wall -fPIC -fexceptions -frtti %(includes)s %(py_cflags)s
%(debug_cflags)s `pkg-config apr-util-1 --cflags`
+ CC=gcc -c
+-CCFLAGS=-Wall -fPIC %(includes)s %(debug_cflags)s
++CCFLAGS=-Wall -fPIC %(includes)s %(debug_cflags)s `pkg-config apr-util-1
--cflags`
+ PYCXX=%(pycxx_dir)s
+ LDSHARED=g++ -shared %(debug_cflags)s
+ LDLIBS=-L%(svn_lib_dir)s -Wl,--rpath -Wl,%(svn_lib_dir)s \
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/python-pysvn-apr_util.patch?r1=1.1&r2=1.2&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
