Commit 747903a2 authored by Romain Courteaud's avatar Romain Courteaud

Disable libneon, as subversion uses system neon when serf is also enabled.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@40338 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent e92e66dc
...@@ -3,10 +3,10 @@ extends = ...@@ -3,10 +3,10 @@ extends =
../software-profiles/apache.cfg ../software-profiles/apache.cfg
../software-profiles/libdb.cfg ../software-profiles/libdb.cfg
../software-profiles/libexpat.cfg ../software-profiles/libexpat.cfg
../software-profiles/neon.cfg
../software-profiles/serf.cfg ../software-profiles/serf.cfg
../software-profiles/sqlite3.cfg ../software-profiles/sqlite3.cfg
../software-profiles/zlib.cfg ../software-profiles/zlib.cfg
../software-profiles/openssl.cfg
parts = parts =
subversion subversion
...@@ -21,7 +21,7 @@ configure-options = ...@@ -21,7 +21,7 @@ configure-options =
--with-zlib=${zlib:location} --with-zlib=${zlib:location}
--with-sqlite=${sqlite3:location} --with-sqlite=${sqlite3:location}
--without-berkeley-db --without-berkeley-db
--with-neon=${neon:location} --without-neon
--without-ssl --without-ssl
--without-sasl --without-sasl
--with-serf=${serf:location} --with-serf=${serf:location}
...@@ -39,4 +39,4 @@ configure-options = ...@@ -39,4 +39,4 @@ configure-options =
environment = environment =
CPPFLAGS=-I${libexpat:location}/include 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
...@@ -316,16 +316,16 @@ class AssertSubversion(AssertSoftwareMixin): ...@@ -316,16 +316,16 @@ class AssertSubversion(AssertSoftwareMixin):
self.assertEqual(sorted(['libsvn_client-1', 'libsvn_wc-1', 'libsvn_ra-1', 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_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_fs_fs-1', 'libsvn_fs_util-1', 'libsvn_ra_svn-1',
'libsvn_ra_neon-1', 'libsvn_delta-1', 'libsvn_subr-1', 'libsqlite3', 'libsvn_delta-1', 'libsvn_subr-1', 'libsqlite3',
'libaprutil-1', 'libapr-1', 'libuuid', 'librt', 'libneon', 'libexpat', 'libaprutil-1', 'libapr-1', 'libuuid', 'librt', 'libexpat',
'libz', 'libssl', 'libcrypto', 'libgssapi_krb5', 'libkrb5', 'libz', 'libssl', 'libcrypto',
'libk5crypto', 'libcom_err', 'libresolv', 'libc', 'libcrypt', 'libdl', 'libc', 'libcrypt', 'libdl',
'libpthread', 'libm', 'libserf-0', 'libsvn_ra_serf-1', 'libxml2' 'libpthread', 'libm', 'libserf-0', 'libsvn_ra_serf-1',
]), ]),
elf_dict['library_list']) elf_dict['library_list'])
soft_dir = os.path.join(os.path.abspath(os.curdir), 'parts') soft_dir = os.path.join(os.path.abspath(os.curdir), 'parts')
expected_rpath_list = [os.path.join(soft_dir, software, 'lib') for 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']] 'sqlite3', 'subversion', 'zlib', 'libuuid', 'serf']]
self.assertEqual(sorted(expected_rpath_list), elf_dict['runpath_list']) self.assertEqual(sorted(expected_rpath_list), elf_dict['runpath_list'])
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment