[Erp5-report] r40647 kazuhiko - in /erp5/trunk/utils/pysvn: Source/setup_configure.py setup.py
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Nov 25 10:01:50 CET 2010
Author: kazuhiko
Date: Thu Nov 25 10:01:45 2010
New Revision: 40647
URL: http://svn.erp5.org?rev=40647&view=rev
Log:
pysvn-1.7.4nxd002:
* no need to try to find neon, expat and ssl, because they should be already linked in libsvn_client-1.so.
Modified:
erp5/trunk/utils/pysvn/Source/setup_configure.py
erp5/trunk/utils/pysvn/setup.py
Modified: erp5/trunk/utils/pysvn/Source/setup_configure.py
URL: http://svn.erp5.org/erp5/trunk/utils/pysvn/Source/setup_configure.py?rev=40647&r1=40646&r2=40647&view=diff
==============================================================================
--- erp5/trunk/utils/pysvn/Source/setup_configure.py [utf8] (original)
+++ erp5/trunk/utils/pysvn/Source/setup_configure.py [utf8] Thu Nov 25 10:01:45 2010
@@ -302,15 +302,6 @@ class MakeFileCreater:
'lib_apr': self.lib_apr, # set as a side effect of find_apr_lib
- # add neon lib dir
- 'neon_lib_dir': self.find_neon_lib(),
-
- # add expat lib dir
- 'expat_lib_dir': self.find_expat_lib(),
-
- # add ssl lib dir
- 'ssl_lib_dir': self.find_ssl_lib(),
-
# pycxx src dir
'pycxx_dir': pycxx_dir,
@@ -467,12 +458,10 @@ PYCXX=%(pycxx_dir)s
PYCXXSRC=%(pycxx_src_dir)s
LDSHARED=g++ -shared %(debug_cflags)s
LDLIBS=-L%(svn_lib_dir)s -Wl,--rpath -Wl,%(svn_lib_dir)s \
--L%(neon_lib_dir)s -Wl,--rpath -Wl,%(neon_lib_dir)s \
--L%(expat_lib_dir)s -Wl,--rpath -Wl,%(expat_lib_dir)s \
-lsvn_client-1 \
-lsvn_diff-1 \
-lsvn_repos-1 \
- -lcom_err -lresolv -lexpat -lneon
+ -lcom_err -lresolv
#include pysvn_common.mak
'''
@@ -491,12 +480,10 @@ PYCXX=%(pycxx_dir)s
PYCXXSRC=%(pycxx_src_dir)s
LDSHARED=g++ -shared %(debug_cflags)s
LDLIBS=-L%(svn_lib_dir)s -Wl,--rpath -Wl,%(svn_lib_dir)s \
--L%(neon_lib_dir)s -Wl,--rpath -Wl,%(neon_lib_dir)s \
--L%(expat_lib_dir)s -Wl,--rpath -Wl,%(expat_lib_dir)s \
-lsvn_client-1 \
-lsvn_diff-1 \
-lsvn_repos-1 \
- -lresolv -lexpat -lneon
+-lresolv
#include pysvn_common.mak
'''
@@ -515,13 +502,10 @@ PYCXX=%(pycxx_dir)s
PYCXXSRC=%(pycxx_src_dir)s
LDSHARED=g++ -shared %(debug_cflags)s
LDLIBS=-L%(svn_lib_dir)s -Wl,--rpath -Wl,%(svn_lib_dir)s \
--L%(neon_lib_dir)s -Wl,--rpath -Wl,%(neon_lib_dir)s \
--L%(expat_lib_dir)s -Wl,--rpath -Wl,%(expat_lib_dir)s \
--L%(ssl_lib_dir)s -Wl,--rpath -Wl,%(ssl_lib_dir)s \
-lsvn_client-1 \
-lsvn_diff-1 \
-lsvn_repos-1 \
--lcom_err -lresolv -lexpat -lneon -lssl
+-lcom_err -lresolv
PYSVN_CREATE_INIT_OPTION=%(pysvn_module_name)s
#include pysvn_common.mak
@@ -541,13 +525,10 @@ PYCXX=%(pycxx_dir)s
PYCXXSRC=%(pycxx_src_dir)s
LDSHARED=g++ -shared %(debug_cflags)s
LDLIBS=-L%(svn_lib_dir)s \
--L%(neon_lib_dir)s \
--L%(expat_lib_dir)s \
--L%(ssl_lib_dir)s \
-lsvn_client-1 \
-lsvn_diff-1 \
-lsvn_repos-1 \
--lcom_err -lresolv -lexpat -lneon -lssl
+-lcom_err -lresolv
PYSVN_CREATE_INIT_OPTION=%(pysvn_module_name)s
#include pysvn_common.mak
@@ -567,8 +548,6 @@ PYCXX=%(pycxx_dir)s
PYCXXSRC=%(pycxx_src_dir)s
LDSHARED=g++ -shared %(debug_cflags)s
LDLIBS=-L%(svn_lib_dir)s -Wl,--rpath -Wl,/usr/lib:/usr/local/lib:%(svn_lib_dir)s \
--L%(neon_lib_dir)s -Wl,--rpath -Wl,/usr/lib:/usr/local/lib:%(neon_lib_dir)s \
--L%(expat_lib_dir)s -Wl,--rpath -Wl,/usr/lib:/usr/local/lib:%(expat_lib_dir)s \
-lsvn_client-1 \
-lsvn_diff-1 \
-lsvn_repos-1
@@ -576,7 +555,7 @@ LDLIBS=-L%(svn_lib_dir)s -Wl,--rpath -Wl
.if exists(/usr/lib/libkrb5.so)
LDLIBS+=-lkrb5
.endif
-LDLIBS+=-lcom_err -lexpat -lneon
+LDLIBS+=-lcom_err
#include pysvn_common.mak
'''
@@ -611,7 +590,6 @@ LDLIBS=-L%(svn_lib_dir)s \
-lapr-1 \
-laprutil-1 \
-liconv \
--lexpat \
-lpthread \
-lz \
@@ -633,8 +611,6 @@ PYCXX=%(pycxx_dir)s
PYCXXSRC=%(pycxx_src_dir)s
LDSHARED=g++ -shared %(debug_cflags)s
LDLIBS=-L%(svn_lib_dir)s \
--L%(neon_lib_dir)s \
--L%(expat_lib_dir)s \
-lsvn_client-1 \
-lsvn_repos-1 \
-lsvn_subr-1 \
@@ -650,10 +626,8 @@ LDLIBS=-L%(svn_lib_dir)s \
-lsvn_fs_util-1 \
-lsvn_ra_neon-1 \
-lapr-1 \
--lneon \
-laprutil-1 \
-liconv \
--lexpat \
-lintl \
-lpthread \
-lz \
@@ -960,60 +934,6 @@ LDLIBS= \
last_exception = e
raise last_exception
- def find_neon_lib( self ):
- dir = self.find_dir(
- 'neon library',
- None,
- None,
- self._library_dirs() +
- [
- '/opt/local/lib', # Darwin - darwin ports
- '/sw/lib', # Darwin - Fink
- '/usr/lib64', # typical 64bit Linux
- '/usr/lib', # typical Linux
- '/usr/local/lib64', # typical 64bit Linux
- '/usr/local/lib', # typical *BSD
- '/usr/pkg/lib', # netbsd
- ],
- self.get_lib_name_for_platform( 'libneon' ) )
- return dir
-
- def find_expat_lib( self ):
- dir = self.find_dir(
- 'expat library',
- None,
- None,
- self._library_dirs() +
- [
- '/opt/local/lib', # Darwin - darwin ports
- '/sw/lib', # Darwin - Fink
- '/usr/lib64', # typical 64bit Linux
- '/usr/lib', # typical Linux
- '/usr/local/lib64', # typical 64bit Linux
- '/usr/local/lib', # typical *BSD
- '/usr/pkg/lib', # netbsd
- ],
- self.get_lib_name_for_platform( 'libexpat' ) )
- return dir
-
- def find_ssl_lib( self ):
- dir = self.find_dir(
- 'ssl library',
- None,
- None,
- self._library_dirs() +
- [
- '/opt/local/lib', # Darwin - darwin ports
- '/sw/lib', # Darwin - Fink
- '/usr/lib64', # typical 64bit Linux
- '/usr/lib', # typical Linux
- '/usr/local/lib64', # typical 64bit Linux
- '/usr/local/lib', # typical *BSD
- '/usr/pkg/lib', # netbsd
- ],
- self.get_lib_name_for_platform( 'libssl' ) )
- return dir
-
def _library_dirs( self ):
if self.hasOption( '--library-dirs' ):
return self.getOption( '--library-dirs' ).split(':')
Modified: erp5/trunk/utils/pysvn/setup.py
URL: http://svn.erp5.org/erp5/trunk/utils/pysvn/setup.py?rev=40647&r1=40646&r2=40647&view=diff
==============================================================================
--- erp5/trunk/utils/pysvn/setup.py [utf8] (original)
+++ erp5/trunk/utils/pysvn/setup.py [utf8] Thu Nov 25 10:01:45 2010
@@ -56,7 +56,7 @@ name = "pysvn"
setuptools.setup(
name = name,
- version='%(MAJOR)s.%(MINOR)s.%(PATCH)snxd001' % pysvn_version_info,
+ version='%(MAJOR)s.%(MINOR)s.%(PATCH)snxd002' % pysvn_version_info,
author="Barry Scott",
author_email="barryscott at tigris.org",
description="Subversion support for Python",
More information about the Erp5-report
mailing list