Commit 93aa4dc4 authored by Chris Thurber's avatar Chris Thurber Committed by GitHub

Merge pull request #2630 from uberhacker/update-gcc7-package

Update gcc7 from 7.3.0-2 to 7.3.0-3
parents ddb1977a a76df90e
...@@ -3,31 +3,31 @@ require 'package' ...@@ -3,31 +3,31 @@ require 'package'
class Gcc7 < Package class Gcc7 < Package
description 'The GNU Compiler Collection includes front ends for C, C++, Objective-C, Fortran, Ada, and Go.' description 'The GNU Compiler Collection includes front ends for C, C++, Objective-C, Fortran, Ada, and Go.'
homepage 'https://www.gnu.org/software/gcc/' homepage 'https://www.gnu.org/software/gcc/'
version '7.3.0-2' version '7.3.0-3'
source_url 'https://github.com/gcc-mirror/gcc/archive/gcc-7_3_0-release.tar.gz' source_url 'https://github.com/gcc-mirror/gcc/archive/gcc-7_3_0-release.tar.gz'
source_sha256 'af11c397296cab69996723b9d828c98a9bb749447ac8f7ed67458bcdb60311ed' source_sha256 'af11c397296cab69996723b9d828c98a9bb749447ac8f7ed67458bcdb60311ed'
binary_url ({ binary_url ({
aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/gcc7-7.3.0-2-chromeos-armv7l.tar.xz', aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/gcc7-7.3.0-3-chromeos-armv7l.tar.xz',
armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/gcc7-7.3.0-2-chromeos-armv7l.tar.xz', armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/gcc7-7.3.0-3-chromeos-armv7l.tar.xz',
i686: 'https://dl.bintray.com/chromebrew/chromebrew/gcc7-7.3.0-2-chromeos-i686.tar.xz', i686: 'https://dl.bintray.com/chromebrew/chromebrew/gcc7-7.3.0-3-chromeos-i686.tar.xz',
x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/gcc7-7.3.0-2-chromeos-x86_64.tar.xz', x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/gcc7-7.3.0-3-chromeos-x86_64.tar.xz',
}) })
binary_sha256 ({ binary_sha256 ({
aarch64: 'aaa760b75d8aa75fcc615375b79265c8cc9f37e23944fe108e542a3b4bf788c6', aarch64: 'c9dd2a2b2d195f0f2021dc673d6317e46b5dfaef582f496b4cea1f3c5c2c17ad',
armv7l: 'aaa760b75d8aa75fcc615375b79265c8cc9f37e23944fe108e542a3b4bf788c6', armv7l: 'c9dd2a2b2d195f0f2021dc673d6317e46b5dfaef582f496b4cea1f3c5c2c17ad',
i686: 'caf14b8399a42710f31526daf418d0ec1128e8e91b93865bd549cb0333cb678e', i686: 'caf14b8399a42710f31526daf418d0ec1128e8e91b93865bd549cb0333cb678e',
x86_64: 'c2d6296473a4c2a97804d10a517ebce66fc4e1e5256210d28d15116f943d1611', x86_64: '992fa6556e3c4b45ae548b0ce64e1c5cafaffd109fe9aba5d857c6c569e5b33e',
}) })
depends_on 'unzip' => :build depends_on 'unzip' => :build
depends_on 'gawk' => :build depends_on 'gawk' => :build
depends_on 'dejagnu' => :build # for test depends_on 'dejagnu' => :build # for test
#depends_on 'gcc' => :build # gcc version 4.9.4 #depends_on 'gcc' => :build # gcc version 4.9.4
depends_on 'icu4c' => :build # icu version 60.1 depends_on 'icu4c' => :build # icu version 62.1
depends_on 'python27' => :build depends_on 'python27' => :build
depends_on 'python3' => :build depends_on 'python3' => :build
depends_on 'binutils' depends_on 'binutils'
depends_on 'gmp' depends_on 'gmp'
depends_on 'mpfr' depends_on 'mpfr'
...@@ -35,7 +35,7 @@ class Gcc7 < Package ...@@ -35,7 +35,7 @@ class Gcc7 < Package
depends_on 'isl' depends_on 'isl'
depends_on 'cloog' depends_on 'cloog'
depends_on 'glibc' depends_on 'glibc'
def self.build def self.build
# previous compile issue # previous compile issue
# /usr/local/bin/ld: cannot find crti.o: No such file or directory # /usr/local/bin/ld: cannot find crti.o: No such file or directory
...@@ -44,7 +44,7 @@ class Gcc7 < Package ...@@ -44,7 +44,7 @@ class Gcc7 < Package
system "mkdir -p objdir" system "mkdir -p objdir"
Dir.chdir("objdir") do Dir.chdir("objdir") do
case ARCH case ARCH
when 'armv7l' || 'aarch64' when 'armv7l', 'aarch64'
system "../configure", system "../configure",
"--prefix=#{CREW_PREFIX}", "--prefix=#{CREW_PREFIX}",
"--libdir=#{CREW_LIB_PREFIX}", "--libdir=#{CREW_LIB_PREFIX}",
...@@ -108,12 +108,11 @@ class Gcc7 < Package ...@@ -108,12 +108,11 @@ class Gcc7 < Package
# Comment: --with-default-libstdcxx-abi=gcc-compatible # Comment: --with-default-libstdcxx-abi=gcc-compatible
# Use this switch if we are upgrading from GCC version prior to 5.1.0 # Use this switch if we are upgrading from GCC version prior to 5.1.0
# We do not want to recompile all the libraries written in C++ # We do not want to recompile all the libraries written in C++
system "make" system "make"
end end
end end
# preserve for check, skip check for current version # preserve for check, skip check for current version
def self.check def self.check
Dir.chdir("objdir") do Dir.chdir("objdir") do
...@@ -122,23 +121,23 @@ class Gcc7 < Package ...@@ -122,23 +121,23 @@ class Gcc7 < Package
#system "../contrib/test_summary" #system "../contrib/test_summary"
end end
end end
def self.install def self.install
Dir.chdir("objdir") do Dir.chdir("objdir") do
system "make", "DESTDIR=#{CREW_DEST_DIR}", "install-strip" system "make", "DESTDIR=#{CREW_DEST_DIR}", "install-strip"
# http://www.linuxfromscratch.org/lfs/view/development/chapter06/gcc.html#contents-gcc # http://www.linuxfromscratch.org/lfs/view/development/chapter06/gcc.html#contents-gcc
# move a misplaced file # move a misplaced file
# The installation stage puts some files used by gdb under the /usr/local/lib(64) directory. This generates spurious error messages when performing ldconfig. This command moves the files to another location. # The installation stage puts some files used by gdb under the /usr/local/lib(64) directory. This generates spurious error messages when performing ldconfig. This command moves the files to another location.
system "mkdir -pv #{CREW_DEST_PREFIX}/share/gdb/auto-load/usr/lib" system "mkdir -pv #{CREW_DEST_PREFIX}/share/gdb/auto-load/usr/lib"
system "mv -v #{CREW_DEST_LIB_PREFIX}/*gdb.py #{CREW_DEST_PREFIX}/share/gdb/auto-load/usr/lib" system "mv -v #{CREW_DEST_LIB_PREFIX}/*gdb.py #{CREW_DEST_PREFIX}/share/gdb/auto-load/usr/lib"
# Install Binary File Descriptor library (BFD) # Install Binary File Descriptor library (BFD)
system "install -v -dm755 #{CREW_DEST_LIB_PREFIX}/bfd-plugins" system "install -v -dm755 #{CREW_DEST_LIB_PREFIX}/bfd-plugins"
# Add a compatibility symlink to enable building programs with Link Time Optimization (LTO) # Add a compatibility symlink to enable building programs with Link Time Optimization (LTO)
system "ln -sfv #{CREW_PREFIX}/libexec/gcc/$(gcc -dumpmachine)/7.3.0/liblto_plugin.so #{CREW_DEST_LIB_PREFIX}/bfd-plugins/" system "ln -sfv #{CREW_PREFIX}/libexec/gcc/$(gcc -dumpmachine)/7.3.0/liblto_plugin.so #{CREW_DEST_LIB_PREFIX}/bfd-plugins/"
# Make symbolic links # Make symbolic links
system "ln -sv #{CREW_PREFIX}/bin/gcc-7.3 #{CREW_DEST_PREFIX}/bin/cc" system "ln -sv #{CREW_PREFIX}/bin/gcc-7.3 #{CREW_DEST_PREFIX}/bin/cc"
system "ln -sv #{CREW_PREFIX}/bin/gcc-7.3 #{CREW_DEST_PREFIX}/bin/gcc" system "ln -sv #{CREW_PREFIX}/bin/gcc-7.3 #{CREW_DEST_PREFIX}/bin/gcc"
...@@ -152,7 +151,7 @@ class Gcc7 < Package ...@@ -152,7 +151,7 @@ class Gcc7 < Package
system "ln -sv #{CREW_PREFIX}/bin/gcov-dump-7.3 #{CREW_DEST_PREFIX}/bin/gcov-dump" system "ln -sv #{CREW_PREFIX}/bin/gcov-dump-7.3 #{CREW_DEST_PREFIX}/bin/gcov-dump"
system "ln -sv #{CREW_PREFIX}/bin/gcov-tool-7.3 #{CREW_DEST_PREFIX}/bin/gcov-tool" system "ln -sv #{CREW_PREFIX}/bin/gcov-tool-7.3 #{CREW_DEST_PREFIX}/bin/gcov-tool"
system "ln -sv #{CREW_PREFIX}/bin/gfortran-7.3 #{CREW_DEST_PREFIX}/bin/gfortran" system "ln -sv #{CREW_PREFIX}/bin/gfortran-7.3 #{CREW_DEST_PREFIX}/bin/gfortran"
system "ln -sv #{CREW_PREFIX}/bin/$(gcc -dumpmachine)-c++-7.3 #{CREW_DEST_PREFIX}/bin/$(gcc -dumpmachine)-c++" system "ln -sv #{CREW_PREFIX}/bin/$(gcc -dumpmachine)-c++-7.3 #{CREW_DEST_PREFIX}/bin/$(gcc -dumpmachine)-c++"
system "ln -sv #{CREW_PREFIX}/bin/$(gcc -dumpmachine)-g++-7.3 #{CREW_DEST_PREFIX}/bin/$(gcc -dumpmachine)-g++" system "ln -sv #{CREW_PREFIX}/bin/$(gcc -dumpmachine)-g++-7.3 #{CREW_DEST_PREFIX}/bin/$(gcc -dumpmachine)-g++"
system "ln -sv #{CREW_PREFIX}/bin/$(gcc -dumpmachine)-gcc-7.3 #{CREW_DEST_PREFIX}/bin/$(gcc -dumpmachine)-gcc" system "ln -sv #{CREW_PREFIX}/bin/$(gcc -dumpmachine)-gcc-7.3 #{CREW_DEST_PREFIX}/bin/$(gcc -dumpmachine)-gcc"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment