Mercurial > gub

changeset 3202:47cad10ce541

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Oops, put default arm selection back.
author Jan Nieuwenhuizen <janneke@gnu.org>
date Fri, 13 Apr 2007 17:23:35 +0200
parents f02f5e27a3fa
children 0c9522fc71a6 4658016ec859
files lib/arm.py lib/debian.py
diffstat 2 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/lib/arm.py	Fri Apr 13 17:07:46 2007 +0200
+++ b/lib/arm.py	Fri Apr 13 17:23:35 2007 +0200
@@ -18,11 +18,12 @@
 
 def get_cross_packages_pre_eabi (settings):
     binutils_version = '2.16.1'
-    gcc_version = '3.4.6' # only change
+    gcc_version = '3.4.3' # only change
     guile_version = '1.6.7'
     kernel_version = '2.5.999-test7-bk-17'
     libc6_version = '2.3.2.ds1-22sarge4'
     python_version = '2.4.1'
+    import debian
     return debian._get_cross_packages (settings,
                                        binutils_version, gcc_version,
                                        guile_version,
--- a/lib/debian.py	Fri Apr 13 17:07:46 2007 +0200
+++ b/lib/debian.py	Fri Apr 13 17:23:35 2007 +0200
@@ -71,10 +71,10 @@
 cd %(srcdir)s && patch -p1 < %(patchdir)s/gcc-4.1.1-ppc-unwind.patch
 ''')
         # KUCH, KUCH
-        if (self.vc_repository._version == '3.4.6'
+        if (self.vc_repository._version == '3.4.3'
             and self.settings.platform == 'arm'):
             self.system ('''
-cd %(srcdir)s && patch -p1 < %(patchdir)s/gcc-3.4.3-arm-softvfp.patch
+cd %(srcdir)s && patch -p1 < %(patchdir)s/gcc-3.4.3-arm-softvfp-jcn.patch
 ''')