[Erp5-report] r40338 romain - in /erp5/trunk/buildout: software-profiles/ tests/

[nobody at svn.erp5.org]

Author: romain
Date: Wed Nov 17 17:23:44 2010
New Revision: 40338

URL: http://svn.erp5.org?rev=40338&view=rev
Log:
Disable libneon, as subversion uses system neon when serf is also enabled.

Modified:
    erp5/trunk/buildout/software-profiles/subversion.cfg
    erp5/trunk/buildout/tests/assertSoftware.py

Modified: erp5/trunk/buildout/software-profiles/subversion.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/software-profiles/subversion.cfg?rev=40338&r1=40337&r2=40338&view=diff
==============================================================================
--- erp5/trunk/buildout/software-profiles/subversion.cfg [utf8] (original)
+++ erp5/trunk/buildout/software-profiles/subversion.cfg [utf8] Wed Nov 17 17:23:44 2010
@@ -3,10 +3,10 @@ extends =
   ../software-profiles/apache.cfg
   ../software-profiles/libdb.cfg
   ../software-profiles/libexpat.cfg
-  ../software-profiles/neon.cfg
   ../software-profiles/serf.cfg
   ../software-profiles/sqlite3.cfg
   ../software-profiles/zlib.cfg
+  ../software-profiles/openssl.cfg
 parts =
   subversion
 
@@ -21,7 +21,7 @@ configure-options =
   --with-zlib=${zlib:location}
   --with-sqlite=${sqlite3:location}
   --without-berkeley-db
-  --with-neon=${neon:location}
+  --without-neon
   --without-ssl
   --without-sasl
   --with-serf=${serf:location}
@@ -39,4 +39,4 @@ configure-options =
 
 environment =
   CPPFLAGS=-I${libexpat:location}/include
-  LDFLAGS=-L${libexpat:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -Wl,-rpath -Wl,${neon:location}/lib -Wl,-rpath -Wl,${sqlite3:location}/lib -Wl,-rpath -Wl,${serf:location}/lib
+  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

Modified: erp5/trunk/buildout/tests/assertSoftware.py
URL: http://svn.erp5.org/erp5/trunk/buildout/tests/assertSoftware.py?rev=40338&r1=40337&r2=40338&view=diff
==============================================================================
--- erp5/trunk/buildout/tests/assertSoftware.py [utf8] (original)
+++ erp5/trunk/buildout/tests/assertSoftware.py [utf8] Wed Nov 17 17:23:44 2010
@@ -316,16 +316,16 @@ class AssertSubversion(AssertSoftwareMix
     self.assertEqual(sorted(['libsvn_client-1', 'libsvn_wc-1', 'libsvn_ra-1',
       'libsvn_diff-1', 'libsvn_ra_local-1', 'libsvn_repos-1', 'libsvn_fs-1',
       'libsvn_fs_fs-1', 'libsvn_fs_util-1', 'libsvn_ra_svn-1',
-      'libsvn_ra_neon-1', 'libsvn_delta-1', 'libsvn_subr-1', 'libsqlite3',
-      'libaprutil-1', 'libapr-1', 'libuuid', 'librt', 'libneon', 'libexpat',
-      'libz', 'libssl', 'libcrypto', 'libgssapi_krb5', 'libkrb5',
-      'libk5crypto', 'libcom_err', 'libresolv', 'libc', 'libcrypt', 'libdl',
-      'libpthread', 'libm', 'libserf-0', 'libsvn_ra_serf-1', 'libxml2'
+      'libsvn_delta-1', 'libsvn_subr-1', 'libsqlite3',
+      'libaprutil-1', 'libapr-1', 'libuuid', 'librt', 'libexpat',
+      'libz', 'libssl', 'libcrypto',
+      'libc', 'libcrypt', 'libdl',
+      'libpthread', 'libm', 'libserf-0', 'libsvn_ra_serf-1',
       ]),
         elf_dict['library_list'])
     soft_dir = os.path.join(os.path.abspath(os.curdir), 'parts')
     expected_rpath_list = [os.path.join(soft_dir, software, 'lib') for
-        software in ['apache', 'libexpat', 'libxml2', 'neon', 'openssl',
+        software in ['apache', 'libexpat', 'openssl',
                      'sqlite3', 'subversion', 'zlib', 'libuuid', 'serf']]
     self.assertEqual(sorted(expected_rpath_list), elf_dict['runpath_list'])