From b94a647b28b14632b0d2033b4543009eea69f151 Mon Sep 17 00:00:00 2001 From: David P Date: Mon, 9 Apr 2018 22:25:13 -0300 Subject: upgpkg: libre/xtensa-unknown-elf-{gcc,binutils} --- libre/xtensa-unknown-elf-binutils/PKGBUILD | 85 ++++++++++++++---------------- libre/xtensa-unknown-elf-gcc/PKGBUILD | 14 +++-- 2 files changed, 51 insertions(+), 48 deletions(-) diff --git a/libre/xtensa-unknown-elf-binutils/PKGBUILD b/libre/xtensa-unknown-elf-binutils/PKGBUILD index e50dc2fe8..914ee306d 100644 --- a/libre/xtensa-unknown-elf-binutils/PKGBUILD +++ b/libre/xtensa-unknown-elf-binutils/PKGBUILD @@ -1,75 +1,72 @@ # Maintainer (Arch): Allan McRae -# Maintainer: André Silva -# Maintainer: Márcio Silva +# Contributor: André Silva +# Contributor: Márcio Silva # Maintainer: Luke R. +# Maintainer: David P. -pkgname=xtensa-unknown-elf-binutils -pkgver=2.27 -_pkgverpatch=$pkgver -pkgrel=1.92 +_target=xtensa-unknown-elf +pkgname=$_target-binutils +pkgver=2.29.1 +pkgrel=2 pkgdesc="A set of programs to assemble and manipulate binary and object files" -arch=('i686' 'x86_64' 'armv7h') +arch=('x86_64' 'i686' 'armv7h') url="https://www.gnu.org/software/binutils/" license=('GPL') groups=('cross-devel') -depends=('glibc>=2.24-2' 'zlib') -checkdepends=('dejagnu' 'bc') -options=('staticlibs' '!distcc' '!ccache') -source=(https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.bz2{,.sig} - https://repo.parabola.nu/other/binutils/$_pkgverpatch/binutils-xtensa.patch) -validpgpkeys=('EAF1C276A747E9ED86210CBAC3126D3B4AE55E93') # Tristan Gingold -sha512sums=('cf276f84935312361a2ca077e04d0b469d23a3aed979d8ba5d92ea590904ffb2c2e7ed12cc842822bfc402836be86f479660cef3791aa62f3753d8a1a6f564cb' +depends=('zlib') +source=("https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.bz2"{,.sig} + 'https://github.com/qca/open-ath9k-htc-firmware/raw/master/local/patches/binutils.patch') +sha512sums=('4063d34555526922376ccceb3f14b43e287442e82a8038cf50f4f51ad97d438c672c0e310ca4b856c9aff5aa9911073e256e8298a7a3f1844eeb60b90d955592' 'SKIP' 'e10ed358794d7aa32ac25087afd804dc4c3028c4664d7608eb86147f041561d16209afa6501bc8a19e02386674011d567640175f6b8bf89275c243dc3b3a9980') +validpgpkeys=('EAF1C276A747E9ED86210CBAC3126D3B4AE55E93' # Tristan Gingold + '3A24BC1E8FB409FA9F14371813FCEF89DD9E3C4F') # Nick Clifton (Chief Binutils Maintainer) prepare() { cd binutils-$pkgver - - # hack! - libiberty configure tests for header files using "$CPP $CPPFLAGS" sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" libiberty/configure - - # open-ath9k-htc-firmware patch - patch -p1 -i ${srcdir}/binutils-xtensa.patch - - mkdir ${srcdir}/binutils-build + patch -p1 -i ../binutils.patch } build() { - cd binutils-build + cd binutils-$pkgver - ../binutils-$pkgver/configure \ - --prefix=/usr \ - --with-lib-path=/usr/lib:/usr/local/lib \ - --with-bugurl=https://labs.parabola.nu/ \ - --enable-threads \ - --with-pic \ - --enable-ld=default \ - --enable-gold \ - --enable-plugins \ - --enable-deterministic-archives \ - --disable-werror \ - --disable-gdb \ - --disable-nls \ - --target=xtensa-unknown-elf --with-sysroot=/usr/xtensa-unknown-elf + if [ "${CARCH}" != "i686" ]; then + # enabling gold linker at i686 makes the install fail + enable_gold='--enable-gold' + fi - # check the host environment and makes sure all the necessary tools are available - make configure-host + ./configure --target=$_target \ + --with-sysroot=/usr/$_target \ + --prefix=/usr \ + --disable-multilib \ + --with-gnu-as \ + --with-gnu-ld \ + --disable-nls \ + --enable-ld=default \ + $enable_gold \ + --enable-plugins \ + --enable-deterministic-archives - make tooldir=/usr + make } check() { - cd binutils-build + cd binutils-$pkgver # unset LDFLAGS as testsuite makes assumptions about which ones are active - # ignore failures in gold testsuite... + # do not abort on errors - manually check log files make -k LDFLAGS="" check || true } package() { - cd binutils-build - make prefix=${pkgdir}/usr install + cd binutils-$pkgver + + make DESTDIR="$pkgdir" install + + # Remove file conflicting with host binutils and manpages for MS Windows tools + rm "$pkgdir"/usr/share/man/man1/$_target-{dlltool,nlmconv,windres,windmc}* # Remove info documents that conflict with host version - rm -rf ${pkgdir}/usr/share/info + rm -r "$pkgdir"/usr/share/info } diff --git a/libre/xtensa-unknown-elf-gcc/PKGBUILD b/libre/xtensa-unknown-elf-gcc/PKGBUILD index 3887ba706..3c447c384 100644 --- a/libre/xtensa-unknown-elf-gcc/PKGBUILD +++ b/libre/xtensa-unknown-elf-gcc/PKGBUILD @@ -8,7 +8,7 @@ _target=xtensa-unknown-elf pkgname=$_target-gcc pkgver=7.3.1 _islver=0.18 -pkgrel=1 +pkgrel=2 _snapshot=7-20180125 pkgdesc='The GNU Compiler Collection - C and C++ frontends' arch=('x86_64' 'i686' 'armv7h') @@ -19,9 +19,11 @@ 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) + http://isl.gforge.inria.fr/isl-$_islver.tar.bz2 + https://raw.githubusercontent.com/qca/open-ath9k-htc-firmware/master/local/patches/gcc.patch) sha512sums=('87558e9cf6d44df0c45e2bde8ef4d4a8b77716382ae0cd787b80bb4650a0a033d2b815a3b3eaa1798a16d66afca0d38c83a268bed0b26bdf013a483f04923298' - '85d0b40f4dbf14cb99d17aa07048cdcab2dc3eb527d2fbb1e84c41b2de5f351025370e57448b63b2b8a8cf8a0843a089c3263f9baee1542d5c2e1cb37ed39d94') + '85d0b40f4dbf14cb99d17aa07048cdcab2dc3eb527d2fbb1e84c41b2de5f351025370e57448b63b2b8a8cf8a0843a089c3263f9baee1542d5c2e1cb37ed39d94' + '7637408259cef4b14a2f41690bbc769ad0dc6cf4d1c782405526aeb58f68193269af6882b23fb57c3521174e45709ed2d54f0af1f835646e70a3bfd9f626aad9') if [ -n "$_snapshot" ]; then _basedir=gcc-$_snapshot @@ -42,6 +44,8 @@ prepare() { # hack! - some configure tests for header files using "$CPP $CPPFLAGS" sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" "$srcdir"/$_basedir/{libiberty,gcc}/configure + + patch -p1 -i ../gcc.patch rm -rf $srcdir/gcc-build mkdir $srcdir/gcc-build @@ -54,6 +58,8 @@ build() { # 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/$_basedir/configure \ --prefix=/usr \ @@ -65,7 +71,7 @@ build() { --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-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 \ -- cgit v1.2.3