xtensa-unknown-elf: fixing pkg

1 files changed, 20 insertions, 47 deletions

diff --git a/libre/xtensa-unknown-elf-binutils/PKGBUILD b/libre/xtensa-unknown-elf-binutils/PKGBUILD
index 2e29d1ff4..be9284c45 100644
--- a/libre/xtensa-unknown-elf-binutils/PKGBUILD
+++ b/libre/xtensa-unknown-elf-binutils/PKGBUILD
@@ -1,23 +1,21 @@
 # $Id: PKGBUILD 182407 2013-04-10 07:34:20Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
-# Contributor (Parabola): Márcio Silva <coadde@lavabit.com>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 
 _pkgname=binutils
 _target="xtensa-unknown-elf"
-_sysroot="/usr/$CHOST/${_target}"
 
 pkgname=${_target}-binutils
 pkgver=2.23.2
-pkgrel=2.3
+pkgrel=2.4
 pkgdesc="A set of programs to assemble and manipulate binary and object files for the Xtensa architecture"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/binutils/"
 license=('GPL')
 groups=("${_target}-base-devel")
 depends=('glibc>=2.17' 'zlib')
-checkdepends=('dejagnu' 'bc')
-options=('!libtool' '!distcc' '!ccache')
+options=('!libtool')
 install=${_target}-binutils.install
 source=(ftp://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.bz2{,.sig}
         binutils-2.23.2-texinfo-5.0.patch)
@@ -30,10 +28,7 @@ prepare() {
 
   # http://sourceware.org/git/?p=binutils.git;a=patch;h=e02bf935
   # http://sourceware.org/git/?p=binutils.git;a=patch;h=935f8542
-  patch -p1 -i ${srcdir}/binutils-2.23.2-texinfo-5.0.patch
-
-  # hack! - libiberty configure tests for header files using "$CPP $CPPFLAGS"
-  sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" libiberty/configure
+  patch -Np1 -i ${srcdir}/binutils-2.23.2-texinfo-5.0.patch
 
   mkdir ${srcdir}/binutils-build
 }
@@ -41,56 +36,34 @@ prepare() {
 build() {
   cd ${srcdir}/binutils-build
 
-  CFLAGS=" -pipe " \
-  CXXFLAGS=" -pipe " \
   ${srcdir}/binutils-${pkgver}/configure --prefix=/usr \
-    --with-lib-path=/usr/lib:/usr/local/lib \
-    --with-bugurl=https://labs.parabola.nu/ \
-    --enable-ld=default --enable-gold \
-    --enable-plugins --enable-threads \
-    --with-pic --enable-shared \
-    --disable-werror --disable-multilib \
-    --target=${_target}
+    --target=${_target} \
+    --bindir=/usr/bin --sbindir=/usr/bin \
+    --disable-nls \
+    --enable-shared \
+    --disable-multilib \
+    --with-bugurl=https://labs.parabola.nu/
+#    --libdir=/usr/lib --libexecdir=/usr/lib --with-lib-path=/usr/lib \
+#    --enable-ld=default --enable-gold \
+#    --enable-plugins --enable-threads \
+#    --with-pic \
+#    --disable-werror \
 
   # check the host environment and makes sure all the necessary tools are available
   make configure-host
 
-  make tooldir=/usr
-}
-
-check() {
-  cd ${srcdir}/binutils-build
-  
-  # unset LDFLAGS as testsuite makes assumptions about which ones are active
-  # do not abort on errors - manually check log files
-  make LDFLAGS="" -k check || true
+  make
 }
 
 package() {
   cd ${srcdir}/binutils-build
-  make prefix=${pkgdir}/usr tooldir=${pkgdir}/usr install
-  
-  # Add some useful headers
-  install -m644 ${srcdir}/binutils-${pkgver}/include/libiberty.h ${pkgdir}/usr/include
-  install -m644 ${srcdir}/binutils-${pkgver}/include/demangle.h ${pkgdir}/usr/include
-
-  # Install PIC libiberty.a
-  install -m644 libiberty/pic/libiberty.a ${pkgdir}/usr/lib
+  make prefix=${pkgdir}/usr install
 
   # Remove unwanted files
   rm ${pkgdir}/usr/share/man/man1/${_target}-{dlltool,nlmconv,windres,windmc}*
-  rm ${pkgdir}/usr/share/info/{configure,standards}.info
 
   # Remove unnecessary files and folders
-  rm -f $pkgdir/usr/bin/ar
-  rm -f $pkgdir/usr/bin/as
-  rm -f $pkgdir/usr/bin/ld
-  rm -f $pkgdir/usr/bin/nm
-  rm -f $pkgdir/usr/bin/objdump
-  rm -f $pkgdir/usr/bin/ranlib
-  rm -f $pkgdir/usr/bin/strip
-  rm -f $pkgdir/usr/bin/objcopy
-  rm -f $pkgdir/usr/include
-  rm -f $pkgdir/usr/lib/libiberty.a
-  rm -rf $pkgdir/usr/share
+  rm $pkgdir/usr/${_target}/bin/* && rmdir $pkgdir/usr/${_target}/bin
+  rm $pkgdir/usr/$CHOST/${_target}/include/* && rmdir $pkgdir/usr/$CHOST/${_target}/include
+  rm $pkgdir/usr/share/info/* && rmdir $pkgdir/usr/share/info
 }