Mercurial > gub

changeset 6312:1f3e327a8956

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge branch 'gcc-4.8' into gcc-4.9 Conflicts: gub/specs/cross/gcc.py gub/specs/mingw-w64-runtime.py
author Masamichi Hosoda <trueroad@users.noreply.github.com>
date Tue, 13 Jan 2015 20:54:47 +0900
parents f439d5b0f5f8 (current diff) 8840fa46b69b (diff)
children f0f93d6d632c
files gub/specs/cross/gcc.py gub/specs/freebsd/cross/gcc.py gub/specs/mingw-w64-runtime.py
diffstat 7 files changed, 31 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/gub/repository.py	Mon Jan 05 21:05:11 2015 +0900
+++ b/gub/repository.py	Tue Jan 13 20:54:47 2015 +0900
@@ -565,7 +565,7 @@
         #if self.oslog:  #urg, will be fixed when .source is mandatory
         #    _v = self.oslog.verbose_flag ()
         _v = ''   #     self.oslog.verbose_flag ()
-        self.system ('7z x %(_v)s %(tarball)s -o%(destdir)s' % locals ())
+        self.system ('7za x %(_v)s %(tarball)s -o%(destdir)s' % locals ())
 
 RepositoryProxy.register (SevenZFile)
 
--- a/gub/specs/cross/gcc.py	Mon Jan 05 21:05:11 2015 +0900
+++ b/gub/specs/cross/gcc.py	Tue Jan 13 20:54:47 2015 +0900
@@ -9,8 +9,17 @@
 
 class Gcc (cross.AutoBuild):
     source = 'http://ftp.gnu.org/pub/gnu/gcc/gcc-4.9.2/gcc-4.9.2.tar.bz2'
-    dependencies = ['cross/binutils', 'system::gcc', 'system::g++']
+    dependencies = [
+        'cross/binutils',
+        'system::gcc',
+        'system::g++',
+        'tools::gmp',
+        'tools::mpfr',
+        'tools::mpc',
+    ]
     patches = ['gcc-4.8.2-libstdc++-debug-path.patch']
+    configure_command = (''' LDFLAGS='-L%(tools_prefix)s/lib %(rpath)s' '''
+                         + cross.AutoBuild.configure_command)
     configure_flags = (cross.AutoBuild.configure_flags
                 + '%(enable_languages)s'
                 + ' --enable-static'
--- a/gub/specs/freebsd/cross/gcc.py	Mon Jan 05 21:05:11 2015 +0900
+++ b/gub/specs/freebsd/cross/gcc.py	Tue Jan 13 20:54:47 2015 +0900
@@ -2,9 +2,6 @@
 from gub import misc
 
 class Gcc__freebsd (cross_gcc.Gcc):
-    dependencies = cross_gcc.Gcc.dependencies + ['tools::mpfr']
-    configure_command = (''' LDFLAGS='-L%(tools_prefix)s/lib %(rpath)s' '''
-                         + cross_gcc.Gcc.configure_command)
     configure_flags = (cross_gcc.Gcc.configure_flags
                 + misc.join_lines ('''
 --program-prefix=%(toolchain_prefix)s
--- a/gub/specs/gmp.py	Mon Jan 05 21:05:11 2015 +0900
+++ b/gub/specs/gmp.py	Tue Jan 13 20:54:47 2015 +0900
@@ -6,14 +6,14 @@
 from gub import tools
 
 class Gmp (target.AutoBuild):
-    source = 'http://ftp.gnu.org/pub/gnu/gmp/gmp-5.1.3.tar.gz'
+    source = 'http://ftp.gnu.org/pub/gnu/gmp/gmp-6.0.0a.tar.xz'
     def __init__ (self, settings, source):
         target.AutoBuild.__init__ (self, settings, source)
         if not self.settings.platform.startswith ('darwin'):
             self.target_architecture = re.sub ('i[0-9]86-', 'i386-', settings.target_architecture)
         if 'stat' in misc.librestrict ():
             build.add_dict (self, {'LIBRESTRICT_IGNORE': '%(tools_prefix)s/bin/bash'})
-    dependencies = ['libtool', 'tools::autoconf', 'tools::automake', 'tools::bison', 'tools::flex', 'tools::libtool']
+    dependencies = ['libtool', 'tools::autoconf', 'tools::automake', 'tools::bison', 'tools::flex', 'tools::libtool', 'tools::xzutils']
     configure_flags = (target.AutoBuild.configure_flags
                        + ' --disable-cxx ')
     def configure (self):
@@ -40,9 +40,6 @@
         self.file_sub ([('using std::FILE;','')],
                        '%(install_prefix)s/include/gmp.h')
 
-class Gmp__darwin__x86 (Gmp__darwin):
-    source = 'http://ftp.gnu.org/pub/gnu/gmp/gmp-4.2.4.tar.gz'
-
 class Gmp__mingw (Gmp):
     patches = []
     def __init__ (self, settings, source):
@@ -55,11 +52,8 @@
 mv %(install_prefix)s/lib/*dll %(install_prefix)s/bin || true
 ''')
 
-class Gmp__freebsd (Gmp):
-    source = 'http://ftp.gnu.org/pub/gnu/gmp/gmp-4.2.4.tar.gz'
-
 class Gmp__tools (tools.AutoBuild, Gmp):
-    dependencies = ['bison', 'flex', 'libtool']
+    dependencies = ['bison', 'flex', 'libtool', 'xzutils']
     configure_variables = (tools.AutoBuild.configure_variables
                            # avoid __isoc99_fscanf@@GLIBC_2.7 etc
                            + ' CPPFLAGS=-D_GNU_SOURCE')
--- a/gub/specs/mingw-w64-runtime.py	Mon Jan 05 21:05:11 2015 +0900
+++ b/gub/specs/mingw-w64-runtime.py	Tue Jan 13 20:54:47 2015 +0900
@@ -2,7 +2,7 @@
 
 class Mingw_w64_runtime (build.BinaryBuild, build.SdkBuild):
     source = 'http://sourceforge.net/projects/mingw-w64/files/Toolchains%%20targetting%%20Win32/Personal%%20Builds/mingw-builds/4.9.2/threads-posix/sjlj/i686-4.9.2-release-posix-sjlj-rt_v3-rev1.7z'
-    dependencies = [ 'system::7z' ]
+    dependencies = [ 'tools::p7zip' ]
     subpackage_names = ['winpthread-dll', '']
     def get_subpackage_definitions (self):
         d = build.BinaryBuild.get_subpackage_definitions (self)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gub/specs/mpc.py	Tue Jan 13 20:54:47 2015 +0900
@@ -0,0 +1,5 @@
+from gub import tools
+
+class Mpc__tools (tools.AutoBuild):
+    source = 'http://ftp.gnu.org/gnu/mpc/mpc-1.0.2.tar.gz'
+    dependencies = ['gmp', 'mpfr']
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gub/specs/p7zip.py	Tue Jan 13 20:54:47 2015 +0900
@@ -0,0 +1,11 @@
+from gub import tools
+
+class P7zip__tools (tools.MakeBuild):
+    source = 'http://sourceforge.net/projects/p7zip/files/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2'
+    dependencies = [ 'bzip2' ]
+    install_flags = ' DEST_HOME=%(install_prefix)s install'
+    def patch (self):
+        tools.MakeBuild.patch (self)
+        self.system('''
+sed -i -e 's/chmod 555/chmod 755/' -e 's/chmod 444/chmod 644/' %(srcdir)s/install.sh
+''')