Mercurial > gub

changeset 5566:a046a34a63dd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Ugh, more cross.gcc import fixes.
author Jan Nieuwenhuizen <janneke@gnu.org>
date Wed, 16 Sep 2009 11:07:33 +0200
parents aa2e877c69e1
children 20592e0c6bd8
files gub/specs/debian/cross/gcc-34.py gub/specs/freebsd/cross/gcc.py gub/specs/linux-arm-softfloat/cross/gcc.py
diffstat 3 files changed, 12 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/gub/specs/debian/cross/gcc-34.py	Wed Sep 16 08:55:20 2009 +0200
+++ b/gub/specs/debian/cross/gcc-34.py	Wed Sep 16 11:07:33 2009 +0200
@@ -1,11 +1,11 @@
-from gub.specs.cross import gcc
+from gub.specs.cross import gcc as cross_gcc
 
-class Gcc_34__debian__mipsel (gcc.Gcc):
+class Gcc_34__debian__mipsel (cross_gcc.Gcc):
     def languages (self):
         return  ['c']
         
     def configure_command (self):
-        return misc.join_lines (gcc.Gcc.configure_command (self)
+        return misc.join_lines (cross_gcc.Gcc.configure_command (self)
                                + '''
 --program-suffix=-3.4
 --with-ar=%(cross_prefix)s/bin/%(target_architecture)s-ar
@@ -13,13 +13,13 @@
 ''')
 
     def configure (self):
-        gcc.Gcc.configure (self)
+        cross_gcc.Gcc.configure (self)
         #FIXME: --with-ar, --with-nm does not work?
         for i in ('ar', 'nm', 'ranlib'):
             self.system ('cd %(cross_prefix)s/bin && ln -sf %(target_architecture)s-%(i)s %(target_architecture)s-%(i)s-3.4', env=locals ())
                 
     def install (self):
-        gcc.Gcc.install (self)
+        cross_gcc.Gcc.install (self)
         # get rid of duplicates
         self.system ('''
 rm -f %(install_prefix)s/lib/libgcc_s.so
--- a/gub/specs/freebsd/cross/gcc.py	Wed Sep 16 08:55:20 2009 +0200
+++ b/gub/specs/freebsd/cross/gcc.py	Wed Sep 16 11:07:33 2009 +0200
@@ -1,8 +1,8 @@
-from gub.specs.cross import gcc
+from gub.specs.cross import gcc as cross_gcc
 
-class Gcc__freebsd (gcc.Gcc):
+class Gcc__freebsd (cross_gcc.Gcc):
     #source = 'ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.2/gcc-4.1.2.tar.bz2'
     #source = 'ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.1.1/gcc-4.1.1.tar.bz2'
     source = 'ftp://ftp.gnu.org/pub/gnu/gcc/gcc-4.3.2/gcc-4.3.2.tar.bz2'
     def _get_build_dependencies (self):
-        return gcc.Gcc._get_build_dependencies (self) + ['tools::mpfr']
+        return cross_gcc.Gcc._get_build_dependencies (self) + ['tools::mpfr']
--- a/gub/specs/linux-arm-softfloat/cross/gcc.py	Wed Sep 16 08:55:20 2009 +0200
+++ b/gub/specs/linux-arm-softfloat/cross/gcc.py	Wed Sep 16 11:07:33 2009 +0200
@@ -1,17 +1,17 @@
 from gub import mirrors
-from gub.specs.cross import gcc
+from gub.specs.cross import gcc as cross_gcc
 from gub import misc
 
-class Gcc (gcc.Gcc_from_source):
+class Gcc (cross_gcc.Gcc_from_source):
     source = 'ftp://ftp.gnu.org/pub/gnu/gcc/gcc-3.4.6/gcc-3.4.6.tar.bz2'
     def patch (self):
-        gcc.Gcc_from_source.patch (self)
+        cross_gcc.Gcc_from_source.patch (self)
         self.system ('''
 cd %(srcdir)s && patch -p1 < %(patchdir)s/gcc-3.4.0-arm-lib1asm.patch
 cd %(srcdir)s && patch -p1 < %(patchdir)s/gcc-3.4.0-arm-nolibfloat.patch
 ''')
     def configure_command (self):
-        return (gcc.Gcc_from_source.configure_command (self)
+        return (cross_gcc.Gcc_from_source.configure_command (self)
                 + misc.join_lines ('''
 --with-float=soft
 #--with-fpu=vfp