From ee5afacf196ee744ae1fb03aded789828fabf2c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Nowak?= <luke@nexedi.com> Date: Mon, 22 Nov 2010 15:02:48 +0000 Subject: [PATCH] - go back to neon useage as on some platforms there is no (yet) known way to make subversion build system detect that serf, which is really available and working, is available and working - remove ssl, as there is nothing to do with ssl on subversion - add gentoo patch which removes a lot of automatically detected garbage from subversion build system git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@40471 20353a03-c40f-0410-a6d1-a30d3c3de9de --- buildout/software-profiles/subversion.cfg | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/buildout/software-profiles/subversion.cfg b/buildout/software-profiles/subversion.cfg index 1bb90f1122..37d06551ac 100644 --- a/buildout/software-profiles/subversion.cfg +++ b/buildout/software-profiles/subversion.cfg @@ -3,29 +3,35 @@ extends = ../software-profiles/apache.cfg ../software-profiles/libdb.cfg ../software-profiles/libexpat.cfg - ../software-profiles/serf.cfg ../software-profiles/sqlite3.cfg ../software-profiles/zlib.cfg - ../software-profiles/openssl.cfg + ../software-profiles/neon.cfg ../software-profiles/libuuid.cfg parts = subversion +[subversion-1.6.0-disable_linking_against_unneeded_libraries] +recipe = hexagonit.recipe.download +download-only = true +filename = ${:_buildout_section_name_}.patch +url = http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-vcs/subversion/files/subversion-1.6.0-disable_linking_against_unneeded_libraries.patch?revision=1.1 +md5sum = 8d911ec2422dc4c08a00693ac915a07a + [subversion] recipe = hexagonit.recipe.cmmi url = http://subversion.tigris.org/downloads/subversion-1.6.13.tar.bz2 md5sum = 7ae1c827689f21cf975804005be30aeb +patches = + ${subversion-1.6.0-disable_linking_against_unneeded_libraries:location}/${subversion-1.6.0-disable_linking_against_unneeded_libraries:filename} configure-options = --with-apr=${apache:location}/bin/apr-1-config --with-apr-util=${apache:location}/bin/apu-1-config --with-apxs=${apache:location}/bin/apxs --with-zlib=${zlib:location} --with-sqlite=${sqlite3:location} + --with-neon=${neon:location} --without-berkeley-db - --without-neon - --without-ssl --without-sasl - --with-serf=${serf:location} --without-apr_memcache --without-gnome-keyring --without-kwallet @@ -40,4 +46,4 @@ configure-options = environment = CPPFLAGS=-I${libexpat:location}/include -I${libuuid:location}/include - LDFLAGS=-L${libexpat:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath -Wl,${sqlite3:location}/lib -Wl,-rpath -Wl,${serf:location}/lib -Wl,-rpath -Wl,${openssl:location}/lib -L${libuuid:location}/lib -Wl,-rpath -Wl,${libuuid:location}/lib + LDFLAGS=-L${libexpat:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath -Wl,${sqlite3:location}/lib -Wl,-rpath -Wl,${neon:location}/lib -Wl,-rpath -Wl,${apache:location}/lib -L${libuuid:location}/lib -Wl,-rpath -Wl,${libuuid:location}/lib -- 2.30.9