Mercurial > gub

changeset 5180:3322bb727ce5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Junk LIBRESTRICT_ALLOW=/usr/lib/gcc:/usr/libexec/gcc.
author Jan Nieuwenhuizen <janneke@gnu.org>
date Wed, 18 Feb 2009 14:41:57 +0100
parents 68f0c4f4c893
children 2b174d2fd938
files gub/cross.py gub/misc.py gub/specs/freetype.py gub/target.py
diffstat 4 files changed, 3 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/gub/cross.py	Wed Feb 18 14:40:51 2009 +0100
+++ b/gub/cross.py	Wed Feb 18 14:41:57 2009 +0100
@@ -22,9 +22,6 @@
             + misc.append_path (os.environ.get ('CPLUS_INCLUDE_PATH', '')),
             'LIBRARY_PATH': '%(tools_prefix)s/lib'
             + misc.append_path (os.environ.get ('LIBRARY_PATH', '')),
-            'LIBRESTRICT_ALLOW': '/usr/lib/gcc:/usr/libexec/gcc',
-            # Not needed?
-            # 'LIBRESTRICT_ALLOW': misc.librestrict_allow (),
             'LIBRESTRICT_IGNORE': '%(tools_prefix)s/bin/make',
             'PATH': '%(cross_prefix)s/bin:%(tools_prefix)s/bin:' + os.environ['PATH'],
         }
@@ -250,9 +247,6 @@
     x86_bindir = x86_cross + '/bin'
     x86_cross_bin = x86_cross + '/i686-linux' + '/bin'
     env['PATH'] = x86_cross_bin + ':' + env['PATH']
-    # FIXME: c&p, cannot access package's target dict.
-    # env['LIBRESTRICT_ALLOW'] = package.settings.targetdir + misc.append_path (package.get_substitution_dict ().get ('LIBRESTRICT_ALLOW', ''))
-    env['LIBRESTRICT_ALLOW'] = package.settings.targetdir + ':/usr/lib/gcc:/usr/libexec/gcc'
     env['CC'] = x86_cross_bin + '/gcc'
     env['CXX'] = x86_cross_bin + '/g++'
     # FIXME: should only remove any %(tools_prefix)s elements from these...
--- a/gub/misc.py	Wed Feb 18 14:40:51 2009 +0100
+++ b/gub/misc.py	Wed Feb 18 14:41:57 2009 +0100
@@ -644,6 +644,8 @@
     # Better install awk, grep, sed
     bin = []
     usr_bin = []
+    # Patched gcc
+    gcc = []
     return (':'.join (['/bin/' + x for x in bin]
                       + ['/usr/bin/' + x for x in usr_bin]
                       + gcc)
--- a/gub/specs/freetype.py	Wed Feb 18 14:40:51 2009 +0100
+++ b/gub/specs/freetype.py	Wed Feb 18 14:41:57 2009 +0100
@@ -17,7 +17,7 @@
         # build system is unix??
         # target.append_target_dict (self, {'LIBRESTRICT_ALLOW': '/sbin:/usr/sbin:/hurd'})
         if 'stat' in misc.librestrict ():
-            target.add_target_dict (self, {'LIBRESTRICT_ALLOW': '/usr/lib/gcc:/usr/libexec/gcc:/sbin:/usr/sbin:/hurd:${LIBRESTRICT_ALLOW-/foo}'})
+            target.add_target_dict (self, {'LIBRESTRICT_ALLOW': '/sbin:/usr/sbin:/hurd:${LIBRESTRICT_ALLOW-/foo}'})
     def license_files (self):
         return ['%(srcdir)s/docs/LICENSE.TXT']
     def _get_build_dependencies (self):
--- a/gub/target.py	Wed Feb 18 14:40:51 2009 +0100
+++ b/gub/target.py	Wed Feb 18 14:41:57 2009 +0100
@@ -137,7 +137,6 @@
             'CC_FOR_BUILD': 'C_INCLUDE_PATH= CPATH= CPPFLAGS= LIBRARY_PATH= cc',
             'CCLD_FOR_BUILD': 'C_INCLUDE_PATH= CPATH= CPPFLAGS= LIBRARY_PATH= cc',
             'LDFLAGS_FOR_BUILD': '',
-            'LIBRESTRICT_ALLOW': misc.librestrict_allow (),
             'C_INCLUDE_PATH': '',
             'CPATH': '',
             'CPLUS_INCLUDE_PATH': '',