summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD21
2 files changed, 17 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e087b057bd61..0a7185dc25e9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -9,7 +9,6 @@ pkgbase = gcc44
license = LGPL
license = custom
makedepends = setconf
- makedepends = gcc49
depends = binutils
depends = mpfr
depends = cloog
@@ -23,13 +22,16 @@ pkgbase = gcc44
source = gcc-hash-style-both.patch
source = gcc_pure64.patch
source = siginfo_t_fix.patch
+ source = 0000-gcc-c11-toplev.diff::https://www.rockbox.org/gcc/gcc-c11-toplev.diff
md5sums = 295709feb4441b04e87dea3f1bab4281
md5sums = 6fd395bacbd7b6e47c7b74854b478363
md5sums = 4030ee1c08dd1e843c0225b772360e76
md5sums = eba17a209cf9550b66a4af0527956565
+ md5sums = ea3bba5ee50ba043b992eaa22161e141
sha256sums = 5ff75116b8f763fa0fb5621af80fc6fb3ea0f1b1a57520874982f03f26cd607f
sha256sums = a600550d3d2b2fb8ee6a547c68c3a08a2af7579290b340c35ee5598c9bb305a5
sha256sums = 2d369cf93c6e15c3559c3560bce581e0ae5f1f34dc86bca013ac67ef1c1a9ff9
sha256sums = 4df866dcfd528835393d2b6897651158faf6d84852158fbf2e4ffc113ec7d201
+ sha256sums = aa81059bc71f335c962db6bbb8c5857a5cc76e2eb33b82ce1ccd6cb536b2bc31
pkgname = gcc44
diff --git a/PKGBUILD b/PKGBUILD
index c69aab4386bc..aee0af8156e5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -19,7 +19,7 @@ url='http://gcc.gnu.org/'
license=('GPL' 'LGPL' 'custom')
depends=('binutils' 'mpfr' 'cloog' 'zlib' 'elfutils')
makedepends=('setconf')
-makedepends+=('gcc49')
+#makedepends+=('gcc49')
conflicts=("gcc${_pkgver//\./}-multilib")
options=('staticlibs' '!libtool' '!buildflags')
source=(
@@ -27,15 +27,18 @@ source=(
'gcc-hash-style-both.patch'
'gcc_pure64.patch'
'siginfo_t_fix.patch'
+ '0000-gcc-c11-toplev.diff::https://www.rockbox.org/gcc/gcc-c11-toplev.diff'
)
md5sums=('295709feb4441b04e87dea3f1bab4281'
'6fd395bacbd7b6e47c7b74854b478363'
'4030ee1c08dd1e843c0225b772360e76'
- 'eba17a209cf9550b66a4af0527956565')
+ 'eba17a209cf9550b66a4af0527956565'
+ 'ea3bba5ee50ba043b992eaa22161e141')
sha256sums=('5ff75116b8f763fa0fb5621af80fc6fb3ea0f1b1a57520874982f03f26cd607f'
'a600550d3d2b2fb8ee6a547c68c3a08a2af7579290b340c35ee5598c9bb305a5'
'2d369cf93c6e15c3559c3560bce581e0ae5f1f34dc86bca013ac67ef1c1a9ff9'
- '4df866dcfd528835393d2b6897651158faf6d84852158fbf2e4ffc113ec7d201')
+ '4df866dcfd528835393d2b6897651158faf6d84852158fbf2e4ffc113ec7d201'
+ 'aa81059bc71f335c962db6bbb8c5857a5cc76e2eb33b82ce1ccd6cb536b2bc31')
if [ -n "${_snapshot:-}" ]; then
_basedir="gcc-${_snapshot}"
@@ -59,13 +62,16 @@ prepare() {
patch -Np1 -i "${srcdir}/siginfo_t_fix.patch"
- sed -e 's:\bstruct ucontext\b:ucontext_t:g' -i $(grep --include '*.[ch]' --include '*.cc' -lre '\bstruct ucontext\b')
- sed -e 's:\bstruct sigaltstack\b:stack_t:g' -i $(grep --include '*.[ch]' --include '*.cc' -lre '\bstruct sigaltstack\b')
+ patch -Np1 -i "${srcdir}/0000-gcc-c11-toplev.diff"
case "${CARCH}" in
'x86_64') patch -Np1 -i '../gcc_pure64.patch';;
esac
+ # fix build with glibc 2.26
+ sed -e 's:\bstruct ucontext\b:ucontext_t:g' -i $(grep --include '*.[ch]' --include '*.cc' -lre '\bstruct ucontext\b')
+ sed -e 's:\bstruct sigaltstack\b:stack_t:g' -i $(grep --include '*.[ch]' --include '*.cc' -lre '\bstruct sigaltstack\b')
+
echo "${pkgver}" > 'gcc/BASE-VER'
setconf 'gcc/configure' 'BUILD_INFO' ''
@@ -85,7 +91,6 @@ build() {
# The following options are one per line, mostly sorted so they are easy to diff compare to other gcc packages.
local _conf=(
--build="${CHOST}"
- --enable-libgomp
--disable-libmudflap
--disable-libssp
--disable-libstdcxx-pch
@@ -93,6 +98,7 @@ build() {
--enable-__cxa_atexit
--enable-clocale='gnu'
--enable-languages='c,c++,fortran,objc,obj-c++'
+ --enable-libgomp
--enable-shared
--enable-threads='posix'
--enable-version-specific-runtime-libs
@@ -106,7 +112,7 @@ build() {
--with-system-zlib
--with-tune='generic'
--prefix='/usr'
- CXX='g++-4.9' CC='gcc-4.9'
+ #CXX='g++-4.9' CC='gcc-4.9'
)
../configure "${_conf[@]}"
@@ -115,6 +121,7 @@ build() {
#LD_PRELOAD='/usr/lib/libstdc++.so' \\
nice make -s
+
set +u
}