upgpkg: libre/xtensa-unknown-elf-gcc 7.3.1-1

1 files changed, 70 insertions, 135 deletions

diff --git a/libre/xtensa-unknown-elf-gcc/PKGBUILD b/libre/xtensa-unknown-elf-gcc/PKGBUILD
index 49094e4af..3887ba706 100644
--- a/libre/xtensa-unknown-elf-gcc/PKGBUILD
+++ b/libre/xtensa-unknown-elf-gcc/PKGBUILD
@@ -1,159 +1,94 @@
 # Maintainer (Arch): Allan McRae <allan@archlinux.org>
-# Maintainer: André Silva <emulatorman@hyperbola.info>
-# Maintainer: Márcio Silva <coadde@hyperbola.info>
+# Contributor: André Silva <emulatorman@hyperbola.info>
+# Contributor: Márcio Silva <coadde@hyperbola.info>
 # Maintainer: Luke R. <g4jc@openmailbox.org>
-
-pkgname=xtensa-unknown-elf-gcc
-pkgver=6.3.1
-gccver=6.3.0
-_pkgverpatch=6.2.1
-_pkgver=6
-_islver=0.16
-pkgrel=1.92
-_commit=c2103c17
-pkgdesc="The GNU Compiler Collection"
-arch=('i686' 'x86_64' 'armv7h')
-license=('GPL' 'LGPL' 'FDL' 'custom')
-url="http://gcc.gnu.org"
-makedepends=('binutils>=2.27' 'libmpc' 'doxygen')
-checkdepends=('dejagnu' 'inetutils')
-options=('!emptydirs')
-source=(https://ftp.gnu.org/gnu/gcc/gcc-$gccver/gcc-$gccver.tar.bz2{,.sig}
-        http://isl.gforge.inria.fr/isl-${_islver}.tar.bz2
-        https://repo.parabola.nu/other/gcc/$_pkgverpatch/gcc-xtensa.patch)
-validpgpkeys=('33C235A34C46AA3FFB293709A328C3A2C3C45C06') # Jakub Jelinek <jakub@redhat.com> # Note: (Weak DSA) :(
-sha512sums=('234dd9b1bdc9a9c6e352216a7ef4ccadc6c07f156006a59759c5e0e6a69f0abcdc14630eff11e3826dd6ba5933a8faa43043f3d1d62df6bd5ab1e82862f9bf78'
-            'SKIP'
-            '680da559a37e377c494d9688577159c5c6552c38bf60986c982df8144f3ef60785d530f7223a553c8446bac0c05fd52398e946b1419fbcf511e06316a8fd2d18'
-            '7637408259cef4b14a2f41690bbc769ad0dc6cf4d1c782405526aeb58f68193269af6882b23fb57c3521174e45709ed2d54f0af1f835646e70a3bfd9f626aad9')
-
-# gcc-6.0 forces a changed triplet - need to address in pacman/devtools
-[[ $CARCH == "x86_64" ]] && CHOST=x86_64-pc-linux-gnu
-
-_libdir="usr/lib/gcc/xtensa-unknown-elf/$gccver"
+# Maintainer: David P. <megver83@parabola.nu>
+
+_target=xtensa-unknown-elf
+pkgname=$_target-gcc
+pkgver=7.3.1
+_islver=0.18
+pkgrel=1
+_snapshot=7-20180125
+pkgdesc='The GNU Compiler Collection - C and C++ frontends'
+arch=('x86_64' 'i686' 'armv7h')
+url='http://gcc.gnu.org/'
+license=(GPL LGPL FDL)
+depends=($_target-binutils libmpc zlib)
+makedepends=(gmp mpfr)
+options=(!emptydirs !strip)
+source=(#https://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-$pkgver.tar.bz2
+        https://gcc.gnu.org/pub/gcc/snapshots/$_snapshot/gcc-$_snapshot.tar.xz
+        http://isl.gforge.inria.fr/isl-$_islver.tar.bz2)
+sha512sums=('87558e9cf6d44df0c45e2bde8ef4d4a8b77716382ae0cd787b80bb4650a0a033d2b815a3b3eaa1798a16d66afca0d38c83a268bed0b26bdf013a483f04923298'
+            '85d0b40f4dbf14cb99d17aa07048cdcab2dc3eb527d2fbb1e84c41b2de5f351025370e57448b63b2b8a8cf8a0843a089c3263f9baee1542d5c2e1cb37ed39d94')
+
+if [ -n "$_snapshot" ]; then
+  _basedir=gcc-$_snapshot
+else
+  _basedir=gcc-$pkgver
+fi
 
 prepare() {
-  cd ${srcdir}/gcc-$gccver
+  cd $_basedir
+
+  # link isl for in-tree builds
+  ln -sf ../isl-$_islver isl
 
-  # link isl for in-tree build
-  ln -s ../isl-${_islver} isl
+  echo $pkgver > gcc/BASE-VER
 
   # Do not run fixincludes
   sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
 
-  # Parabola installs x86_64 libraries /lib
-  [[ $CARCH == "x86_64" ]] && sed -i '/m64=/s/lib64/lib/' gcc/config/i386/t-linux64
-
   # hack! - some configure tests for header files using "$CPP $CPPFLAGS"
-  sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" {libiberty,gcc}/configure
-
-  # open-ath9k-htc-firmware patch
-  patch -p1 -i ${srcdir}/gcc-xtensa.patch
+  sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" "$srcdir"/$_basedir/{libiberty,gcc}/configure
 
-  mkdir ${srcdir}/gcc-build
+  rm -rf $srcdir/gcc-build
+  mkdir $srcdir/gcc-build
 }
 
 build() {
-  cd ${srcdir}/gcc-build
+  cd gcc-build
 
   # using -pipe causes spurious test-suite failures
   # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=48565
   CFLAGS=${CFLAGS/-pipe/}
   CXXFLAGS=${CXXFLAGS/-pipe/}
 
-  # --disable-linker-build-id: https://bugs.archlinux.org/task/34902
-
-  ${srcdir}/gcc-$gccver/configure --prefix=/usr \
-      --libdir=/usr/lib \
-      --libexecdir=/usr/lib \
-      --mandir=/usr/share/man \
-      --with-bugurl=https://labs.parabola.nu/ \
-      --enable-languages=c,c++,lto \
-      --enable-shared \
-      --enable-threads=posix \
-      --enable-libmpx \
-      --with-system-zlib \
-      --with-isl \
-      --enable-__cxa_atexit \
-      --disable-libunwind-exceptions \
-      --enable-clocale=gnu \
-      --disable-libstdcxx-pch \
-      --disable-libssp \
-      --enable-gnu-unique-object \
-      --disable-linker-build-id \
-      --enable-lto \
-      --enable-plugin \
-      --enable-install-libiberty \
-      --with-linker-hash-style=gnu \
-      --enable-gnu-indirect-function \
-      --disable-multilib \
-      --disable-werror \
-      --enable-checking=release \
-      --disable-nls \
-      --target=xtensa-unknown-elf
-  make all-gcc
+  $srcdir/$_basedir/configure \
+        --prefix=/usr \
+        --libdir=/usr/lib --libexecdir=/usr/lib \
+        --mandir=/usr/share/man \
+        --with-bugurl=https://labs.parabola.nu/ \
+        --enable-languages=c,c++ \
+        --enable-shared --enable-threads=posix --enable-libmpx \
+        --with-system-zlib --with-isl --enable-__cxa_atexit \
+        --disable-libunwind-exceptions --enable-clocale=gnu \
+        --disable-libstdcxx-pch --disable-libssp \
+        --enable-gnu-unique-object --enable-linker-build-id \
+        --enable-lto --enable-plugin --enable-install-libiberty \
+        --with-linker-hash-style=gnu --enable-gnu-indirect-function \
+        --disable-multilib --disable-werror \
+        --enable-checking=release --disable-nls \
+        --target=$_target --host=$CHOST --build=$CHOST
+
+  make ${MAKEFLAGS} all-gcc
+
 }
 
 package() {
-  pkgdesc="The GNU Compiler Collection - C and C++ frontends"
-  depends=("xtensa-unknown-elf-binutils>=2.26" 'libmpc')
-  groups=('cross-devel')
-  options=('staticlibs')
-
-  cd ${srcdir}/gcc-build
-
-  make -C gcc DESTDIR=${pkgdir} install-driver install-cpp install-gcc-ar \
-    c++.install-common install-headers install-plugin install-lto-wrapper
-
-  install -m755 gcc/gcov $pkgdir/usr/bin/xtensa-unknown-elf-gcov
-  install -m755 -t $pkgdir/${_libdir}/ gcc/{cc1,cc1plus,collect2,lto1}
-
-  make DESTDIR=${pkgdir} install-fixincludes
-  make -C gcc DESTDIR=${pkgdir} install-mkheaders
-  make -C lto-plugin DESTDIR=${pkgdir} install
-
-  make -C gcc DESTDIR=${pkgdir} install-man
-
-  make -C libcpp DESTDIR=${pkgdir} install
-  make -C gcc DESTDIR=${pkgdir} install-po
-
-  # many packages expect this symlink
-  ln -s xtensa-unknown-elf-gcc ${pkgdir}/usr/bin/xtensa-unknown-elf-cc
-
-  # POSIX conformance launcher scripts for c89 and c99
-  cat > $pkgdir/usr/bin/xtensa-unknown-elf-c89 <<"EOF"
-#!/bin/sh
-fl="-std=c89"
-for opt; do
-  case "$opt" in
-    -ansi|-std=c89|-std=iso9899:1990) fl="";;
-    -std=*) echo "`basename $0` called with non ANSI/ISO C option $opt" >&2
-	    exit 1;;
-  esac
-done
-exec gcc $fl ${1+"$@"}
-EOF
-sed -i "s|exec gcc|exec xtensa-unknown-elf-gcc|" $pkgdir/usr/bin/xtensa-unknown-elf-c89
-
-  cat > $pkgdir/usr/bin/xtensa-unknown-elf-c99 <<"EOF"
-#!/bin/sh
-fl="-std=c99"
-for opt; do
-  case "$opt" in
-    -std=c99|-std=iso9899:1999) fl="";;
-    -std=*) echo "`basename $0` called with non ISO C99 option $opt" >&2
-	    exit 1;;
-  esac
-done
-exec gcc $fl ${1+"$@"}
-EOF
-sed -i "s|exec gcc|exec xtensa-unknown-elf-gcc|" $pkgdir/usr/bin/xtensa-unknown-elf-c99
-
-  chmod 755 $pkgdir/usr/bin/xtensa-unknown-elf-c{8,9}9
-
-  # Remove man documents that conflict with host version
-  rm -rf ${pkgdir}/usr/share/man/man7
-
-  # Remove unused dirs
-  rmdir ${pkgdir}/usr/{include,share/info}
+  cd gcc-build
+
+  make DESTDIR="$pkgdir" install-gcc
+  libtool --finish $pkgdir/usr/lib/gcc/$_target/$pkgver
+  
+  # strip target binaries
+  find "$pkgdir"/usr/lib/gcc/$_target/ -type f -and \( -name \*.a -or -name \*.o \) -exec $_target-objcopy -R .comment -R .note -R .debug_info -R .debug_aranges -R .debug_pubnames -R .debug_pubtypes -R .debug_abbrev -R .debug_line -R .debug_str -R .debug_ranges -R .debug_loc '{}' \;
+
+  # strip host binaries
+  find "$pkgdir"/usr/bin/ "$pkgdir"/usr/lib/gcc/$_target/ -type f -and \( -executable \) -exec strip '{}' \;
+
+  # Remove files that conflict with host gcc package
+  rm -r "$pkgdir"/usr/share/man/man7
+  rm -r "$pkgdir"/usr/share/info
 }