From ff8fb8c6b4fc4930e685db775dab9cd39fe7a55e Mon Sep 17 00:00:00 2001 From: amnon Date: Sun, 12 Sep 2010 17:27:07 +0000 Subject: [PATCH] update toolchain - read toolchain-readme --- cloog-ppl/PKGBUILD | 15 ++++++++++----- elfutils/PKGBUILD | 34 ++++++++++++++++++++++++++++++++++ gcc/PKGBUILD | 6 +++--- libelf/PKGBUILD | 24 ------------------------ libmpc/PKGBUILD | 4 ++-- mpfr/PKGBUILD | 23 +++++++++++++++-------- ppl/PKGBUILD | 32 +++++++++++++++++--------------- ppl/ppl-0.10.2-gmp-5.0.patch | 30 ------------------------------ 8 files changed, 81 insertions(+), 87 deletions(-) create mode 100644 elfutils/PKGBUILD delete mode 100644 libelf/PKGBUILD delete mode 100644 ppl/ppl-0.10.2-gmp-5.0.patch diff --git a/cloog-ppl/PKGBUILD b/cloog-ppl/PKGBUILD index 16f036982..68c173feb 100644 --- a/cloog-ppl/PKGBUILD +++ b/cloog-ppl/PKGBUILD @@ -1,15 +1,17 @@ -# $Id: PKGBUILD 78357 2010-04-22 02:43:20Z allan $ -# Maintainer: Allan McRae -# Contributor: ezzetabi +# +# Chakra Packages for Chakra, part of chakra-project.org +# +# maintainer (i686): Phil Miller +# maintainer (x86_64): Manuel Tortosa pkgname=cloog-ppl pkgver=0.15.9 -pkgrel=1 +pkgrel=2 pkgdesc="Library that generates loops for scanning polyhedra" arch=('i686' 'x86_64') url="http://www.cloog.org/" license=('GPL') -depends=('ppl') +depends=('ppl>=0.11') options=('!libtool') source=(ftp://gcc.gnu.org/pub/gcc/infrastructure/${pkgname}-${pkgver}.tar.gz) md5sums=('806e001d1b1a6b130069ff6274900af5') @@ -17,6 +19,9 @@ md5sums=('806e001d1b1a6b130069ff6274900af5') build() { cd $srcdir/$pkgname-$pkgver + # "Add" ppl-0.11 compatibility + sed -i "/ppl_minor_version=/s#10#11#" configure + ./configure --prefix=/usr --infodir=/usr/share/info \ --with-bits=gmp --with-ppl=/usr make diff --git a/elfutils/PKGBUILD b/elfutils/PKGBUILD new file mode 100644 index 000000000..025a17e45 --- /dev/null +++ b/elfutils/PKGBUILD @@ -0,0 +1,34 @@ +# +# Chakra Packages for Chakra, part of chakra-project.org +# +# maintainer (i686): Phil Miller +# maintainer (x86_64): Manuel Tortosa + +pkgname=elfutils +pkgver=0.148 +pkgrel=1 +pkgdesc="Collection of libraries and utilities for working with ELF object files and DWARF debugging information" +arch=('i686' 'x86_64') +url="https://fedorahosted.org/elfutils/" +license=('GPL2') +depends=('glibc') +#optdepends=('zlib' 'xz' 'bzip2') +provides=('libelf') +replaces=('libelf') +conflicts=('libelf') +source=(https://fedorahosted.org/releases/e/l/elfutils/${pkgver}/elfutils-${pkgver}.tar.bz2) +md5sums=('a0bed1130135f17ad27533b0034dba8d') + +build() +{ + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr --program-prefix="eu-" + make + make check +} + +package() +{ + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install +} diff --git a/gcc/PKGBUILD b/gcc/PKGBUILD index c94965744..1325192b8 100644 --- a/gcc/PKGBUILD +++ b/gcc/PKGBUILD @@ -12,14 +12,14 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada') pkgver=4.5.1 -pkgrel=2 +pkgrel=3 #_snapshot=4.5-20100520 _libstdcppmanver=20100719 # Note: check source directory name when updating this pkgdesc="The GNU Compiler Collection" arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'custom') url="http://gcc.gnu.org" -makedepends=('binutils>=2.20.1' 'libmpc>=0.8.1-2' 'cloog-ppl>=0.15.8' 'libelf' 'gcc-ada') +makedepends=('binutils>=2.20.1' 'libmpc>=0.8.1-2' 'cloog-ppl>=0.15.9-2' 'elfutils' 'gcc-ada') options=('!libtool' '!emptydirs') source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-{core,g++,fortran,objc,ada}-${pkgver}.tar.bz2 #ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-{core,g++,fortran,objc,ada}-${_snapshot}.tar.bz2 @@ -111,7 +111,7 @@ package_gcc-libs() package_gcc() { - depends=('binutils>=2.20.1' 'libmpc>=0.8.1-2' 'cloog-ppl>=0.15.8' 'libelf') + depends=('binutils>=2.20.1' 'libmpc>=0.8.1-2' 'cloog-ppl>=0.15.9-2' 'elfutils') groups=('base-devel') install=gcc.install diff --git a/libelf/PKGBUILD b/libelf/PKGBUILD deleted file mode 100644 index 2e0057cc7..000000000 --- a/libelf/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# -# Chakra Packages for Chakra, part of chakra-project.org -# -# maintainer (i686): Phil Miller -# maintainer (x86_64): Manuel Tortosa - -pkgname=libelf -pkgver=0.8.13 -pkgrel=2 -pkgdesc="libelf is a free ELF object file access library" -arch=('i686' 'x86_64') -url="http://www.mr511.de/software/" -license=('GPL') -depends=('glibc') -source=(http://www.mr511.de/software/${pkgname}-${pkgver}.tar.gz) -md5sums=('4136d7b4c04df68b686570afa26988ac') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --enable-shared \ - --enable-gnu-names --enable-compat || return 1 - make || return 1 - make prefix="${pkgdir}/usr" install || return 1 -} diff --git a/libmpc/PKGBUILD b/libmpc/PKGBUILD index 8416a5f7b..20c2a9e91 100644 --- a/libmpc/PKGBUILD +++ b/libmpc/PKGBUILD @@ -6,12 +6,12 @@ pkgname=libmpc pkgver=0.8.2 -pkgrel=1 +pkgrel=2 pkgdesc="Library for the arithmetic of complex numbers with arbitrarily high precision" arch=('i686' 'x86_64') url="http://www.multiprecision.org" license=('LGPL') -depends=('mpfr>=2.4.2-2') +depends=('mpfr>=3.0.0') options=('!libtool') install=libmpc.install source=(http://www.multiprecision.org/mpc/download/mpc-${pkgver/_/-}.tar.gz) diff --git a/mpfr/PKGBUILD b/mpfr/PKGBUILD index 7e9c24b9b..b14faf334 100644 --- a/mpfr/PKGBUILD +++ b/mpfr/PKGBUILD @@ -5,8 +5,8 @@ # maintainer (x86_64): Manuel Tortosa pkgname=mpfr -pkgver=2.4.2 -pkgrel=2 +pkgver=3.0.0 +pkgrel=1 pkgdesc="Multiple-precision floating-point library" arch=('i686' 'x86_64') license=('LGPL') @@ -14,13 +14,20 @@ url="http://www.mpfr.org/" depends=('gmp>=5.0') options=('!libtool') install=mpfr.install -source=(http://www.mpfr.org/mpfr-current/mpfr-${pkgver}.tar.bz2) -md5sums=('89e59fe665e2b3ad44a6789f40b059a0') +source=(http://www.mpfr.org/mpfr-current/mpfr-${pkgver}.tar.xz + mpfr-3.0.0-p3.patch) +md5sums=('8ab3bef2864b8c6e6a291f5603141bbd' + '4aa20e509e3117b04deae64c1be6ac62') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --enable-thread-safe --enable-shared || return 1 - make || return 1 - make check || return 1 - make DESTDIR="${pkgdir}" install || return 1 + patch -Np1 -i ${srcdir}/mpfr-3.0.0-p3.patch + ./configure --prefix=/usr --enable-thread-safe --enable-shared + make + make check +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/ppl/PKGBUILD b/ppl/PKGBUILD index e432e181e..cae0a0745 100644 --- a/ppl/PKGBUILD +++ b/ppl/PKGBUILD @@ -1,27 +1,29 @@ -# $Id: PKGBUILD 72640 2010-03-19 03:03:03Z allan $ -# Maintainer: Allan McRae -# Contributor: ezzetabi +# +# Chakra Packages for Chakra, part of chakra-project.org +# +# maintainer (i686): Phil Miller +# maintainer (x86_64): Manuel Tortosa pkgname=ppl -pkgver=0.10.2 -pkgrel=3 +pkgver=0.11 +pkgrel=1 pkgdesc="A modern library for convex polyhedra and other numerical abstractions." arch=('i686' 'x86_64') url="http://www.cs.unipr.it/ppl" license=('GPL3') depends=('gmp>=5.0') options=('!docs' '!libtool') -source=(http://www.cs.unipr.it/ppl/Download/ftp/releases/$pkgver/ppl-$pkgver.tar.gz - ppl-0.10.2-gmp-5.0.patch) -md5sums=('e7dd265afdeaea81f7e87a72b182d875' - '4da347693c76ccccba4fb5b60ca0f321') +source=(http://www.cs.unipr.it/ppl/Download/ftp/releases/$pkgver/ppl-$pkgver.tar.gz) +md5sums=('ba527ec0ffc830ce16fad8a4195a337e') build() { cd $srcdir/ppl-$pkgver - patch -Np1 -i $srcdir/ppl-0.10.2-gmp-5.0.patch - autoreconf -vf - - ./configure --prefix=/usr --enable-interfaces="c,cxx" || return 1 - make || return 1 - make DESTDIR=$pkgdir install || return 1 + ./configure --prefix=/usr --enable-interfaces="c,cxx" + make + make check +} + +package() { + cd $srcdir/ppl-$pkgver + make DESTDIR=$pkgdir install } diff --git a/ppl/ppl-0.10.2-gmp-5.0.patch b/ppl/ppl-0.10.2-gmp-5.0.patch deleted file mode 100644 index 4d6964a0d..000000000 --- a/ppl/ppl-0.10.2-gmp-5.0.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/m4/ac_check_gmp.m4 b/m4/ac_check_gmp.m4 -index 60cecdc..15acb18 100644 ---- a/m4/ac_check_gmp.m4 -+++ b/m4/ac_check_gmp.m4 -@@ -71,6 +71,10 @@ AC_RUN_IFELSE([AC_LANG_SOURCE([[ - #GMP version 4.1.3 or higher is required - #endif - -+#ifndef BITS_PER_MP_LIMB -+#define BITS_PER_MP_LIMB GMP_LIMB_BITS -+#endif -+ - int - main() { - std::string header_version; -@@ -97,11 +101,11 @@ main() { - return 1; - } - -- if (sizeof(mp_limb_t)*CHAR_BIT != GMP_LIMB_BITS -- || GMP_LIMB_BITS != mp_bits_per_limb) { -+ if (sizeof(mp_limb_t)*CHAR_BIT != BITS_PER_MP_LIMB -+ || BITS_PER_MP_LIMB != mp_bits_per_limb) { - std::cerr - << "GMP header (gmp.h) and library (ligmp.*) bits-per-limb mismatch:\n" -- << "header gives " << __GMP_BITS_PER_MP_LIMB << ";\n" -+ << "header gives " << BITS_PER_MP_LIMB << ";\n" - << "library gives " << mp_bits_per_limb << ".\n" - << "This probably means you are on a bi-arch system and\n" - << "you are compiling with the wrong header or linking with\n"