summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoey Dumont2021-08-24 21:26:47 -0400
committerJoey Dumont2021-08-24 21:26:47 -0400
commite72abcee6c2b4d4e5d052a8c16dd4158e8318b2f (patch)
tree359c7cdbb09e40c229b710e821662e8f5c75ae11
parentbf67eed283aa91af9513ea921d83fd86ce0b5a14 (diff)
downloadaur-e72abcee6c2b4d4e5d052a8c16dd4158e8318b2f.tar.gz
upgpkg: gcc6 6.5.0-6
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD9
2 files changed, 1 insertions, 14 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 36583f947d69..d14c965a6aa6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -20,8 +20,6 @@ pkgbase = gcc6
makedepends = libxtst
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
@@ -41,16 +39,12 @@ pkgname = gcc6
depends = binutils>=2.28
depends = libmpc
depends = zlib
- options = !emptydirs
- options = !makeflags
options = staticlibs
pkgname = gcc6-libs
pkgdesc = Runtime libraries shipped by GCC (6.x.x)
depends = glibc>=2.25
depends = zlib
- options = !emptydirs
- options = !makeflags
options = !strip
pkgname = gcc6-fortran
diff --git a/PKGBUILD b/PKGBUILD
index a4e40d07808f..91aa5065cbcb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -20,7 +20,6 @@ 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 !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"
@@ -39,8 +38,8 @@ _libdir="/usr/lib/gcc/$CHOST/$pkgver"
prepare() {
[[ ! -d gcc ]] && ln -s gcc-${pkgver/+/-} gcc
- cd gcc
+ cd gcc
# Apply patches.
patch --forward --strip=2 --input="${srcdir}"/libsanitizer.patch
@@ -64,8 +63,6 @@ prepare() {
}
build() {
- #export LD_PRELOAD=/usr/lib/libstdc++.so
-
cd gcc-build
# using -pipe causes spurious test-suite failures
@@ -135,8 +132,6 @@ package_gcc6-libs() {
depends=('glibc>=2.25' zlib)
options+=(!strip)
- #export LD_PRELOAD=/usr/lib/libstdc++.so
-
cd gcc-build
make -C "$CHOST"/libgcc DESTDIR="${pkgdir}" install-shared
rm "${pkgdir}"/"${_libdir}"/libgcc_eh.a
@@ -264,8 +259,6 @@ package_gcc6-gcj() {
depends=("gcc6=$pkgver-$pkgrel" libmpc libxtst gtk2 java-runtime libsm)
replaces=('gcc-gcj')
- #export LD_PRELOAD=/usr/lib/libstdc++.so
-
# Install libjava.
cd gcc-build
make -j1 DESTDIR="${pkgdir}" install-target-libjava