Mercurial > gub
changeset 6270:f9185fa0f3cb
Fix linux-x86::gcc-core
libgcc
| author | Masamichi Hosoda <trueroad@users.noreply.github.com> |
|---|---|
| date | Mon, 10 Nov 2014 22:03:28 +0900 |
| parents | 375a63fd9034 |
| children | 9cf230339b9d |
| files | gub/specs/cross/gcc-core.py gub/specs/glibc-core.py patches/glibc-2.3-core-elf-makefile.patch |
| diffstat | 3 files changed, 6 insertions(+), 28 deletions(-) [+] |
line wrap: on
line diff
--- a/gub/specs/cross/gcc-core.py Sat Nov 08 23:46:22 2014 +0900 +++ b/gub/specs/cross/gcc-core.py Mon Nov 10 22:03:28 2014 +0900 @@ -24,15 +24,16 @@ --enable-threads=no --without-headers --disable-shared +--disable-decimal-float ''')) - make_flags = gcc.Gcc.make_flags + ' all-gcc' + make_flags = gcc.Gcc.make_flags + ' all-gcc all-target-libgcc' install_flags = (gcc.Gcc.install_flags - .replace (' install', ' install-gcc')) + .replace (' install', + ' install-gcc install-target-libgcc')) # Gcc moves libs into system lib places, which will # make gcc-core conflict with gcc. - install = cross.AutoBuild.install def install (self): - gcc.Gcc__from__source.install (self) + cross.AutoBuild.install (self) self.system(''' mkdir -p %(cross_prefix)s/lib/gcc/%(target_architecture)s/4.8.2/include/ || true ln -s ../include-fixed/limits.h %(cross_prefix)s/lib/gcc/%(target_architecture)s/4.8.2/include/limits.h || true
--- a/gub/specs/glibc-core.py Sat Nov 08 23:46:22 2014 +0900 +++ b/gub/specs/glibc-core.py Mon Nov 10 22:03:28 2014 +0900 @@ -6,10 +6,7 @@ class Glibc_core (glibc.Glibc): source = 'http://lilypond.org/download/gub-sources/glibc-2.3-20070416.tar.bz2' - patches = glibc.Glibc.patches + [ - 'glibc-2.3-core-install.patch', - 'glibc-2.3-core-elf-makefile.patch', - ] + patches = glibc.Glibc.patches + ['glibc-2.3-core-install.patch'] dependencies = ['cross/gcc-core', 'linux-headers', 'tools::bison'] configure_flags = (glibc.Glibc.configure_flags + misc.join_lines ('''
--- a/patches/glibc-2.3-core-elf-makefile.patch Sat Nov 08 23:46:22 2014 +0900 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,20 +0,0 @@ ---- a/elf/Makefile 2005-07-18 10:19:48.000000000 +0900 -+++ b/elf/Makefile 2014-11-02 20:25:51.969531800 +0900 -@@ -243,7 +243,7 @@ - - $(objpfx)librtld.map: $(objpfx)dl-allobjs.os $(common-objpfx)libc_pic.a - @-rm -f $@T -- $(reloc-link) -o $@.o '-Wl,-(' $^ -lgcc '-Wl,-)' -Wl,-Map,$@T -+ $(reloc-link) -o $@.o '-Wl,-(' $^ '-Wl,-)' -Wl,-Map,$@T - rm -f $@.o - mv -f $@T $@ - -@@ -272,7 +272,7 @@ - $(MAKE) -f $< -f rtld-Rules - - $(objpfx)librtld.os: $(objpfx)dl-allobjs.os $(objpfx)rtld-libc.a -- $(LINK.o) -nostdlib -nostartfiles -r -o $@ '-Wl,-(' $^ -lgcc '-Wl,-)' \ -+ $(LINK.o) -nostdlib -nostartfiles -r -o $@ '-Wl,-(' $^ '-Wl,-)' \ - -Wl,-Map,$@.map - - generated += librtld.map librtld.mk rtld-libc.a librtld.os.map