upgpkg: gcc6 6.5.0-5

Remove files conflicting with gcc10-libs, and apply workaround for -Werror=format-security.

3 files changed, 64 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 469e623486fd..d5f9127221e8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = gcc6
 	pkgdesc = The GNU Compiler Collection (6.x.x)
 	pkgver = 6.5.0
-	pkgrel = 4
+	pkgrel = 5
 	url = https://gcc.gnu.org/gcc-6/
 	arch = x86_64
 	license = GPL
@@ -21,26 +21,30 @@ pkgbase = gcc6
 	makedepends = zlib
 	makedepends = java-runtime
 	options = !emptydirs
+	options = !makeflags
 	source = https://gcc.gnu.org/pub/gcc/releases/gcc-6.5.0/gcc-6.5.0.tar.xz
 	source = https://gcc.gnu.org/pub/gcc/infrastructure/isl-0.18.tar.bz2
 	source = http://www.bastoul.net/cloog/pages/download/cloog-0.18.4.tar.gz
 	source = libsanitizer.patch
+	source = Workaround-for-format-security.patch
 	source = c89
 	source = c99
 	sha512sums = ce046f9a50050fd54b870aab764f7db187fe7ea92eb4aaffb7c3689ca623755604e231f2af97ef795f41c406bb80c797dd69957cfdd51dfa2ba60813f72b7eac
 	sha512sums = 85d0b40f4dbf14cb99d17aa07048cdcab2dc3eb527d2fbb1e84c41b2de5f351025370e57448b63b2b8a8cf8a0843a089c3263f9baee1542d5c2e1cb37ed39d94
 	sha512sums = d35d67b08ffe13c1a010b65bfe4dd02b0ae013d5b489e330dc950bd3514defca8f734bd37781856dcedf0491ff6122c34eecb4b0fe32a22d7e6bdadea98c8c23
 	sha512sums = e7861f77d54ac9bc12cfc6d3498a9bc284e72f728435c23866ac0763fb93e94e431d819c3def9f5aa03acbafc437141882e7b3746f4574ec6e5eb66b555cebb6
+	sha512sums = 7c9dfadad196ac53f7a33d5875bd39aacd4a650e79696ab3177f245ad5e24cdd9fa084c8829820ba82b0159756f89baa9db99f373f42e38e757b3d5b7c699cf5
 	sha512sums = a02da589b23e4a76b5ca3b3e4e2261ef4cf69dadd9460703f14e34090d4e574025a52acef9f54e897679115e2122b0095d9d7eab556024bb0e9c695915951a58
 	sha512sums = d17176547a1ed2b7aa4743eb66a06308db182a993985a1905b418dfa46b74723631b17fd0d536adfefbdf4900d3b71cdf1e7d663ad379fa11b58b613dccb931c
 
 pkgname = gcc6
 	pkgdesc = The GNU Compiler Collection - C and C++ frontends (6.x.x)
-	depends = gcc6-libs=6.5.0-4
+	depends = gcc6-libs=6.5.0-5
 	depends = binutils>=2.28
 	depends = libmpc
 	depends = zlib
 	options = !emptydirs
+	options = !makeflags
 	options = staticlibs
 
 pkgname = gcc6-libs
@@ -48,21 +52,21 @@ pkgname = gcc6-libs
 	depends = glibc>=2.25
 	depends = zlib
 	options = !emptydirs
+	options = !makeflags
 	options = !strip
 
 pkgname = gcc6-fortran
 	pkgdesc = Fortran front-end for GCC
-	depends = gcc6=6.5.0-4
+	depends = gcc6=6.5.0-5
 	depends = zlib
 	depends = libmpc
 
 pkgname = gcc6-gcj
 	pkgdesc = Java front-end for GCC
-	depends = gcc6=6.5.0-4
+	depends = gcc6=6.5.0-5
 	depends = libmpc
 	depends = libxtst
 	depends = gtk2
 	depends = java-runtime
 	depends = libsm
 	replaces = gcc-gcj
-
diff --git a/PKGBUILD b/PKGBUILD
index f0368df20ff5..77878899ba4a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,24 +14,26 @@ pkgver=6.5.0
 _ver=${pkgver%%.*}
 _islver=0.18
 _cloogver=0.18.4
-pkgrel=4
+pkgrel=5
 pkgdesc="The GNU Compiler Collection (6.x.x)"
 arch=(x86_64)
 license=(GPL LGPL FDL custom)
 url="https://gcc.gnu.org/gcc-6/"
 makedepends=(binutils libmpc doxygen subversion java-environment-common zip jdk8-openjdk gtk2 libart-lgpl libxtst zlib java-runtime)
