Taro's based idea moved from ath9k-htc-firmware to xtensa-unknown-elf-{binutils,gcc}

3 files changed, 40 insertions, 13 deletions

diff --git a/cross/xtensa-unknown-elf-binutils/PKGBUILD b/cross/xtensa-unknown-elf-binutils/PKGBUILD
index 7b864eeb6..76d6bda78 100644
--- a/cross/xtensa-unknown-elf-binutils/PKGBUILD
+++ b/cross/xtensa-unknown-elf-binutils/PKGBUILD
@@ -1,20 +1,23 @@
 # $Id: PKGBUILD 182407 2013-04-10 07:34:20Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+# Maintainer (Parabola): Márcio Silva <coadde@parabola.nu>
+# Contributor (Parabola): Taro <taro-k@movasense.com>
 
 _pkgname=binutils
 _target="xtensa-unknown-elf"
 
 pkgname=${_target}-${_pkgname}
 pkgver=2.23.2
-pkgrel=2.5
+pkgrel=2.7
 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')
+conflicts=binutils
+provides="binutils=2.24"
 options=('!libtool' '!distcc' '!ccache')
 install=${_target}-binutils.install
 source=(ftp://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.bz2{,.sig}
@@ -70,4 +73,22 @@ package() {
   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
+
+  # many packages expect those symlinks
+  ln -s ${_target}-addr2line $pkgdir/usr/bin/addr2line
+  ln -s ${_target}-ar        $pkgdir/usr/bin/ar
+  ln -s ${_target}-as        $pkgdir/usr/bin/as
+  ln -s ${_target}-c++filt   $pkgdir/usr/bin/c++filt
+  ln -s ${_target}-elfedit   $pkgdir/usr/bin/elfedit
+  ln -s ${_target}-gprof     $pkgdir/usr/bin/gprof
+  ln -s ${_target}-ld        $pkgdir/usr/bin/ld
+  ln -s ${_target}-ld.bfd    $pkgdir/usr/bin/ld.bfd
+  ln -s ${_target}-nm        $pkgdir/usr/bin/nm
+  ln -s ${_target}-objcopy   $pkgdir/usr/bin/objcopy
+  ln -s ${_target}-objdump   $pkgdir/usr/bin/objdump
+  ln -s ${_target}-ranlib    $pkgdir/usr/bin/ranlib
+  ln -s ${_target}-readelf   $pkgdir/usr/bin/readelf
+  ln -s ${_target}-size      $pkgdir/usr/bin/size
+  ln -s ${_target}-strings   $pkgdir/usr/bin/strings
+  ln -s ${_target}-strip     $pkgdir/usr/bin/strip
 }
diff --git a/cross/xtensa-unknown-elf-gcc/PKGBUILD b/cross/xtensa-unknown-elf-gcc/PKGBUILD
index 50d125e8a..2d7364143 100644
--- a/cross/xtensa-unknown-elf-gcc/PKGBUILD
+++ b/cross/xtensa-unknown-elf-gcc/PKGBUILD
@@ -1,7 +1,8 @@
 # $Id: PKGBUILD 186915 2013-05-31 23:25:14Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-# Contributor (Parabola): Márcio Silva <coadde@lavabit.com>
+# Maintainer (Parabola): Márcio Silva <coadde@parabola.nu>
+# Contributor (Parabola): Taro <taro-k@movasense.com>
 
 _pkgname=gcc
 _target="xtensa-unknown-elf"
@@ -9,12 +10,12 @@ _sysroot="/usr/$CHOST/${_target}"
 
 pkgname=${_target}-${_pkgname}
 pkgver=4.8.1
-pkgrel=1.3
+pkgrel=1.5
 pkgdesc="The GNU Compiler Collection for the Xtensa architecture"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL' 'custom')
 url="http://gcc.gnu.org"
-makedepends=("${_target}-binutils>=2.23" 'libmpc' 'cloog' 'gcc-ada' 'doxygen')
+makedepends=("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
@@ -78,6 +79,8 @@ build() {
 package() {
   pkgdesc="The GNU Compiler Collection for the Xtensa architecture"
   depends=("${_target}-binutils>=2.23" 'libmpc' 'cloog')
+  conflicts=gcc
+  provides="gcc=4.8.2"
   groups=("${_target}-devel")
   install=${_target}-gcc.install
 
@@ -85,8 +88,16 @@ package() {
   
   make -j1 DESTDIR=${pkgdir} install-gcc
 
-  # many packages expect this symlinks
-  ln -s ${_target}-gcc ${pkgdir}/usr/bin/${_target}-cc
+  # many packages expect those symlinks
+  ln -s ${_target}-gcc        ${pkgdir}/usr/bin/${_target}-cc
+  ln -s ${_target}-gcc        ${pkgdir}/usr/bin/cc
+  ln -s ${_target}-cpp        ${pkgdir}/usr/bin/cpp
+  ln -s ${_target}-gcc        ${pkgdir}/usr/bin/gcc
+  ln -s ${_target}-gcc-4.8.1  ${pkgdir}/usr/bin/gcc-4.8.1
+  ln -s ${_target}-gcc-ar     ${pkgdir}/usr/bin/gcc-ar
+  ln -s ${_target}-gcc-nm     ${pkgdir}/usr/bin/gcc-nm
+  ln -s ${_target}-gcc-ranlib ${pkgdir}/usr/bin/gcc-ranlib
+  ln -s ${_target}-gcov       ${pkgdir}/usr/bin/gcov
 
   # Remove unnecessary files and folders
   rm $pkgdir/usr/share/info/* && rmdir $pkgdir/usr/share/info
diff --git a/libre/ath9k-htc-firmware/PKGBUILD b/libre/ath9k-htc-firmware/PKGBUILD
index b47b95e0e..9b6c417f8 100644
--- a/libre/ath9k-htc-firmware/PKGBUILD
+++ b/libre/ath9k-htc-firmware/PKGBUILD
@@ -1,10 +1,9 @@
 # Maintainer: André Silva <emulatorman@parabola.nu>
 # Maintainer: Márcio Silva <coadde@parabola.nu>
-# Contributor: Taro <taro-k@movasense.com>
 
 pkgname=ath9k-htc-firmware
 pkgver=1.3.2
-pkgrel=4
+pkgrel=5
 pkgdesc='Free firmware files for the Qualcomm Atheros AR7010 and AR9271 USB 802.11n NICs'
 arch=('any')
 url=('http://wireless.kernel.org/en/users/Drivers/ath9k_htc')
@@ -17,9 +16,6 @@ md5sums=('73c66751151dd47535cb4142477da480'
 
 prepare() {
 
-  mkdir -p $srcdir/bin
-  ln -s /usr/bin/xtensa-unknown-elf-as $srcdir/bin/as
-  export PATH=$srcdir/bin:$PATH
   cd $srcdir/open-ath9k-htc-firmware-$pkgver/target_firmware
   mkdir -p build/{k2,magpie}
 
@@ -39,7 +35,6 @@ INCLUDE(CMakeForceCompiler)
 SET(CMAKE_SYSTEM_PROCESSOR xtensa)
 SET(COMPILER_PREFIX "xtensa-unknown-elf")
 SET(CMAKE_FIND_ROOT_PATH /usr/xtensa-unknown-elf)
-SET(CMAKE_OBJCOPY /usr/bin/xtensa-unknown-elf-objcopy)
 
 CMAKE_FORCE_C_COMPILER(/usr/bin/xtensa-unknown-elf-gcc GNU)
 EOF