xtensa-unknown-elf-gcc: fix issues on PKGBUILD

1 files changed, 27 insertions, 26 deletions

diff --git a/libre/xtensa-unknown-elf-gcc/PKGBUILD b/libre/xtensa-unknown-elf-gcc/PKGBUILD
index 2ad6a9a7e..5472ba164 100644
--- a/libre/xtensa-unknown-elf-gcc/PKGBUILD
+++ b/libre/xtensa-unknown-elf-gcc/PKGBUILD
@@ -3,15 +3,19 @@
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 # Contributor (Parabola): Márcio Silva <coadde@lavabit.com>
 
-pkgname=xtensa-elf-gcc
+_pkgname=gcc
+_target="xtensa-unknown-elf"
+_sysroot="/usr/${_target}"
+
+pkgname="${_target}-gcc
 pkgver=4.8.1
 pkgrel=1
 #_snapshot=4.8-20130502
-pkgdesc="The GNU Compiler Collection"
+pkgdesc="The GNU Compiler Collection for Xtensa processors"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL' 'custom')
 url="http://gcc.gnu.org"
-makedepends=('xtensa-elf-binutils>=2.23' 'libmpc' 'cloog' 'gcc-ada' 'doxygen')
+makedepends=("${_target}-binutils>=2.23" 'libmpc' 'cloog' 'gcc-ada' 'doxygen')
 checkdepends=('dejagnu' 'inetutils')
 options=('!libtool' '!emptydirs')
 source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2)
@@ -45,8 +49,6 @@ prepare() {
 build() {
   cd ${srcdir}/gcc-build
 
-  export LD_LIBRARY_PATH=/usr/lib
-
   # using -pipe causes spurious test-suite failures
   # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=48565
   CFLAGS=${CFLAGS/-pipe/}
@@ -57,7 +59,7 @@ build() {
       --mandir=/usr/share/man --infodir=/usr/share/info \
       --with-bugurl=https://labs.parabola.nu/ \
       --enable-languages=c \
-      --enable-shared --enable-threads=posix \
+      --disable-shared --enable-threads=posix \
       --with-system-zlib --enable-__cxa_atexit \
       --disable-libunwind-exceptions --enable-clocale=gnu \
       --disable-libstdcxx-pch \
@@ -68,12 +70,14 @@ build() {
       --with-linker-hash-style=gnu --disable-install-libiberty \
       --disable-multilib --disable-libssp --disable-werror \
       --enable-checking=release \
-      --program-prefix=xtensa-elf- \
-      --target=xtensa-elf
+      --target=${_target} \
+      --with-sysroot=${_sysroot} \
+      --with-arch=xtensa \
+      --with-newlib
   make
   
   # make documentation
-  cd xtensa-elf/libstdc++-v3
+  cd ${_target}/libstdc++-v3
   make doc-man-doxygen
 }
 
@@ -92,8 +96,9 @@ check() {
 package()
 {
   pkgdesc="The GNU Compiler Collection"
-  depends=("gcc-libs=$pkgver-$pkgrel" 'xtensa-elf-binutils>=2.23' 'libmpc' 'cloog')
-  install=xtensa-elf-gcc.install
+  depends=("gcc-libs=$pkgver-$pkgrel" "${_target}-binutils>=2.23" 'libmpc' 'cloog')
+  groups=("${_target}-devel")
+  install=${_target}-gcc.install
 
   cd ${srcdir}/gcc-build
   
@@ -103,23 +108,23 @@ package()
   mv $pkgdir{,/usr/share/gdb/auto-load}/usr/lib/libstdc++.so.6.0.18-gdb.py
 
   # unfortunately it is much, much easier to install the lot and clean-up the mess...
-  rm $pkgdir/usr/bin/{{xtensa-elf-,}gfortran,{xtensa-elf-,}gccgo,gnat*}
+  rm $pkgdir/usr/bin/{{${_target}-,}gfortran,{${_target}-,}gccgo,gnat*}
   rm $pkgdir/usr/lib/*.so*
   rm $pkgdir/usr/lib/lib{atomic,gfortran,go{,begin},iberty,objc}.a
   rm $pkgdir/usr/lib/libgfortran.spec
-  rm -r $pkgdir/usr/lib/gcc/xtensa-elf/${pkgver}/{ada{include,lib},finclude,include/objc}
-  rm $pkgdir/usr/lib/gcc/xtensa-elf/${pkgver}/{cc1obj{,plus},f951,gnat1,go1}
-  rm $pkgdir/usr/lib/gcc/xtensa-elf/${pkgver}/{libcaf_single,libgfortranbegin}.a
+  rm -r $pkgdir/usr/lib/gcc/${_target}-/${pkgver}/{ada{include,lib},finclude,include/objc}
+  rm $pkgdir/usr/lib/gcc/${_target}-/${pkgver}/{cc1obj{,plus},f951,gnat1,go1}
+  rm $pkgdir/usr/lib/gcc/${_target}-/${pkgver}/{libcaf_single,libgfortranbegin}.a
   rm -r $pkgdir/usr/lib/go
   rm $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libgomp,libquadmath,libitm}.info
   rm $pkgdir/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo
   rm $pkgdir/usr/share/man/man1/{gccgo,gfortran}.1
 
   # many packages expect this symlinks
-  ln -s gcc ${pkgdir}/usr/bin/cc
+  ln -s ${_target}-gcc ${pkgdir}/usr/bin/${_target}-cc
 
   # POSIX conformance launcher scripts for c89 and c99
-  cat > $pkgdir/usr/bin/c89 <<"EOF"
+  cat > $pkgdir/usr/bin/${_target}-c89 <<"EOF"
 #!/bin/sh
 fl="-std=c89"
 for opt; do
@@ -129,10 +134,10 @@ for opt; do
 	    exit 1;;
   esac
 done
-exec gcc $fl ${1+"$@"}
+exec ${_target}-gcc $fl ${1+"$@"}
 EOF
 
-  cat > $pkgdir/usr/bin/c99 <<"EOF"
+  cat > $pkgdir/usr/bin/${_target}-c99 <<"EOF"
 #!/bin/sh
 fl="-std=c99"
 for opt; do
@@ -142,17 +147,13 @@ for opt; do
 	    exit 1;;
   esac
 done
-exec gcc $fl ${1+"$@"}
+exec ${_target}-gcc $fl ${1+"$@"}
 EOF
 
-  chmod 755 $pkgdir/usr/bin/c{8,9}9
+  chmod 755 $pkgdir/usr/bin/${_target}-c{8,9}9
 
-  # install the libstdc++ man pages
-  install -dm755 ${pkgdir}/usr/share/man/man3
-  install -m644 -t ${pkgdir}/usr/share/man/man3 \
-    xtensa-elf/libstdc++-v3/doc/doxygen/man/man3/*.3
 
   # Install Runtime Library Exception
   install -Dm644 ${srcdir}/${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/xtensa-elf-gcc/RUNTIME.LIBRARY.EXCEPTION
+    ${pkgdir}/usr/share/licenses/${_target}/RUNTIME.LIBRARY.EXCEPTION
 }