From bbfdba4140a91cfdb10af0fc0592a5889bcbf260 Mon Sep 17 00:00:00 2001 From: Michał Masłowski Date: Sat, 15 Oct 2011 10:54:48 +0200 Subject: Use profiledbootstrap and fix gcc packaging errors. The PKGBUILD expects to have more files installed and to use only */lib for libraries, not */lib32 for some of them. --- core/gcc/PKGBUILD | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD index 06e61884e..0dd465937 100644 --- a/core/gcc/PKGBUILD +++ b/core/gcc/PKGBUILD @@ -80,7 +80,7 @@ build() { --enable-plugin --with-plugin-ld=ld.gold \ --disable-multilib --disable-libssp --disable-libstdcxx-pch \ --enable-checking=release - make + make profiledbootstrap } check() { @@ -115,7 +115,7 @@ package_gcc-libs() make -j1 DESTDIR=${pkgdir} install-target-libobjc # remove unnecessary files installed by install-target-{libquadmath,libgfortran,libobjc} - rm -rf ${pkgdir}/usr/lib/{gcc/,libgfortran.spec} + rm -rf ${pkgdir}/usr/lib{,32}/{gcc/,libgfortran.spec} # remove static libraries find ${pkgdir} -name *.a -delete @@ -136,18 +136,18 @@ package_gcc() # unfortunately it is much, much easier to install the lot and clean-up the mess... make -j1 DESTDIR=${pkgdir} install - rm $pkgdir/usr/bin/{{$CHOST-,}gfortran,{$CHOST-,}gccgo,gnat*} - rm $pkgdir/usr/lib/*.so* - rm $pkgdir/usr/lib/lib{ffi,gfortran,go{,begin},objc,quadmath}.a - rm $pkgdir/usr/lib/libgfortran.spec - rm -r $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{ada{include,lib},finclude,include/objc} - rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/include/{ffi{,target}.h,quadmath{,_weak}.h} - rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,gnat1,go1,libgfortranbegin.a} - rm -r $pkgdir/usr/lib/go - rm $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libgomp,libquadmath}.info - rm $pkgdir/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo - rm $pkgdir/usr/share/man/man1/{gccgo,gfortran}.1 - rm $pkgdir/usr/share/man/man3/ffi* + rm -f $pkgdir/usr/bin/{{$CHOST-,}gfortran,{$CHOST-,}gccgo,gnat*} + rm -f $pkgdir/usr/lib{,32}/*.so* + rm -f $pkgdir/usr/lib{,32}/lib{ffi,gfortran,go{,begin},objc,quadmath}.a + rm -f $pkgdir/usr/lib{,32}/libgfortran.spec + rm -rf $pkgdir/usr/lib{,32}/gcc/$CHOST/${pkgver}/{ada{include,lib},finclude,include/objc} + rm -f $pkgdir/usr/lib{,32}/gcc/$CHOST/${pkgver}/include/{ffi{,target}.h,quadmath{,_weak}.h} + rm -f $pkgdir/usr/lib{,32}/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,gnat1,go1,libgfortranbegin.a} + rm -rf $pkgdir/usr/lib{,32}/go + rm -f $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libgomp,libquadmath}.info + rm -f $pkgdir/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo + rm -f $pkgdir/usr/share/man/man1/{gccgo,gfortran}.1 + rm -f $pkgdir/usr/share/man/man3/ffi* # many packages require these symlinks install -dm755 ${pkgdir}/lib @@ -211,8 +211,8 @@ package_gcc-fortran() install -Dm755 gcc/f951 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/f951 # remove libraries included in gcc-libs - rm ${pkgdir}/usr/lib/lib{gfortran,quadmath}.so* - rm ${pkgdir}/usr/share/info/libquadmath.info + rm -f ${pkgdir}/usr/lib{,32}/lib{gfortran,quadmath}.so* + rm -f ${pkgdir}/usr/share/info/libquadmath.info # Install Runtime Library Exception install -Dm644 ${_basedir}/COPYING.RUNTIME \ @@ -230,7 +230,7 @@ package_gcc-objc() install -m755 gcc/cc1obj{,plus} $pkgdir/usr/lib/gcc/$CHOST/$pkgver/ # remove libraries included in gcc-libs - rm ${pkgdir}/usr/lib/libobjc.so* + rm -f ${pkgdir}/usr/lib{,32}/libobjc.so* # Install Runtime Library Exception install -Dm644 ${_basedir}/COPYING.RUNTIME \ -- cgit v1.2.3-54-g00ecf From 16b092881b0225752d6f6fcea041831395537b6e Mon Sep 17 00:00:00 2001 From: Michał Masłowski Date: Sat, 15 Oct 2011 14:41:24 +0200 Subject: Update libtool, use a Debian patch to skip failing test. --- core/libtool/PKGBUILD | 12 +++++++----- core/libtool/nopic.patch | 13 +++++++++++++ 2 files changed, 20 insertions(+), 5 deletions(-) create mode 100644 core/libtool/nopic.patch diff --git a/core/libtool/PKGBUILD b/core/libtool/PKGBUILD index f0ff53324..76b0b92b1 100644 --- a/core/libtool/PKGBUILD +++ b/core/libtool/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 137791 2011-09-11 02:39:11Z allan $ +# $Id: PKGBUILD 138461 2011-09-24 03:53:12Z allan $ # Maintainer: Allan McRae # Contributor: judd @@ -7,17 +7,19 @@ pkgname=('libtool' 'libltdl') pkgver=2.4 pkgrel=5 -pkgrel=3 # holdver pkgdesc="A generic library support script" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/libtool" license=('GPL') options=('!libtool') -source=(ftp://ftp.gnu.org/pub/gnu/libtool/${pkgname}-${pkgver}.tar.xz) -md5sums=('4e6144439d95d7332dc50ace6dd24c55') +source=(ftp://ftp.gnu.org/pub/gnu/libtool/${pkgname}-${pkgver}.tar.xz + nopic.patch) +md5sums=('4e6144439d95d7332dc50ace6dd24c55' + '46443cf0e3e1b4e4891812af73385615') build() { cd ${srcdir}/${pkgbase}-${pkgver} + patch -Np1 -i "${srcdir}/nopic.patch" ./configure --prefix=/usr make } @@ -28,7 +30,7 @@ check() { } package_libtool() { - depends=('sh' "libltdl=$pkgver" 'gcc=4.6.1') + depends=('sh' "libltdl=$pkgver" 'tar' 'gcc=4.6.1') groups=('base-devel') install=libtool.install diff --git a/core/libtool/nopic.patch b/core/libtool/nopic.patch new file mode 100644 index 000000000..43a712685 --- /dev/null +++ b/core/libtool/nopic.patch @@ -0,0 +1,13 @@ +Index: libtool-2.2.6a/tests/demo-nopic.test +=================================================================== +--- libtool-2.2.6a.orig/tests/demo-nopic.test 2008-11-18 21:11:29.000000000 +0000 ++++ libtool-2.2.6a/tests/demo-nopic.test 2008-11-18 21:12:41.000000000 +0000 +@@ -26,7 +26,7 @@ + . tests/defs || exit 1 + + case "$host" in +-hppa*|x86_64*|s390*) ++hppa*|x86_64*|s390*|mips*|arm*) + func_skip "$host doesn't like non-PIC shared libs" + ;; + *-solaris*|*-sunos*) -- cgit v1.2.3-54-g00ecf From e382afae90f8687ae3f0223042815a68ade65350 Mon Sep 17 00:00:00 2001 From: Michał Masłowski Date: Sat, 15 Oct 2011 16:05:01 +0200 Subject: Increase binutils pkgrel since it should be updated after gcc. --- core/binutils/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/binutils/PKGBUILD b/core/binutils/PKGBUILD index e9d6a1f3c..186070323 100644 --- a/core/binutils/PKGBUILD +++ b/core/binutils/PKGBUILD @@ -5,7 +5,7 @@ pkgname=binutils pkgver=2.21.1 -pkgrel=2 +pkgrel=2.1 _date=20110627 pkgdesc="A set of programs to assemble and manipulate binary and object files" arch=('i686' 'x86_64' 'mips64el') -- cgit v1.2.3-54-g00ecf From ea184b4b2f1d068c1606ba2ea8b5d65ecc160400 Mon Sep 17 00:00:00 2001 From: Michał Masłowski Date: Sat, 15 Oct 2011 18:50:44 +0200 Subject: Rebuild avahi to avoid missing dependency library. --- extra/avahi/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extra/avahi/PKGBUILD b/extra/avahi/PKGBUILD index b4e31041c..72a021dd1 100644 --- a/extra/avahi/PKGBUILD +++ b/extra/avahi/PKGBUILD @@ -4,7 +4,7 @@ pkgname=avahi pkgver=0.6.30 -pkgrel=5 +pkgrel=5.1 pkgdesc='A multicast/unicast DNS-SD framework' arch=('i686' 'x86_64' 'mips64el') url='http://www.avahi.org/' -- cgit v1.2.3-54-g00ecf From 7e22ca3906121dd4eb3fc28380a411ae64946da0 Mon Sep 17 00:00:00 2001 From: Michał Masłowski Date: Sat, 15 Oct 2011 20:35:41 +0200 Subject: Don't disable sane optimizations in future. --- extra/sane/PKGBUILD | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/extra/sane/PKGBUILD b/extra/sane/PKGBUILD index 49d0f1480..d1eda7ab0 100644 --- a/extra/sane/PKGBUILD +++ b/extra/sane/PKGBUILD @@ -28,20 +28,12 @@ build() { # fix https://bugs.archlinux.org/task/26114 patch -Np1 -i "${srcdir}"/xerox_mfp_fix_usb_devices.patch - if [ ${CARCH} == 'mips64el' ]; then - export CFLAGS="${CFLAGS} -O1" - EXTRAOPTS="--without-snmp" - else - EXTRAOPTS="" - fi - ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ --with-docdir=/usr/share/doc/sane \ --enable-avahi \ - --disable-locking \ - $EXTRAOPTS + --disable-locking make } -- cgit v1.2.3-54-g00ecf From 641c2ee4363d204b42c281572bbf0af1ab411458 Mon Sep 17 00:00:00 2001 From: Michał Masłowski Date: Sun, 16 Oct 2011 13:52:08 +0200 Subject: Rebuild glibc after gcc update. --- core/glibc/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD index d8d5c2881..98fdb5107 100644 --- a/core/glibc/PKGBUILD +++ b/core/glibc/PKGBUILD @@ -6,7 +6,7 @@ pkgname=glibc pkgver=2.14 -pkgrel=6 +pkgrel=6.1 _glibcdate=20110908 pkgdesc="GNU C Library" arch=('i686' 'x86_64' 'mips64el') -- cgit v1.2.3-54-g00ecf From 81ea1db768938c9fd25587c06107c22780f41706 Mon Sep 17 00:00:00 2001 From: Michał Masłowski Date: Tue, 18 Oct 2011 10:57:28 +0200 Subject: Fix building umfpack on mips64el, respect CFLAGS. --- extra/umfpack/PKGBUILD | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/extra/umfpack/PKGBUILD b/extra/umfpack/PKGBUILD index 5ebcf0a65..7e1772adc 100644 --- a/extra/umfpack/PKGBUILD +++ b/extra/umfpack/PKGBUILD @@ -16,9 +16,6 @@ arch=('i686' 'x86_64' 'mips64el') url="http://www.cise.ufl.edu/research/sparse/umfpack" license=('LGPL') makedepends=('lapack' 'blas') -noextract=(CHOLMOD-${_cholmodver}.tar.gz - COLAMD-${_colamdver}.tar.gz - CCOLAMD-${_ccolamdver}.tar.gz) source=(http://www.cise.ufl.edu/research/sparse/umfpack/UMFPACK-$pkgver.tar.gz http://www.cise.ufl.edu/research/sparse/UFconfig/UFconfig-${_ufcfgver}.tar.gz http://www.cise.ufl.edu/research/sparse/amd/AMD-${_amdver}.tar.gz @@ -26,9 +23,9 @@ source=(http://www.cise.ufl.edu/research/sparse/umfpack/UMFPACK-$pkgver.tar.gz http://www.cise.ufl.edu/research/sparse/colamd/COLAMD-${_colamdver}.tar.gz http://www.cise.ufl.edu/research/sparse/ccolamd/CCOLAMD-${_ccolamdver}.tar.gz UFconfig.mk) -md5sums=('b3490d4f529fbcf4f415e60aa2680a15' - '4335ee565feec67e8ba9fc0f6a5e2504' - '25548053958c1c5810b17d077b8f37b9' +md5sums=('19f5d8b4231ec9114718641ce51cce6e' + '526413bbbc94f987cf79619d9110bab4' + 'b3e9679ba20635ac4847f01c01d6e992' '9032c5724bee43ccd8f4546338a29fac' '2b4e43c8ef33dacfade6d1ec49542ac1' '79d813d5b54951060fc264172bfb5ca6' @@ -38,7 +35,8 @@ build() { cd "$srcdir/UMFPACK" cp -rf "$srcdir/UFconfig/xerbla" . cp -L ../UFconfig.mk $startdir/src/UFconfig - [ $CARCH == "x86_64" ] && sed -i 's#CFLAGS = -O3 -fexceptions#CFLAGS = -O3 -fexceptions -fPIC#' $srcdir/UFconfig/UFconfig.mk + [ "${CARCH}" != "i686" ] && CFLAGS="${CFLAGS} -fPIC" + sed -ri 's#^((C|F77)FLAGS = ).*#\1'"$CFLAGS"'#' $srcdir/UFconfig/UFconfig.mk make library || return 1 install -d "$pkgdir/usr/lib" "$pkgdir/usr/include" -- cgit v1.2.3-54-g00ecf