Author: arfrever
Date: Mon Jul 18 23:19:43 2011
New Revision: 1148094
URL: http://svn.apache.org/viewvc?rev=1148094&view=rev
Log:
Restore special handling of libsvn_auth_gnome_keyring and libsvn_auth_kwallet
in transform_libtool_scripts.sh, which was lost in r1049944.
* build/generator/gen_make.py
(Generator.write_transform_libtool_scripts): Set paths to
libsvn_auth_gnome_keyring
and libsvn_auth_kwallet libraries.
(Generator._get_all_lib_deps): Add libsvn_auth_gnome_keyring and
libsvn_auth_kwallet
as dependencies of libsvn_subr.
Modified:
subversion/trunk/build/generator/gen_make.py
Modified: subversion/trunk/build/generator/gen_make.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_make.py?rev=1148094&r1=1148093&r2=1148094&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_make.py (original)
+++ subversion/trunk/build/generator/gen_make.py Mon Jul 18 23:19:43 2011
@@ -531,6 +531,8 @@ DIR=`pwd`
''')
libdep_cache = {}
paths = {}
+ for lib in ('libsvn_auth_gnome_keyring', 'libsvn_auth_kwallet'):
+ paths[lib] = self.sections[lib].options.get('path')
for target_ob in install_sources:
if not isinstance(target_ob, gen_base.TargetExe):
continue
@@ -560,6 +562,8 @@ DIR=`pwd`
libs.add(lib_name)
for lib in self._get_all_lib_deps(lib_name, libdep_cache, paths):
libs.add(lib)
+ if target_name == 'libsvn_subr':
+ libs.update(('libsvn_auth_gnome_keyring', 'libsvn_auth_kwallet'))
libdep_cache[target_name] = sorted(libs)
return libdep_cache[target_name]
