[arch-commits] Commit in gcc-uclibc/repos (testing-x86_64 testing-x86_64/PKGBUILD)
Thomas Bächler
thomas at archlinux.org
Sun Sep 27 10:35:18 UTC 2009
Date: Sunday, September 27, 2009 @ 06:35:18
Author: thomas
Revision: 53231
Merged revisions 52634,53204,53206-53207,53216,53229 via svnmerge from
svn+ssh://gerolde.archlinux.org/srv/svn-packages/gcc-uclibc/trunk
........
r52634 | thomas | 2009-09-22 10:42:32 +0200 (Di, 22 Sep 2009) | 2 lines
Set Id keyword on uclibc PKGBUILDs
........
r53204 | thomas | 2009-09-27 01:25:12 +0200 (So, 27 Sep 2009) | 2 lines
Update gcc to 4.4.1, make it work for both architectures and split into compiler and runtime
........
r53206 | thomas | 2009-09-27 02:10:51 +0200 (So, 27 Sep 2009) | 2 lines
Fix installation
........
r53207 | thomas | 2009-09-27 02:12:06 +0200 (So, 27 Sep 2009) | 2 lines
Fix one last file conflict
........
r53216 | thomas | 2009-09-27 02:49:28 +0200 (So, 27 Sep 2009) | 2 lines
Fix i686 build
........
r53229 | thomas | 2009-09-27 12:33:16 +0200 (So, 27 Sep 2009) | 2 lines
Fix gcc-libs-uclibc depends
........
Modified:
gcc-uclibc/repos/testing-x86_64/ (properties)
gcc-uclibc/repos/testing-x86_64/PKGBUILD (contents, properties)
----------+
PKGBUILD | 85 ++++++++++++++++++++++++++++++++++++++++++++-----------------
1 file changed, 62 insertions(+), 23 deletions(-)
Property changes on: gcc-uclibc/repos/testing-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
- /gcc-uclibc/trunk:1-41911
+ /gcc-uclibc/trunk:1-53230
Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD 2009-09-27 10:34:36 UTC (rev 53230)
+++ testing-x86_64/PKGBUILD 2009-09-27 10:35:18 UTC (rev 53231)
@@ -1,26 +1,27 @@
-# $Id: PKGBUILD 40117 2009-05-28 11:36:09Z allan $
+# $Id$
# Maintainer: Jan de Groot <jgc at archlinux.org>
-# Maintainer: Allan McRae <allan at archlinux.org>
+# Maintainer: Thomas Bächler <thomas at archlinux.org>
-# toolchain build order: kernel-headers->glibc->binutils->gcc-libs->gcc->binutils->glibc
+# toolchain build order: kernel-headers->binutils-uclibc->uclibc->gcc-uclibc
-pkgname=gcc-uclibc
-pkgver=4.4.0
+pkbase=gcc-uclibc
+pkgname=('gcc-uclibc' 'gcc-libs-uclibc')
+pkgver=4.4.1
pkgrel=1
-_snapshot=4.4-20090526
+#_snapshot=4.4-20090526
_libstdcppmanver=4.4.0
-pkgdesc="The GNU Compiler Collection"
arch=('i686' 'x86_64')
license=('GPL' 'LGPL' 'custom')
-groups=('base-devel')
url="http://gcc.gnu.org"
-depends=('binutils-uclibc>=2.19.1' 'uclibc' 'mpfr>=2.4.1' 'cloog-ppl>=0.15.3' 'kernel-headers')
-makedepends=('flex')
-options=('!libtool')
-source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-core-${pkgver}.tar.bz2
- ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-core-${_snapshot}.tar.bz2
+makedepends=('flex' 'binutils-uclibc>=2.19.1' 'uclibc' 'mpfr>=2.4.1' 'cloog-ppl>=0.15.3' 'kernel-headers')
+options=('!libtool' '!emptydirs')
+source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-core-${pkgver}.tar.bz2
+ #ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-core-${_snapshot}.tar.bz2
gcc-hash-style-both.patch
- gcc_pure64.patch)
+ gcc_pure64.patch)
+sha256sums=('4fbd2a5e0212e9bb30a2ea8d3901d8a12c0e3edc9b29f3a4859298145152fc49'
+ 'a600550d3d2b2fb8ee6a547c68c3a08a2af7579290b340c35ee5598c9bb305a5'
+ '2d369cf93c6e15c3559c3560bce581e0ae5f1f34dc86bca013ac67ef1c1a9ff9')
build() {
if ! locale -a | grep ^de_DE; then
@@ -28,30 +29,68 @@
return 1
fi
- #cd ${srcdir}/gcc-${pkgver}
- cd ${srcdir}/gcc-${_snapshot}
+ cd "${srcdir}/gcc-${pkgver}"
+ #cd ${srcdir}/gcc-${_snapshot}
# Don't install libiberty
sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in
- patch -Np1 -i "${srcdir}/gcc_pure64.patch" || return 1
- patch -Np0 -i ${srcdir}/gcc-hash-style-both.patch || return 1
+ if [ "${CARCH}" = "x86_64" ]; then
+ patch -Np1 -i "${srcdir}/gcc_pure64.patch" || return 1
+ target="x86_64-unknown-linux-uclibc"
+ else
+ target="i686-pc-linux-uclibc"
+ fi
+ patch -Np0 -i "${srcdir}"/gcc-hash-style-both.patch || return 1
- echo ${pkgver} > gcc/BASE-VER
+ echo "${pkgver}" > gcc/BASE-VER
mkdir build
cd build
- LDFLAGS="-Wl,-rpath,/usr/x86_64-unknown-linux-uclibc/lib" \
+ LDFLAGS="-Wl,-rpath,/usr/${target}/lib" \
../configure --prefix=/usr --enable-shared \
--enable-languages=c \
--enable-threads=posix --mandir=/usr/share/man --infodir=/usr/share/info \
--enable-__cxa_atexit --disable-multilib --libdir=/usr/lib \
--libexecdir=/usr/lib --enable-clocale=gnu --disable-libstdcxx-pch \
- --with-tune=generic --disable-nls --target=x86_64-unknown-linux-uclibc \
+ --with-tune=generic --disable-nls --target=${target} \
--disable-decimal-float || return 1
make || return 1
- make -j1 DESTDIR=${pkgdir} install || return 1
+}
+package_gcc-uclibc() {
+ depends=('gcc-libs-uclibc' 'binutils-uclibc>=2.19.1' 'uclibc' 'mpfr>=2.4.1' 'cloog-ppl>=0.15.3' 'kernel-headers')
+ pkgdesc="The GNU Compiler Collection for uclibc"
+ if [ "${CARCH}" = "x86_64" ]; then
+ target="x86_64-unknown-linux-uclibc"
+ else
+ target="i686-pc-linux-uclibc"
+ fi
+
+ cd "${srcdir}/gcc-${pkgver}/build"
+ make -j1 DESTDIR="${pkgdir}" install || return 1
+
rmdir "${pkgdir}/usr/include"
rm -rf "${pkgdir}/usr/share/info"
- rm -rf "${pkgdir}/usr/share/man/man7"
+ rm -rf "${pkgdir}"/usr/{,share/}man/man7
+ rm "${pkgdir}"/usr/${target}/lib/*.so*
}
+
+package_gcc-libs-uclibc() {
+ depends=('uclibc-runtime')
+ pkgdesc="The GNU Compiler Collection runtime libraries for uclibc"
+ if [ "${CARCH}" = "x86_64" ]; then
+ target="x86_64-unknown-linux-uclibc"
+ else
+ target="i686-pc-linux-uclibc"
+ fi
+
+ cd "${srcdir}/gcc-${pkgver}/build"
+ make -j1 DESTDIR="${pkgdir}" install || return 1
+
+ rmdir "${pkgdir}/usr/include"
+ rm -rf "${pkgdir}/usr/lib/gcc"
+ rm -rf "${pkgdir}/usr/bin"
+ rm -rf "${pkgdir}/usr/share/info"
+ rm -rf "${pkgdir}"/usr/{,share/}man
+ rm "${pkgdir}"/usr/${target}/lib/*.{a,spec}
+}
Property changes on: gcc-uclibc/repos/testing-x86_64/PKGBUILD
___________________________________________________________________
Added: svn:keywords
+ Id
More information about the arch-commits
mailing list