From 27de30007e987b9c3911198da203a853dabc13d1 Mon Sep 17 00:00:00 2001 From: Márcio Alexandre Silva Delgado Date: Thu, 4 Jul 2013 00:20:18 -0300 Subject: xtensa-unknown-elf: fixing pkg --- libre/xtensa-unknown-elf-binutils/PKGBUILD | 67 +++++++++--------------------- libre/xtensa-unknown-elf-gcc/PKGBUILD | 58 +++++++------------------- 2 files changed, 35 insertions(+), 90 deletions(-) (limited to 'libre') 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 # Maintainer (Parabola): André Silva -# Contributor (Parabola): Márcio Silva +# Maintainer (Parabola): Márcio Silva _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 } diff --git a/libre/xtensa-unknown-elf-gcc/PKGBUILD b/libre/xtensa-unknown-elf-gcc/PKGBUILD index 6081151b7..797f67f9e 100644 --- a/libre/xtensa-unknown-elf-gcc/PKGBUILD +++ b/libre/xtensa-unknown-elf-gcc/PKGBUILD @@ -10,7 +10,6 @@ _sysroot="/usr/$CHOST/${_target}" pkgname=${_target}-gcc pkgver=4.8.1 pkgrel=1 -#_snapshot=4.8-20130502 pkgdesc="The GNU Compiler Collection for Xtensa processors" arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'FDL' 'custom') @@ -19,15 +18,9 @@ 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) - #ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2 md5sums=('3b2386c114cd74185aa3754b58a79304') - -if [ -n "${_snapshot}" ]; then - _basedir=gcc-${_snapshot} -else - _basedir=gcc-${pkgver} -fi +_basedir=gcc-${pkgver} prepare() { cd ${srcdir}/${_basedir} @@ -40,28 +33,23 @@ prepare() { echo ${pkgver} > gcc/BASE-VER - # hack! - some configure tests for header files using "$CPP $CPPFLAGS" - sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" {libiberty,gcc}/configure - mkdir ${srcdir}/gcc-build } build() { cd ${srcdir}/gcc-build - # using -pipe causes spurious test-suite failures - # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=48565 - CFLAGS=${CFLAGS/-pipe/} - CXXFLAGS=${CXXFLAGS/-pipe/} - - LD_LIBRARY_PATH=/usr/lib ${srcdir}/${_basedir}/configure --prefix=/usr \ - --disable-shared --disable-threads --disable-multilib \ - --enable-languages=c \ - --disable-nls \ - --target=$_target -# --build=x86_64-unknown-linux-gnu \ -# --without-headers \ -# --disable-multilib --disable-libssp --disable-werror \ + ${srcdir}/${_basedir}/configure --prefix=/home/marcio/src/xtensa-elf/tools \ + --target=${_target} \ + --disable-multilib \ + --disable-nls \ + --disable-shared \ + --disable-threads \ + --enable-languages=c \ + --disable-libquadmath \ + --disable-libssp \ + --with-newlib +# --disable-werror \ # --libdir=/usr/lib --libexecdir=/usr/lib \ # --mandir=/usr/share/man --infodir=/usr/share/info \ # --with-bugurl=https://labs.parabola.nu/ \ @@ -74,30 +62,14 @@ build() { # --enable-lto --enable-gold --enable-ld=default \ # --enable-plugin --with-plugin-ld=ld.gold \ # --with-linker-hash-style=gnu --disable-install-libiberty \ -# --with-as=/usr/bin/${_target}-as --with-ld=/usr/bin/${_target}-ld \ -# --disable-multilib --disable-libssp --disable-werror \ # --enable-checking=release \ -# --target=${_target} \ -# --with-newlib - make - + make all-gcc + # make documentation cd ${_target}/libstdc++-v3 make doc-man-doxygen } -check() { - cd ${srcdir}/gcc-build - - # increase stack size to prevent test failures - # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31827 - ulimit -s 32768 - - # do not abort on error as some are "expected" - make -k check || true - ${srcdir}/${_basedir}/contrib/test_summary -} - package() { pkgdesc="The GNU Compiler Collection" @@ -107,7 +79,7 @@ package() cd ${srcdir}/gcc-build - make -j1 DESTDIR=${pkgdir} install + make -j1 DESTDIR=${pkgdir} install-gcc install -d $pkgdir/usr/share/gdb/auto-load/usr/lib mv $pkgdir{,/usr/share/gdb/auto-load}/usr/lib/libstdc++.so.6.0.18-gdb.py -- cgit v1.2.3