diff options
Diffstat (limited to 'devel/subversion/patches/patch-ah')
| -rw-r--r-- | devel/subversion/patches/patch-ah | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/devel/subversion/patches/patch-ah b/devel/subversion/patches/patch-ah index 93853a96da1..a6cc6495245 100644 --- a/devel/subversion/patches/patch-ah +++ b/devel/subversion/patches/patch-ah @@ -1,6 +1,6 @@ -$NetBSD: patch-ah,v 1.3 2006/01/02 21:13:45 epg Exp $ +$NetBSD: patch-ah,v 1.4 2006/09/11 04:14:31 epg Exp $ ---- build/generator/gen_make.py.orig 2005-10-25 08:49:37.000000000 -0400 +--- build/generator/gen_make.py.orig 2006-04-05 12:12:48.000000000 -0400 +++ build/generator/gen_make.py @@ -5,6 +5,7 @@ import os @@ -9,8 +9,8 @@ $NetBSD: patch-ah,v 1.3 2006/01/02 21:13:45 epg Exp $ +import ConfigParser import gen_base - import generator.util.executable -@@ -41,6 +42,13 @@ class Generator(gen_base.GeneratorBase): + import generator.swig.header_wrappers +@@ -53,6 +54,13 @@ class Generator(gen_base.GeneratorBase): install_deps = self.graph.get_deps(gen_base.DT_INSTALL) install_sources = self.graph.get_all_sources(gen_base.DT_INSTALL) @@ -24,7 +24,7 @@ $NetBSD: patch-ah,v 1.3 2006/01/02 21:13:45 epg Exp $ # ensure consistency between runs install_deps.sort() install_sources.sort(lambda s1, s2: cmp(s1.name, s2.name)) -@@ -56,11 +64,17 @@ class Generator(gen_base.GeneratorBase): +@@ -68,11 +76,17 @@ class Generator(gen_base.GeneratorBase): # construct a list of the other .la libs to link against retreat = build_path_retreat(target.path) @@ -44,12 +44,12 @@ $NetBSD: patch-ah,v 1.3 2006/01/02 21:13:45 epg Exp $ deps.append(source.filename) link.append(build_path_join(retreat, source.filename)) -@@ -245,6 +259,8 @@ class Generator(gen_base.GeneratorBase): - elif isinstance(link_dep, gen_base.TargetLinked): - if link_dep.external_lib: - libs.append(link_dep.external_lib) +@@ -216,6 +230,8 @@ class Generator(gen_base.GeneratorBase): + # expeditiously. It is of questionable validity for a build + # node to have external_project but not have external_lib. + pass + elif link_dep.name in self.installed_libs: + libs.append('-l%s-%s' % (link_dep.name[3:], self.version)) else: # append the output of the target to our stated dependencies - deps.append(link_dep.filename) + if not self.assume_shared_libs: |