Mercurial > gub
changeset 6339:d43e47bc70ce
Merge branch 'gcc-4.8' into gcc-4.9
Conflicts:
gub/specs/cross/gcc-core.py
| author | Masamichi Hosoda <trueroad@users.noreply.github.com> |
|---|---|
| date | Thu, 05 Feb 2015 22:40:35 +0900 |
| parents | c649e789d138 (current diff) fca2336b2266 (diff) |
| children | 56b99283872a |
| files | gub/specs/cross/gcc-core.py gub/specs/cross/gcc.py gub/specs/darwin/cross/gcc.py gub/specs/mingw-w64-runtime.py |
| diffstat | 3 files changed, 10 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/gub/specs/cross/gcc-core.py Tue Feb 03 21:13:39 2015 +0900 +++ b/gub/specs/cross/gcc-core.py Thu Feb 05 22:40:35 2015 +0900 @@ -3,7 +3,6 @@ from gub import misc class Gcc_core (gcc.Gcc__from__source): - source = 'http://ftp.gnu.org/pub/gnu/gcc/gcc-4.9.2/gcc-4.9.2.tar.bz2' dependencies = [x for x in gcc.Gcc__from__source.dependencies if x != 'glibc-core'] subpackage_names = [''] @@ -35,8 +34,8 @@ def install (self): cross.AutoBuild.install (self) self.system(''' -mkdir -p %(cross_prefix)s/lib/gcc/%(target_architecture)s/4.9.2/include/ || true -ln -s ../include-fixed/limits.h %(cross_prefix)s/lib/gcc/%(target_architecture)s/4.9.2/include/limits.h || true +mkdir -p %(install_prefix)s%(cross_dir)s/lib/gcc/%(target_architecture)s/%(full_version)s/include/ +ln -s ../include-fixed/limits.h %(install_prefix)s%(cross_dir)s/lib/gcc/%(target_architecture)s/%(full_version)s/include/limits.h ''') def languages (self): return ['c']
--- a/gub/specs/cross/gcc.py Tue Feb 03 21:13:39 2015 +0900 +++ b/gub/specs/cross/gcc.py Thu Feb 05 22:40:35 2015 +0900 @@ -89,6 +89,12 @@ ''')) def get_conflict_dict (self): return {'': ['cross/gcc-core'], 'doc': ['cross/gcc-core'], 'runtime': ['cross/gcc-core']} + def install (self): + Gcc.install (self) + self.system(''' +mkdir -p %(install_prefix)s%(cross_dir)s/lib/gcc/%(target_architecture)s/%(full_version)s/include/ +ln -s ../include-fixed/limits.h %(install_prefix)s%(cross_dir)s/lib/gcc/%(target_architecture)s/%(full_version)s/include/limits.h +''') Gcc__linux = Gcc__from__source @@ -107,12 +113,6 @@ + misc.join_lines (''' --enable-threads=posix ''')) - def patch (self): - Gcc.patch (self) - self.system(''' -ln -s usr/ %(system_root)s/mingw || true -''' - ) def get_subpackage_definitions (self): d = cross.AutoBuild.get_subpackage_definitions (self) prefix_dir = self.settings.prefix_dir @@ -126,6 +126,6 @@ self.system(''' mkdir -p %(install_prefix)s/bin/ cp %(install_prefix)s/lib/libgcc_s_*.dll %(install_prefix)s/bin/ -cp %(install_prefix)s/cross/%(target_architecture)s/lib/libstdc++-*.dll %(install_prefix)s/bin/ +cp %(install_prefix)s%(cross_dir)s/%(target_architecture)s/lib/libstdc++-*.dll %(install_prefix)s/bin/ ''' )
--- a/gub/specs/mingw-w64-runtime.py Tue Feb 03 21:13:39 2015 +0900 +++ b/gub/specs/mingw-w64-runtime.py Thu Feb 05 22:40:35 2015 +0900 @@ -32,4 +32,5 @@ rm -f %(install_prefix)s/include/iconv.h # for fontconfig failure rm -f %(install_prefix)s/lib/libiconv.a # for ghostscript failure rm -fr %(srcdir)s/mingw32/ +ln -s usr/ %(install_root)s/mingw ''', locals ())