From bf6f514508230602d27e728207f1dc3dc7381eb7 Mon Sep 17 00:00:00 2001 From: Kazuhiko Shiozaki <kazuhiko@nexedi.com> Date: Wed, 24 Nov 2010 21:27:08 +0000 Subject: [PATCH] use our own heavily patched pysvn tarball that supports --include-dirs and --library-dirs. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@40627 20353a03-c40f-0410-a6d1-a30d3c3de9de --- buildout/software-profiles/erp5-2.12.cfg | 3 +- buildout/software-profiles/pysvn-python.cfg | 34 ++++++++++----------- 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/buildout/software-profiles/erp5-2.12.cfg b/buildout/software-profiles/erp5-2.12.cfg index cc20ddf960..027dbb0b3e 100644 --- a/buildout/software-profiles/erp5-2.12.cfg +++ b/buildout/software-profiles/erp5-2.12.cfg @@ -6,6 +6,7 @@ extends = lxml-python.cfg mysql-python.cfg python-ldap-python.cfg + pysvn-python.cfg subversion.cfg git.cfg glib.cfg @@ -97,6 +98,7 @@ eggs = ${mysql-python:egg} ${lxml-python:egg} ${python-ldap-python:egg} + ${pysvn-python:egg} PyXML SOAPpy cElementTree @@ -109,7 +111,6 @@ eggs = ordereddict paramiko ply - pysvn python-memcached pytz simplejson diff --git a/buildout/software-profiles/pysvn-python.cfg b/buildout/software-profiles/pysvn-python.cfg index 319d7434fb..1fb2c0f1bf 100644 --- a/buildout/software-profiles/pysvn-python.cfg +++ b/buildout/software-profiles/pysvn-python.cfg @@ -1,27 +1,25 @@ [buildout] extends = - ../software-profiles/subversion.cfg ../software-profiles/libexpat.cfg + ../software-profiles/neon.cfg ../software-profiles/openssl.cfg + ../software-profiles/subversion.cfg parts = pysvn-python -[pysvn-python-download] -recipe = hexagonit.recipe.download -url = http://pysvn.barrys-emacs.org/source_kits/pysvn-1.7.4.tar.gz -md5sum = d60e4356bce77bf3b89fd163ab3d9e95 -strip-top-level-dir = true - [pysvn-python] -recipe = plone.recipe.command -stop-on-error = true -location = ${buildout:parts-directory}/${:_buildout_section_name_} -command = - cd ${pysvn-python-download:location} && - ${buildout:executable} setup.py egg_info && - cd Source && - ${buildout:executable} setup.py configure --svn-inc-dir=${subversion:location}/include/subversion-1/ --apr-inc-dir=${apache:location}/include/ --svn-lib-dir=${subversion:location}/lib/ --apr-lib-dir=${apache:location}/lib/ && - make clean && - make LDLIBS="-L${subversion:location}/lib -Wl,--rpath -Wl,${subversion:location}/lib -L${openssl:location}/lib -L/lib64 -Wl,--rpath -Wl,${openssl:location}/lib -L${libexpat:location}/lib -Wl,--rpath -Wl,${libexpat:location}/lib -lsvn_client-1 -lsvn_diff-1 -lsvn_repos-1 -lcom_err -lresolv -lexpat -lneon -lssl" && - exit 1 +recipe = zc.recipe.egg:custom +egg = + pysvn +include-dirs = + ${subversion:location}/include/subversion-1 + ${apache:location}/include +library-dirs = + ${subversion:location}/lib + ${apache:location}/lib + ${neon:location}/lib + ${libexpat:location}/lib + ${openssl:location}/lib +# heavily patched version that supports --include-dirs and --library-dirs +find-links = http://www.nexedi.org/static/packages/source/pysvn-1.7.4nxd001.tar.gz -- 2.30.9