-options=(!emptydirs)
+options=(!emptydirs !makeflags)
 source=("https://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.xz"
         "https://gcc.gnu.org/pub/gcc/infrastructure/isl-${_islver}.tar.bz2"
         "http://www.bastoul.net/cloog/pages/download/cloog-${_cloogver}.tar.gz"
-        "libsanitizer.patch"
-        "c89"
-        "c99"
+        libsanitizer.patch
+	      Workaround-for-format-security.patch
+        c89
+        c99
 )
 sha512sums=('ce046f9a50050fd54b870aab764f7db187fe7ea92eb4aaffb7c3689ca623755604e231f2af97ef795f41c406bb80c797dd69957cfdd51dfa2ba60813f72b7eac'
             '85d0b40f4dbf14cb99d17aa07048cdcab2dc3eb527d2fbb1e84c41b2de5f351025370e57448b63b2b8a8cf8a0843a089c3263f9baee1542d5c2e1cb37ed39d94'
             'd35d67b08ffe13c1a010b65bfe4dd02b0ae013d5b489e330dc950bd3514defca8f734bd37781856dcedf0491ff6122c34eecb4b0fe32a22d7e6bdadea98c8c23'
             'e7861f77d54ac9bc12cfc6d3498a9bc284e72f728435c23866ac0763fb93e94e431d819c3def9f5aa03acbafc437141882e7b3746f4574ec6e5eb66b555cebb6'
+            '7c9dfadad196ac53f7a33d5875bd39aacd4a650e79696ab3177f245ad5e24cdd9fa084c8829820ba82b0159756f89baa9db99f373f42e38e757b3d5b7c699cf5'
             'a02da589b23e4a76b5ca3b3e4e2261ef4cf69dadd9460703f14e34090d4e574025a52acef9f54e897679115e2122b0095d9d7eab556024bb0e9c695915951a58'
             'd17176547a1ed2b7aa4743eb66a06308db182a993985a1905b418dfa46b74723631b17fd0d536adfefbdf4900d3b71cdf1e7d663ad379fa11b58b613dccb931c')
 
@@ -43,6 +45,7 @@ prepare() {
 
   # Apply patches.
   patch --forward --strip=2 --input="${srcdir}"/libsanitizer.patch
+  patch --strip=1 --input="${srcdir}"/Workaround-for-format-security.patch
 
   # Link isl/cloog for in-tree builds
   ln -sf "../isl-${_islver}" isl
@@ -70,8 +73,12 @@ build() {
 
   # using -pipe causes spurious test-suite failures
   # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=48565
-  CFLAGS=${CFLAGS/-pipe/}
-  CXXFLAGS=${CXXFLAGS/-pipe/}
+  export CFLAGS="${CFLAGS/-pipe/} -Wno-error=format-security -Wformat-security"
+  export CXXFLAGS="${CXXFLAGS/-pipe/} -Wno-error=format-security -Wformat-security"
+  
+  export CFLAGS_FOR_TARGET="-march=x86-64 -mtune=generic -O2 -pipe -fno-plt -fexceptions -Wp,-D_FORTIFY_SOURCE=2 -Wno-error=format-security -Wformat-security"
+  export CXXFLAGS_FOR_TARGET="-march=x86-64 -mtune=generic -O2 -pipe -fno-plt -fexceptions -Wp,-D_FORTIFY_SOURCE=2 -Wno-error=format-security -Wformat-security"
+
 
   "${srcdir}/gcc/configure" \
     --prefix=/usr \
@@ -108,6 +115,7 @@ build() {
     --with-java-home="$JAVA_HOME" \
     --enable-libgcj-multifile \
     --enable-version-specific-runtime-libs \
+    --enable-build-warnings \
     --program-suffix=-${_ver}
 
   make
@@ -271,6 +279,7 @@ package_gcc6-gcj() {
   install -m755 jvgenmain "${pkgdir}"/"${_libdir}"/
 
   # Remove conflicting files.
+  rm "${pkgdir}"/usr/lib/gcc/"$CHOST"/lib/libgcc_s.so*
   rm "${pkgdir}"/"${_libdir}"/libg{cj,ij}*.so*
   rm "${pkgdir}"/"${_libdir}"/libgcc_eh.a
   rm "${pkgdir}"/"${_libdir}"/crtbegin.o
diff --git a/Workaround-for-format-security.patch b/Workaround-for-format-security.patch
new file mode 100644
index 000000000000..38f2f14d746b
--- /dev/null
+++ b/Workaround-for-format-security.patch
@@ -0,0 +1,39 @@
+From 68cc2334bce1dee833a5a42d95a3b66d63fb0b51 Mon Sep 17 00:00:00 2001
+From: Joey Dumont <joey.dumont@gmail.com>
+Date: Tue, 1 Jun 2021 06:52:21 -0400
+Subject: [PATCH] Workaround for Werror=format-security.
+
+---
+ gcc/configure    | 2 +-
+ gcc/configure.ac | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gcc/configure b/gcc/configure
+index 55b84b942..319219398 100755
+--- a/gcc/configure
++++ b/gcc/configure
+@@ -6635,7 +6635,7 @@ else
+ fi
+ 
+ if test $enable_build_format_warnings = no; then :
+-  wf_opt=-Wno-format
++  wf_opt=-Wno-format -Wno-format-security
+ else
+   wf_opt=
+ fi
+diff --git a/gcc/configure.ac b/gcc/configure.ac
+index 4bda5318c..81f883d67 100644
+--- a/gcc/configure.ac
++++ b/gcc/configure.ac
+@@ -478,7 +478,7 @@ AC_ARG_ENABLE(build-format-warnings,
+   AS_HELP_STRING([--disable-build-format-warnings],[don't use -Wformat while building GCC]),
+   [],[enable_build_format_warnings=yes])
+ AS_IF([test $enable_build_format_warnings = no],
+-      [wf_opt=-Wno-format],[wf_opt=])
++      [wf_opt=-Wno-format -Wno-format-security],[wf_opt=])
+ ACX_PROG_CXX_WARNING_OPTS(
+ 	m4_quote(m4_do([-W -Wall -Wno-narrowing -Wwrite-strings -Wcast-qual $wf_opt])), [loose_warn])
+ ACX_PROG_CC_WARNING_OPTS(
+-- 
+2.31.1
+