1 files changed, 12 insertions, 13 deletions
diff --git a/libre/xtensa-unknown-elf-binutils/PKGBUILD b/libre/xtensa-unknown-elf-binutils/PKGBUILD
index be9284c45..deb8d4b0e 100644
--- a/libre/xtensa-unknown-elf-binutils/PKGBUILD
+++ b/libre/xtensa-unknown-elf-binutils/PKGBUILD
@@ -15,7 +15,7 @@ url="http://www.gnu.org/software/binutils/"
 license=('GPL')
 groups=("${_target}-base-devel")
 depends=('glibc>=2.17' 'zlib')
-options=('!libtool')
+options=('!libtool' '!distcc' '!ccache')
 install=${_target}-binutils.install
 source=(ftp://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.bz2{,.sig}
         binutils-2.23.2-texinfo-5.0.patch)
@@ -28,7 +28,10 @@ prepare() {
 
   # http://sourceware.org/git/?p=binutils.git;a=patch;h=e02bf935
   # http://sourceware.org/git/?p=binutils.git;a=patch;h=935f8542
-  patch -Np1 -i ${srcdir}/binutils-2.23.2-texinfo-5.0.patch
+  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
 
   mkdir ${srcdir}/binutils-build
 }
@@ -38,32 +41,28 @@ build() {
 
   ${srcdir}/binutils-${pkgver}/configure --prefix=/usr \
     --target=${_target} \
-    --bindir=/usr/bin --sbindir=/usr/bin \
     --disable-nls \
+    --with-lib-path=/usr/lib:/usr/local/lib \
+    --with-bugurl=https://labs.parabola.nu/ \
     --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 \
+    --disable-werror --disable-multilib
 
   # check the host environment and makes sure all the necessary tools are available
   make configure-host
 
-  make
+  make tooldir=/usr
 }
 
 package() {
   cd ${srcdir}/binutils-build
-  make prefix=${pkgdir}/usr install
+  make prefix=${pkgdir}/usr tooldir=${pkgdir}/usr install
 
   # Remove unwanted files
   rm ${pkgdir}/usr/share/man/man1/${_target}-{dlltool,nlmconv,windres,windmc}*
 
   # Remove unnecessary files and folders
-  rm $pkgdir/usr/${_target}/bin/* && rmdir $pkgdir/usr/${_target}/bin
+  rm $pkgdir/usr/bin/{a{r,s},nm,obj{copy,dump},ranlib,strip}
+  rm $pkgdir/usr/lib/libiberty.a
   rm $pkgdir/usr/$CHOST/${_target}/include/* && rmdir $pkgdir/usr/$CHOST/${_target}/include
   rm $pkgdir/usr/share/info/* && rmdir $pkgdir/usr/share/info
 }