autu: Update to 4.6.4-4 Long term compile fix

2 files changed, 48 insertions, 61 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c4b081bffe38..8aff509f21b2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,3 @@
-# Generated by mksrcinfo v8
-# Wed Sep 13 04:22:57 UTC 2017
 pkgbase = gcc46-multilib
 	pkgdesc = The GNU Compiler Collection for multilib (4.6.x)
 	pkgver = 4.6.4
@@ -22,12 +20,15 @@ pkgbase = gcc46-multilib
 	options = staticlibs
 	options = !libtool
 	options = !emptydirs
+	options = !buildflags
 	source = ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.6.4/gcc-4.6.4.tar.bz2
 	source = gcc-hash-style-both.patch
 	source = gcc.texi.49.patch
+	md5sums = b407a3d1480c11667f293bfb1f17d1a4
+	md5sums = 4df25b623799b148a0703eaeec8fdf3f
+	md5sums = f3c42a9cfa840a062897da0468102771
 	sha256sums = 35af16afa0b67af9b8eb15cafb76d2bc5f568540552522f5dc2c88dd45d977e8
 	sha256sums = 3492332fa78b545ff46c2b5293d17c63c122be6f8f6fa4798864b7d4572b0024
 	sha256sums = 9f8c50a715a921d3d2c9d5809ac9592ca66f682b2cc496606ff6eb4de79d46b6
 
 pkgname = gcc46-multilib
-
diff --git a/PKGBUILD b/PKGBUILD
index 12e89de0e706..c20d64db6f31 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -19,16 +19,18 @@ makedepends=('binutils>=2.24' 'libmpc' 'cloog' 'ppl')
 makedepends+=('lib32-glibc>=2.14' 'texinfo')
 provides=("gcc${_pkgver//\./}") # no version as it is completely contained in the name
 conflicts=("gcc${_pkgver//\./}")
-options=('staticlibs' '!libtool' '!emptydirs')
+options=('staticlibs' '!libtool' '!emptydirs' '!buildflags')
 source=(
   "ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2"
   'gcc-hash-style-both.patch'
   'gcc.texi.49.patch'
 )
+md5sums=('b407a3d1480c11667f293bfb1f17d1a4'
+         '4df25b623799b148a0703eaeec8fdf3f'
+         'f3c42a9cfa840a062897da0468102771')
 sha256sums=('35af16afa0b67af9b8eb15cafb76d2bc5f568540552522f5dc2c88dd45d977e8'
             '3492332fa78b545ff46c2b5293d17c63c122be6f8f6fa4798864b7d4572b0024'
             '9f8c50a715a921d3d2c9d5809ac9592ca66f682b2cc496606ff6eb4de79d46b6')
-PKGEXT='.pkg.tar.gz'
 
 if [ -n "${_snapshot:-}" ]; then
   _basedir="gcc-${_snapshot}"
@@ -75,67 +77,51 @@ build() {
   if [ ! -s "${_basedir}/gcc-build/Makefile" ]; then
     cd "${_basedir}"
 
-    # Doesn't like FORTIFY_SOURCE
-    CPPFLAGS="${CPPFLAGS//-D_FORTIFY_SOURCE=?/}"
-
-    # Doesn't like -fstack-protector-strong
-    CFLAGS="${CFLAGS//-fstack-protector-strong/-fstack-protector}"
-    CXXFLAGS="${CXXFLAGS//-fstack-protector-strong/-fstack-protector}"
-
-    # using -pipe causes spurious test-suite failures
-    # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=48565
-    CFLAGS="${CFLAGS/-pipe/}"
-    CXXFLAGS="${CXXFLAGS/-pipe/}"
-
-    # Flags from new compilers that old compilers don't recognize
-    CFLAGS="${CFLAGS/-fno-plt/}"
-    CXXFLAGS="${CXXFLAGS/-fno-plt/}"
-
-    CFLAGS="${CFLAGS/-Wformat-overflow=[0-9]/}"
-    CXXFLAGS="${CXXFLAGS/-Wformat-overflow=[0-9]/}"
-
     cd 'gcc-build'
     # The following options are one per line, mostly sorted so they are easy to diff compare to other gcc packages.
-    ../configure \
-      --build="${CHOST}" \
-      --disable-libssp \
-      --disable-libstdcxx-pch \
-      --disable-libunwind-exceptions \
-      --enable-multilib \
-      --disable-werror \
-      --enable-__cxa_atexit \
-      --enable-checking='release' \
-      --enable-clocale='gnu' \
-      --enable-cloog-backend='isl' \
-      --enable-gnu-unique-object \
-      --enable-gold \
-      --enable-languages='c,c++,fortran' \
-      --enable-ld='default' \
-      --enable-libstdcxx-time \
-      --enable-linker-build-id \
-      --enable-lto \
-      --enable-plugin \
-      --enable-shared \
-      --enable-threads='posix' \
-      --enable-version-specific-runtime-libs \
-      --infodir='/usr/share/info' \
-      --libdir='/usr/lib' \
-      --libexecdir='/usr/lib' \
-      --mandir='/usr/share/man' \
-      --program-suffix="-${_pkgver}" \
-      --with-bugurl='https://bugs.archlinux.org/' \
-      --with-fpmath='sse' \
-      --with-plugin-ld='ld.gold' \
-      --with-ppl \
-      --with-system-zlib \
+    local _conf=(
+      --build="${CHOST}"
+      --disable-libssp
+      --disable-libstdcxx-pch
+      --disable-libunwind-exceptions
+      --enable-multilib
+      --disable-werror
+      --enable-__cxa_atexit
+      --enable-checking='release'
+      --enable-clocale='gnu'
+      --enable-cloog-backend='isl'
+      --enable-gnu-unique-object
+      --enable-gold
+      --enable-languages='c,c++,fortran'
+      --enable-ld='default'
+      --enable-libstdcxx-time
+      --enable-linker-build-id
+      --enable-lto
+      --enable-plugin
+      --enable-shared
+      --enable-threads='posix'
+      --enable-version-specific-runtime-libs
+      --infodir='/usr/share/info'
+      --libdir='/usr/lib'
+      --libexecdir='/usr/lib'
+      --mandir='/usr/share/man'
+      --program-suffix="-${_pkgver}"
+      --with-bugurl='https://bugs.archlinux.org/'
+      --with-fpmath='sse'
+      --with-plugin-ld='ld.gold'
+      --with-ppl
+      --with-system-zlib
       --prefix='/usr'
-#      CXX='g++-4.9' CC='gcc-4.9'
+      #CXX='g++-4.9' CC='gcc-4.9'
+    )
+    ../configure "${_conf[@]}"
+
+    sed -e 's/^STAGE1_CXXFLAGS.*$/& -std=gnu++11/' -i 'Makefile'
   fi
 
   cd "${srcdir}/${_basedir}/gcc-build"
-  local _nproc="$(nproc)"; _nproc=$((_nproc>8?8:_nproc))
-  #LD_PRELOAD='/usr/lib/libstdc++.so' \\
-  nice make -j "${_nproc}"
+  LD_PRELOAD='/usr/lib/libstdc++.so' \
+  nice make -s
 
   set +u
 }
@@ -159,7 +145,7 @@ package() {
   set -u
   cd "${_basedir}/gcc-build"
 
-  #LD_PRELOAD='/usr/lib/libstdc++.so' \\
+  LD_PRELOAD='/usr/lib/libstdc++.so' \
   make -j1 DESTDIR="${pkgdir}" install
 
   if [ "${CARCH}" = 'x86_64' ]; then