Mercurial > gub

changeset 5764:0ee4029ff230

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
gcc-2-95: rename from gcc-2.95, fixing -ancient install directories.
author Jan Nieuwenhuizen <janneke@gnu.org>
date Tue, 13 Oct 2009 11:13:12 +0200
parents 6cc672d2109d
children 1d0d06df5726
files gub/specs/cross/gcc-2-95.py gub/specs/cross/gcc-2.95.py gub/specs/lilypond-ancient.py
diffstat 3 files changed, 52 insertions(+), 42 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gub/specs/cross/gcc-2-95.py	Tue Oct 13 11:13:12 2009 +0200
@@ -0,0 +1,51 @@
+from gub import cross
+from gub import misc
+from gub.specs import gcc
+from gub.specs.cross import gcc as cross_gcc
+
+class Gcc_2_95 (cross_gcc.Gcc):
+    source = 'http://ftp.gnu.org/pub/gnu/gcc/gcc-2.95.3/gcc-everything-2.95.3.tar.gz'
+    configure_flags = (cross_gcc.Gcc.configure_flags
+                       + ' --build=i686-linux'
+                       + ' --host=i686-linux'
+                       )
+    cross_dir = '/cross-ancient'
+    cross_prefix = '%(system_prefix)s%(cross_dir)s'
+    dependencies = cross_gcc.Gcc.dependencies + ['glibc']
+    parallel_build_broken = True
+    make_flags = misc.join_lines ('''
+tooldir='%(system_prefix)s/cross/%(target_architecture)s'
+gcc_tooldir='%(prefix_dir)s/%(target_architecture)s'
+''')
+    destdir_install_broken = True
+    
+    install_flags_destdir_broken = (cross_gcc.Gcc.install_flags_destdir_broken
+#                                    .replace ('((aclocaldir|bindir|datadir|exec_prefix|gcc_tooldir|includedir|xinfodir|libdir|libexecdir|xmandir|xprefix|sysconfdir|tooldir)=%[(]install_prefix[)]s)', r'\1%(cross_dir)s')
+                                    .replace ('%(install_prefix)s', r'%(install_prefix)s%(cross_dir)s')
+                                    .replace ('bindir=%(install_prefix)s%(cross_dir)s/bin',
+                                              'bindir=%(install_prefix)s/%(cross_dir)s/%(target_architecture)s/bin')
+                                    .replace ('infodir=%(install_prefix)s%(cross_dir)s',
+                                              'infodir=%(install_prefix)s')
+                                    .replace ('mandir=%(install_prefix)s%(cross_dir)s',
+                                              'mandir=%(install_prefix)s')
+                                    )
+    def pre_install (self):
+        cross.AutoBuild.pre_install (self)
+        # Only id <PREFIX>/<TARGET-ARCH>/bin exists, gcc's install installs
+        # the plain gcc drivers without <TOOLCHAIN-PREFIX>gcc
+        self.system ('mkdir -p %(install_prefix)s%(cross_dir)s/bin')
+        self.system ('mkdir -p %(install_prefix)s%(cross_dir)s/%(target_architecture)s/bin')
+    def install (self):
+        # Gcc moves libs into system lib places, which will
+        # make gcc-core conflict with gcc.
+#        cross_gcc.Gcc.install (self)
+        cross.AutoBuild.install (self)
+        gcc.install_missing_archprefix_binaries (self)
+    def __init__ (self, settings, source):
+        cross_gcc.Gcc.__init__ (self, settings, source)
+        if self.settings.build_bits == '64':
+            # Allow building on 64 bits buid platform
+            # [requires: apt-get install gcc-multilib]
+            self.configure_command = (''' CC='gcc -m32 -D_FORTIFY_SOURCE=0' '''
+                                      + self.configure_command)
+            self.make_flags += ''' CFLAGS='-g -Wa,--32 -Wl,--architecture=i686-linux' '''
--- a/gub/specs/cross/gcc-2.95.py	Tue Oct 13 10:05:30 2009 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-from gub import cross
-from gub import misc
-from gub.specs import gcc
-from gub.specs.cross import gcc as cross_gcc
-
-class Gcc_2_95 (cross_gcc.Gcc):
-    source = 'http://ftp.gnu.org/pub/gnu/gcc/gcc-2.95.3/gcc-everything-2.95.3.tar.gz'
-    configure_flags = (cross_gcc.Gcc.configure_flags
-#                       .replace ('(%[(]cross_prefix[)]s)', r'\1%(cross_suffix)s')
-                       + ' --build=i686-linux'
-                       + ' --host=i686-linux'
-                       )
-#    cross_suffix = '-ancient'
-    cross_dir = '/cross-ancient'
-    cross_prefix = '%(system_prefix)s%(cross_dir)s'
-    dependencies = cross_gcc.Gcc.dependencies + ['glibc']
-    parallel_build_broken = True
-    make_flags = misc.join_lines ('''
-tooldir='%(system_prefix)s/cross/%(target_architecture)s'
-gcc_tooldir='%(prefix_dir)s/%(target_architecture)s'
-''')
-    destdir_install_broken = True
-    
-    install_flags_destdir_broken = (cross_gcc.Gcc.install_flags_destdir_broken
-                                    .replace ('((aclocaldir|bindir|datadir|exec_prefix|gcc_tooldir|includedir|xinfodir|libdir|libexecdir|xmandir|xprefix|sysconfdir|tooldir)=%[(]install_prefix[)]s)', r'\1/%(cross_dir)s')
-                                    .replace ('bindir=%(install_prefix)s%(cross_dir)s/bin',
-                                              'bindir=%(install_prefix)s/%(cross_dir)s/%(toolchain_prefix)s'))
-    def install (self):
-        # Gcc moves libs into system lib places, which will
-        # make gcc-core conflict with gcc.
-#        cross_gcc.Gcc.install (self)
-        cross.AutoBuild.install (self)
-        gcc.install_missing_archprefix_binaries (self)
-    def __init__ (self, settings, source):
-        cross_gcc.Gcc.__init__ (self, settings, source)
-        if self.settings.build_bits == '64':
-            # Allow building on 64 bits buid platform
-            # [requires: apt-get install gcc-multilib]
-            self.configure_command = (''' CC='gcc -m32 -D_FORTIFY_SOURCE=0' '''
-                                      + self.configure_command)
-            self.make_flags += ''' CFLAGS='-g -Wa,--32 -Wl,--architecture=i686-linux' '''
--- a/gub/specs/lilypond-ancient.py	Tue Oct 13 10:05:30 2009 +0200
+++ b/gub/specs/lilypond-ancient.py	Tue Oct 13 11:13:12 2009 +0200
@@ -10,7 +10,7 @@
     dependencies = [x for x in lilypond.LilyPond__simple.dependencies
                     if not x in ['system::mf', 'system::mpost']] + [
         'texlive',
-        'cross/gcc-2.95',
+        'cross/gcc-2-95',
         ]
     # got no autoconf-2.13
     # force_autoupdate = True