Skip to content

C
chromebrew
Commit 62a4bcb6 authored by Chris Thurber's avatar Chris Thurber Committed by GitHub
Browse files
Options

Merge pull request #2432 from uberhacker/fix-compiler-67 

Fix compiler for release 67+
parents d11604bd 1c0cb488
Hide whitespace changes
Inline Side-by-side
Showing with 151 additions and 156 deletions
packages/glibc.rb
View file @ 62a4bcb6
...@@ -3,17 +3,160 @@ require 'package' ...@@ -3,17 +3,160 @@ require 'package'
class Glibc < Package class Glibc < Package
description 'The GNU C Library project provides the core libraries for GNU/Linux systems.' description 'The GNU C Library project provides the core libraries for GNU/Linux systems.'
homepage 'https://www.gnu.org/software/libc/' homepage 'https://www.gnu.org/software/libc/'
version '1.2' version '2.23'
source_url 'https://ftpmirror.gnu.org/glibc/glibc-2.23.tar.xz'
source_sha256 '94efeb00e4603c8546209cefb3e1a50a5315c86fa9b078b6fad758e187ce13e9'
is_fake binary_url ({
aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/glibc-2.23-chromeos-armv7l.tar.xz',
armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/glibc-2.23-chromeos-armv7l.tar.xz',
i686: 'https://dl.bintray.com/chromebrew/chromebrew/glibc-2.23-chromeos-i686.tar.xz',
x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/glibc-2.23-chromeos-x86_64.tar.xz',
})
binary_sha256 ({
aarch64: 'acbecc4c5824653a1aca66da9856970fa4ae0ad97179747047e1a72fc2c2bac7',
armv7l: 'acbecc4c5824653a1aca66da9856970fa4ae0ad97179747047e1a72fc2c2bac7',
i686: '52145b65cb49c2751f69d4c46636f0685f2abb6685d8a080b71b2f091595a950',
x86_64: '2d09f88f6de0f3fbd9f01ffcf9d61d43df688826bf1df63d8f193d6ed69ded11',
})
if CHROMEOS_RELEASE <= '66' depends_on 'gawk' => :build
if (File.exist? '/lib/libc-2.23.so') || (File.exist? '/lib64/libc-2.23.so') depends_on 'libgd' => :build
# Check previous version depends_on 'texinfo' => :build
if File.exist? CREW_CONFIG_PATH + 'meta/glibc219.filelist'
system 'crew remove glibc219' def self.patch
# Apply patch due to new version of binutils which causes compilation failure
# http://lists.busybox.net/pipermail/buildroot/2017-August/199812.html
Dir.chdir "misc" do
if File.readlines("regexp.c").grep(/monitor/).any?
puts "Patched!".lightgreen
else
system "sed -i 's,char \\*loc1,char \\*loc1 __attribute__ ((nocommon)),g' regexp.c"
system "sed -i 's,char \\*loc2,char \\*loc2 __attribute__ ((nocommon)),g' regexp.c"
system "sed -i 's,char \\*locs,char \\*locs __attribute__ ((nocommon)),g' regexp.c"
end end
depends_on 'glibc223'
end end
end end
def self.build
system "mkdir -pv glibc_build"
Dir.chdir "glibc_build" do
case ARCH
when 'armv7l', 'aarch64'
system "../configure",
"--prefix=#{CREW_PREFIX}",
"--libdir=#{CREW_LIB_PREFIX}",
"--with-headers=#{CREW_PREFIX}/include",
"--disable-werror",
"--disable-sanity-checks",
"--enable-shared",
"--enable-obsolete-rpc",
"libc_cv_forced_unwind=yes",
"--without-selinux"
when 'x86_64'
system "echo \"slibdir=#{CREW_LIB_PREFIX}\" > configparms"
puts "echo \"slibdir=#{CREW_LIB_PREFIX}\" > configparms"
system "../configure",
"--prefix=#{CREW_PREFIX}",
"--libdir=#{CREW_LIB_PREFIX}",
"--with-headers=#{CREW_PREFIX}/include",
"--disable-werror",
"--disable-sanity-checks",
"--enable-shared",
"--disable-multilib",
"--enable-obsolete-rpc",
"libc_cv_forced_unwind=yes",
"libc_cv_ssp=no",
"libc_cv_ssp_strong=no"
when 'i686'
system "../configure",
"--prefix=#{CREW_PREFIX}",
"--libdir=#{CREW_LIB_PREFIX}",
"--with-headers=#{CREW_PREFIX}/include",
"--disable-werror",
"--disable-sanity-checks",
"--enable-shared",
"--disable-multilib",
"--enable-obsolete-rpc",
"libc_cv_forced_unwind=yes",
"libc_cv_ssp=no",
"libc_cv_ssp_strong=no"
end
system "make"
end
end
def self.install
Dir.chdir "glibc_build" do
system "mkdir -pv #{CREW_DEST_PREFIX}/etc"
system "touch", "#{CREW_DEST_PREFIX}/etc/ld.so.conf"
system "make", "DESTDIR=#{CREW_DEST_DIR}", "install"
# This installs full locales, but requires a lot of disk space.
#system "make", "DESTDIR=#{CREW_DEST_DIR}", "localedata/install-locales"
# Symlink to system libraries
if File.exist? "/#{ARCH_LIB}/libc-2.23.so"
Dir.chdir "#{CREW_DEST_LIB_PREFIX}" do
system "ln -sf /#{ARCH_LIB}/ld-2.23.so ld-2.23.so" if File.exist? "/#{ARCH_LIB}/ld-2.23.so"
system "ln -sf /#{ARCH_LIB}/libanl-2.23.so libanl-2.23.so" if File.exist? "/#{ARCH_LIB}/libanl-2.23.so"
system "ln -sf /#{ARCH_LIB}/libBrokenLocale-2.23.so libBrokenLocale-2.23.so" if File.exist? "/#{ARCH_LIB}/libBrokenLocale-2.23.so"
system "ln -sf /#{ARCH_LIB}/libc-2.23.so libc-2.23.so" if File.exist? "/#{ARCH_LIB}/libc-2.23.so"
system "ln -sf /#{ARCH_LIB}/libcidn-2.23.so libcidn-2.23.so" if File.exist? "/#{ARCH_LIB}/libcidn-2.23.so"
system "ln -sf /#{ARCH_LIB}/libcrypt-2.23.so libcrypt-2.23.so" if File.exist? "/#{ARCH_LIB}/libcrypt-2.23.so"
system "ln -sf /#{ARCH_LIB}/libdl-2.23.so libdl-2.23.so" if File.exist? "/#{ARCH_LIB}/libdl-2.23.so"
system "ln -sf /#{ARCH_LIB}/libm-2.23.so libm-2.23.so" if File.exist? "/#{ARCH_LIB}/libm-2.23.so"
system "ln -sf /#{ARCH_LIB}/libmvec-2.23.so libmvec-2.23.so" if File.exist? "/#{ARCH_LIB}/libmvec-2.23.so"
system "ln -sf /#{ARCH_LIB}/libnsl-2.23.so libnsl-2.23.so" if File.exist? "/#{ARCH_LIB}/libnsl-2.23.so"
system "ln -sf /#{ARCH_LIB}/libnss_compat-2.23.so libnss_compat-2.23.so" if File.exist? "/#{ARCH_LIB}/libnss_compat-2.23.so"
system "ln -sf /#{ARCH_LIB}/libnss_db-2.23.so libnss_db-2.23.so" if File.exist? "/#{ARCH_LIB}/libnss_db-2.23.so"
system "ln -sf /#{ARCH_LIB}/libnss_dns-2.23.so libnss_dns-2.23.so" if File.exist? "/#{ARCH_LIB}/libnss_dns-2.23.so"
system "ln -sf /#{ARCH_LIB}/libnss_files-2.23.so libnss_files-2.23.so" if File.exist? "/#{ARCH_LIB}/libnss_files-2.23.so"
system "ln -sf /#{ARCH_LIB}/libnss_hesiod-2.23.so libnss_hesiod-2.23.so" if File.exist? "/#{ARCH_LIB}/libnss_hesiod-2.23.so"
system "ln -sf /#{ARCH_LIB}/libnss_nis-2.23.so libnss_nis-2.23.so" if File.exist? "/#{ARCH_LIB}/libnss_nis-2.23.so"
system "ln -sf /#{ARCH_LIB}/libnss_nisplus-2.23.so libnss_nisplus-2.23.so" if File.exist? "/#{ARCH_LIB}/libnss_nisplus-2.23.so"
system "ln -sf /#{ARCH_LIB}/libpthread-2.23.so libpthread-2.23.so" if File.exist? "/#{ARCH_LIB}/libpthread-2.23.so"
system "ln -sf /#{ARCH_LIB}/libresolv-2.23.so libresolv-2.23.so" if File.exist? "/#{ARCH_LIB}/libresolv-2.23.so"
system "ln -sf /#{ARCH_LIB}/librt-2.23.so librt-2.23.so" if File.exist? "/#{ARCH_LIB}/librt-2.23.so"
system "ln -sf /#{ARCH_LIB}/libutil-2.23.so libutil-2.23.so" if File.exist? "/#{ARCH_LIB}/libutil-2.23.so"
end
end
end
# minimum set of locales -> /usr/local/lib(64)/locale/locale-archive
Dir.chdir "glibc_build/localedata" do
system "mkdir -pv #{CREW_DEST_LIB_PREFIX}/locale"
puts "Install minimum set of locales".lightblue
# Assume old version of glibc is installed. -> use localedef.
# If not installed, we can move following instruction to postinstall
# Since glibc is a basic package, we prefer to provide pre-compiled package.
# No compilcated detect logics required -> make it as simple as possible
system "localedef --prefix=#{CREW_DEST_DIR} -i cs_CZ -f UTF-8 cs_CZ.UTF-8"
system "localedef --prefix=#{CREW_DEST_DIR} -i de_DE -f ISO-8859-1 de_DE"
system "localedef --prefix=#{CREW_DEST_DIR} -i de_DE@euro -f ISO-8859-15 de_DE@euro"
system "localedef --prefix=#{CREW_DEST_DIR} -i de_DE -f UTF-8 de_DE.UTF-8"
system "localedef --prefix=#{CREW_DEST_DIR} -i en_GB -f UTF-8 en_GB.UTF-8"
system "localedef --prefix=#{CREW_DEST_DIR} -i en_HK -f ISO-8859-1 en_HK"
system "localedef --prefix=#{CREW_DEST_DIR} -i en_PH -f ISO-8859-1 en_PH"
system "localedef --prefix=#{CREW_DEST_DIR} -i en_US -f ISO-8859-1 en_US"
system "localedef --prefix=#{CREW_DEST_DIR} -i en_US -f UTF-8 en_US.UTF-8"
system "localedef --prefix=#{CREW_DEST_DIR} -i es_MX -f ISO-8859-1 es_MX"
system "localedef --prefix=#{CREW_DEST_DIR} -i fa_IR -f UTF-8 fa_IR"
system "localedef --prefix=#{CREW_DEST_DIR} -i fr_FR -f ISO-8859-1 fr_FR"
system "localedef --prefix=#{CREW_DEST_DIR} -i fr_FR@euro -f ISO-8859-15 fr_FR@euro"
system "localedef --prefix=#{CREW_DEST_DIR} -i fr_FR -f UTF-8 fr_FR.UTF-8"
system "localedef --prefix=#{CREW_DEST_DIR} -i it_IT -f ISO-8859-1 it_IT"
system "localedef --prefix=#{CREW_DEST_DIR} -i it_IT -f UTF-8 it_IT.UTF-8"
system "localedef --prefix=#{CREW_DEST_DIR} -i ja_JP -f EUC-JP ja_JP"
system "localedef --prefix=#{CREW_DEST_DIR} -i ru_RU -f KOI8-R ru_RU.KOI8-R"
system "localedef --prefix=#{CREW_DEST_DIR} -i ru_RU -f UTF-8 ru_RU.UTF-8"
system "localedef --prefix=#{CREW_DEST_DIR} -i tr_TR -f UTF-8 tr_TR.UTF-8"
system "localedef --prefix=#{CREW_DEST_DIR} -i zh_CN -f GB18030 zh_CN.GB18030"
end
end
#def self.check
# Dir.chdir "glibc_build" do
# system "make -k -j#{CREW_NPROC} check"
# end
#end
end end
packages/glibc223.rb deleted 100644 → 0
View file @ d11604bd
require 'package'
class Glibc223 < Package
description 'GNU C Library'
homepage 'https://www.gnu.org/software/libc/'
version '2.23-4'
source_url 'https://ftpmirror.gnu.org/glibc/glibc-2.23.tar.xz'
source_sha256 '94efeb00e4603c8546209cefb3e1a50a5315c86fa9b078b6fad758e187ce13e9'
binary_url ({
aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/glibc223-2.23-3-chromeos-armv7l.tar.xz',
armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/glibc223-2.23-3-chromeos-armv7l.tar.xz',
i686: 'https://dl.bintray.com/chromebrew/chromebrew/glibc223-2.23-3-chromeos-i686.tar.xz',
x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/glibc223-2.23-3-chromeos-x86_64.tar.xz',
})
binary_sha256 ({
aarch64: 'de8de509b8296b73539a6ee06aefed5df9f3fa56e2d086addecc817f2eaeb1f2',
armv7l: 'de8de509b8296b73539a6ee06aefed5df9f3fa56e2d086addecc817f2eaeb1f2',
i686: 'f76de42054c1413d88618a218b9933056a0b31aaf6818043bee82a2ead245522',
x86_64: '9989a2208ede7055127780de0990d8bc6dd60379535c7d18a52da0742117bca9',
})
depends_on 'libgd' => :build
depends_on 'texinfo' => :build
if (CHROMEOS_RELEASE > '66') && (ARGV[0] != 'search')
abort "This package cannot be installed with release #{CHROMEOS_RELEASE}!".lightred
end
def self.patch
# Apply patch due to new version of binutils which causes compilation failure
# http://lists.busybox.net/pipermail/buildroot/2017-August/199812.html
Dir.chdir "misc" do
if File.readlines("regexp.c").grep(/monitor/).any?
puts "Patched!".lightgreen
else
system "sed -i 's,char \\*loc1,char \\*loc1 __attribute__ ((nocommon)),g' regexp.c"
system "sed -i 's,char \\*loc2,char \\*loc2 __attribute__ ((nocommon)),g' regexp.c"
system "sed -i 's,char \\*locs,char \\*locs __attribute__ ((nocommon)),g' regexp.c"
end
end
end
def self.build
system "mkdir -pv glibc_build"
Dir.chdir "glibc_build" do
case ARCH
when 'armv7l' || 'aarch64'
system "../configure",
"--prefix=#{CREW_PREFIX}",
"--libdir=#{CREW_LIB_PREFIX}",
"--with-headers=#{CREW_PREFIX}/include",
"--disable-werror",
"--disable-sanity-checks",
"--enable-shared",
"--enable-obsolete-rpc",
"libc_cv_forced_unwind=yes"
when 'x86_64'
system "echo \"slibdir=#{CREW_LIB_PREFIX}\" > configparms"
puts "echo \"slibdir=#{CREW_LIB_PREFIX}\" > configparms"
system "../configure",
"--prefix=#{CREW_PREFIX}",
"--libdir=#{CREW_LIB_PREFIX}",
"--with-headers=#{CREW_PREFIX}/include",
"--disable-werror",
"--disable-sanity-checks",
"--enable-shared",
"--disable-multilib",
"--enable-obsolete-rpc",
"libc_cv_forced_unwind=yes",
"libc_cv_ssp=no",
"libc_cv_ssp_strong=no"
when 'i686'
system "../configure",
"--prefix=#{CREW_PREFIX}",
"--libdir=#{CREW_LIB_PREFIX}",
"--with-headers=#{CREW_PREFIX}/include",
"--disable-werror",
"--disable-sanity-checks",
"--enable-shared",
"--disable-multilib",
"--enable-obsolete-rpc",
"libc_cv_forced_unwind=yes",
"libc_cv_ssp=no",
"libc_cv_ssp_strong=no"
end
system "make"
end
end
def self.install
Dir.chdir "glibc_build" do
system "mkdir -pv #{CREW_DEST_PREFIX}/etc"
system "touch","#{CREW_DEST_PREFIX}/etc/ld.so.conf"
system "make", "DESTDIR=#{CREW_DEST_DIR}", "install"
#system "make", "DESTDIR=#{CREW_DEST_DIR}", "localedata/install-locales" # This installs full locales, but it has large disk size.
end
# minimum set of locales -> /usr/local/lib(64)/locale/locale-archive
Dir.chdir "glibc_build/localedata" do
system "mkdir -pv #{CREW_DEST_LIB_PREFIX}/locale"
puts "Install minimum set of locales".lightblue
# Assume old version of glibc is installed. -> use localedef.
# If not installed, we can move following instruction to postinstall
# Since glibc is a basic package, we prefer to provide pre-compiled package.
# No compilcated detect logics required -> make it as simple as possible
system "localedef --prefix=#{CREW_DEST_DIR} -i cs_CZ -f UTF-8 cs_CZ.UTF-8"
system "localedef --prefix=#{CREW_DEST_DIR} -i de_DE -f ISO-8859-1 de_DE"
system "localedef --prefix=#{CREW_DEST_DIR} -i de_DE@euro -f ISO-8859-15 de_DE@euro"
system "localedef --prefix=#{CREW_DEST_DIR} -i de_DE -f UTF-8 de_DE.UTF-8"
system "localedef --prefix=#{CREW_DEST_DIR} -i en_GB -f UTF-8 en_GB.UTF-8"
system "localedef --prefix=#{CREW_DEST_DIR} -i en_HK -f ISO-8859-1 en_HK"
system "localedef --prefix=#{CREW_DEST_DIR} -i en_PH -f ISO-8859-1 en_PH"
system "localedef --prefix=#{CREW_DEST_DIR} -i en_US -f ISO-8859-1 en_US"
system "localedef --prefix=#{CREW_DEST_DIR} -i en_US -f UTF-8 en_US.UTF-8"
system "localedef --prefix=#{CREW_DEST_DIR} -i es_MX -f ISO-8859-1 es_MX"
system "localedef --prefix=#{CREW_DEST_DIR} -i fa_IR -f UTF-8 fa_IR"
system "localedef --prefix=#{CREW_DEST_DIR} -i fr_FR -f ISO-8859-1 fr_FR"
system "localedef --prefix=#{CREW_DEST_DIR} -i fr_FR@euro -f ISO-8859-15 fr_FR@euro"
system "localedef --prefix=#{CREW_DEST_DIR} -i fr_FR -f UTF-8 fr_FR.UTF-8"
system "localedef --prefix=#{CREW_DEST_DIR} -i it_IT -f ISO-8859-1 it_IT"
system "localedef --prefix=#{CREW_DEST_DIR} -i it_IT -f UTF-8 it_IT.UTF-8"
system "localedef --prefix=#{CREW_DEST_DIR} -i ja_JP -f EUC-JP ja_JP"
system "localedef --prefix=#{CREW_DEST_DIR} -i ru_RU -f KOI8-R ru_RU.KOI8-R"
system "localedef --prefix=#{CREW_DEST_DIR} -i ru_RU -f UTF-8 ru_RU.UTF-8"
system "localedef --prefix=#{CREW_DEST_DIR} -i tr_TR -f UTF-8 tr_TR.UTF-8"
system "localedef --prefix=#{CREW_DEST_DIR} -i zh_CN -f GB18030 zh_CN.GB18030"
end
end
#def self.check
# Dir.chdir "glibc_build" do
# system "make -k -j#{CREW_NPROC} check"
# end
#end
end
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7