Mercurial > gub

changeset 5453:634039d6e746

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fakeroot and fakechroot script fixes.
author Jan Nieuwenhuizen <janneke@gnu.org>
date Wed, 29 Jul 2009 11:22:06 +0200
parents 3afc2c1c2374
children d26933eaeeb9
files gub/specs/fakechroot.py gub/specs/fakeroot.py
diffstat 2 files changed, 12 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/gub/specs/fakechroot.py	Wed Jul 29 11:21:52 2009 +0200
+++ b/gub/specs/fakechroot.py	Wed Jul 29 11:22:06 2009 +0200
@@ -9,8 +9,13 @@
             ]
     def configure_command (self):
         return (tools.AutoBuild.configure_command (self)
-                + ''' LDFLAGS='-L%(system_prefix)s/lib -ldl' '''
+                + ''' LDFLAGS='-L%(system_prefix)s/lib %(rpath)s -ldl' '''
                 + ' CC=%(system_prefix)s/bin/%(toolchain_prefix)sgcc'
                 + ' CCLD=%(system_prefix)s/bin/%(toolchain_prefix)sgcc'
                 + ' CXX=%(system_prefix)s/bin/%(toolchain_prefix)sg++'
                 )
+    def compile (self):
+        tools.AutoBuild.compile (self)
+        self.file_sub ([('BINDIR=.*', 'BINDIR=%(system_prefix)s/bin'),
+                        ('PATHS=', 'PATHS=%(system_prefix)s/lib:'),],
+                       '%(builddir)s/scripts/fakechroot')
--- a/gub/specs/fakeroot.py	Wed Jul 29 11:21:52 2009 +0200
+++ b/gub/specs/fakeroot.py	Wed Jul 29 11:22:06 2009 +0200
@@ -9,8 +9,13 @@
             ]
     def configure_command (self):
         return (tools.AutoBuild.configure_command (self)
-                + ''' LDFLAGS='-L%(system_prefix)s/lib -ldl' '''
+                + ''' LDFLAGS='-L%(system_prefix)s/lib %(rpath)s -ldl' '''
                 + ' CC=%(system_prefix)s/bin/%(toolchain_prefix)sgcc'
                 + ' CCLD=%(system_prefix)s/bin/%(toolchain_prefix)sgcc'
                 + ' CXX=%(system_prefix)s/bin/%(toolchain_prefix)sg++'
                 )
+    def compile (self):
+        tools.AutoBuild.compile (self)
+        self.file_sub ([('BINDIR=.*', 'BINDIR=%(system_prefix)s/bin'),
+                        ('PATHS=', 'PATHS=%(system_prefix)s/lib:'),],
+                       '%(builddir)s/scripts/fakeroot')