Mercurial > gub

changeset 6313:b16a1636fe99

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix darwin-x86::cross/gcc This commit can success following commands. bin/gub darwin-x86::hello bin/gub darwin-x86::lilypond
author Masamichi Hosoda <trueroad@users.noreply.github.com>
date Tue, 13 Jan 2015 22:09:33 +0900
parents 8840fa46b69b
children 8e8886596e4c
files gub/specs/darwin/cross/gcc.py patches/gcc-4.8.2-darwin-fixinc.patch patches/gcc-4.8.2-darwin-libgcc.patch
diffstat 3 files changed, 33 insertions(+), 50 deletions(-) [+]
line wrap: on
line diff
--- a/gub/specs/darwin/cross/gcc.py	Tue Jan 06 23:54:21 2015 +0900
+++ b/gub/specs/darwin/cross/gcc.py	Tue Jan 13 22:09:33 2015 +0900
@@ -7,60 +7,14 @@
 class Gcc__darwin (cross_gcc.Gcc):
     source = 'http://ftp.gnu.org/pub/gnu/gcc/gcc-4.8.2/gcc-4.8.2.tar.bz2'
     dependencies = ['odcctools']
-    def patch (self):
-        self.file_sub ([('/usr/bin/libtool', '%(cross_prefix)s/bin/%(target_architecture)s-libtool')],
-                       '%(srcdir)s/gcc/config/darwin.h')
-
-        self.file_sub ([('--strip-underscores', '--strip-underscore')],
-                       '%(srcdir)s/libstdc++-v3/scripts/make_exports.pl')
-        cross.AutoBuild.patch (self)
+    patches = cross_gcc.Gcc.patches + [
+        'gcc-4.8.2-darwin-fixinc.patch',
+        'gcc-4.8.2-darwin-libgcc.patch',
+    ]
     def languages (self):
         # objective-c is used for quartz's Carbon/Carbon.h in pango, gtk+
         return cross_gcc.Gcc.languages (self) + ['objc', 'obj-c++']
-    def rewire_gcc_libs (self):
-        # FIXME: why do we skip, please document?
-        # I get
-        '''
-/home/janneke/vc/gub/target/darwin-x86/root/usr/cross/bin/i686-apple-darwin8-ld: warning can't open dynamic library: /home/janneke/vc/gub/target/darwin-x86/root/home/janneke/vc/gub/target/darwin-x86/root/usr/cross/i686-apple-darwin8/lib/libgcc_s.1.dylib referenced from: /home/janneke/vc/gub/target/darwin-x86/root/usr/lib/libstdc++.dylib (checking for undefined symbols may be affected) (No such file or directory, errno = 2)
-'''
-        # let's try adding libstdc++.dylib?, nah, let's not
-        skip_libs = ['libgcc_s'] #, 'libstdc++']
-
-        def rewire_one (logger, file):
-            found_skips = [s for s in skip_libs if file.find (s) >= 0]
-            if found_skips:
-                return
-            id = loggedos.read_pipe (logger,
-                                     self.expand ('%(toolchain_prefix)sotool -L %(file)s', 
-                                                 locals ()),
-                                     env=self.get_substitution_dict ()).split ()[1]
-            id = os.path.split (id)[1]
-            loggedos.system (logger, 
-                             self.expand ('%(toolchain_prefix)sinstall_name_tool -id /usr/lib/%(id)s %(file)s',
-                                          locals ()),
-                             env=self.get_substitution_dict ())
-        self.map_locate (rewire_one,
-                         self.expand ('%(install_prefix)s/lib/'),
-                         '*.dylib')
     def install (self):
         cross_gcc.Gcc.install (self)
         # conflicts with darwin-SDK
         self.system ('mv %(install_prefix)s/lib/libsupc++.a %(install_prefix)s/lib/libsupc++.a-')
-        self.rewire_gcc_libs ()
-    
-class Gcc__darwin__x86 (Gcc__darwin):
-    source = 'http://ftp.gnu.org/pub/gnu/gcc/gcc-4.8.2/gcc-4.8.2.tar.bz2'
-    patches = []
-    dependencies = Gcc__darwin.dependencies + ['tools::mpfr']
-    configure_command = (''' LDFLAGS='-L%(tools_prefix)s/lib %(rpath)s' '''
-                         + Gcc__darwin.configure_command)
-
-class Version_bump_builds_but_needs_a_test_Gcc__darwin__ppc (Gcc__darwin__x86):
-    pass
-
-class Not_used__Gcc__darwin (Gcc__darwin):
-    def configure (self):
-        cross_gcc.Gcc.configure (self)
-    def install (self):
-        cross_gcc.Gcc.install (self)
-        self.rewire_gcc_libs ()
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gcc-4.8.2-darwin-fixinc.patch	Tue Jan 13 22:09:33 2015 +0900
@@ -0,0 +1,11 @@
+--- gcc-4.8.2/gcc/Makefile.in.org	2015-01-12 19:53:31.179327200 +0900
++++ gcc-4.8.2/gcc/Makefile.in	2015-01-12 19:53:52.471327200 +0900
+@@ -4214,7 +4214,7 @@
+ 	      export TARGET_MACHINE srcdir SHELL MACRO_LIST && \
+ 	      cd $(build_objdir)/fixincludes && \
+ 	      $(SHELL) ./fixinc.sh "$${gcc_dir}/$${fix_dir}" \
+-	        $(SYSTEM_HEADER_DIR) $(OTHER_FIXINCLUDES_DIRS) ); \
++	        $(SYSTEM_HEADER_DIR) $(OTHER_FIXINCLUDES_DIRS) || true ); \
+ 	    rm -f $${fix_dir}/syslimits.h; \
+ 	    if [ -f $${fix_dir}/limits.h ]; then \
+ 	      mv $${fix_dir}/limits.h $${fix_dir}/syslimits.h; \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gcc-4.8.2-darwin-libgcc.patch	Tue Jan 13 22:09:33 2015 +0900
@@ -0,0 +1,18 @@
+--- gcc-4.8.2/libgcc/config/t-slibgcc-darwin.org	2015-01-12 23:49:10.689670300 +0900
++++ gcc-4.8.2/libgcc/config/t-slibgcc-darwin	2015-01-12 23:49:40.989670300 +0900
+@@ -29,11 +29,11 @@
+ 
+ # we're only going to build the stubs if the target slib is /usr/lib
+ # there is no other case in which they're useful in a live system.
+-ifeq (/usr/lib,$(shlib_slibdir))
++#ifeq (/usr/lib,$(shlib_slibdir))
+ LGCC_STUBS = libgcc_s.10.4.dylib libgcc_s.10.5.dylib
+-else
+-LGCC_STUBS =
+-endif
++#else
++#LGCC_STUBS =
++#endif
+ 
+ LGCC_FILES = libgcc_s.$(SHLIB_SOVERSION)$(SHLIB_EXT)
+ LGCC_FILES += $(LGCC_STUBS)