[arch-commits] Commit in gcc/trunk (5 files)
Allan McRae
allan at archlinux.org
Mon Oct 19 14:04:53 UTC 2009
Date: Monday, October 19, 2009 @ 10:04:53
Author: allan
Revision: 56094
upgpkg: gcc 4.4.2-1
binutils-2.20 toolchain rebuild, bump to latest version, split package, move static libraries out of gcc-libs, add ada compiler
Added:
gcc/trunk/gcc-ada.install
gcc/trunk/gcc-fortran.install
gcc/trunk/gcc-libs.install
Modified:
gcc/trunk/PKGBUILD
gcc/trunk/gcc.install
---------------------+
PKGBUILD | 139 +++++++++++++++++++++++++++++++++++++++-----------
gcc-ada.install | 22 +++++++
gcc-fortran.install | 18 ++++++
gcc-libs.install | 18 ++++++
gcc.install | 2
5 files changed, 169 insertions(+), 30 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2009-10-19 13:16:43 UTC (rev 56093)
+++ PKGBUILD 2009-10-19 14:04:53 UTC (rev 56094)
@@ -2,48 +2,49 @@
# Maintainer: Jan de Groot <jgc at archlinux.org>
# Maintainer: Allan McRae <allan at archlinux.org>
-# toolchain build order: kernel-headers->glibc->binutils->gcc-libs->gcc->binutils->glibc
+# toolchain build order: kernel-headers->glibc->binutils->gcc->binutils->glibc
-pkgname=gcc
-pkgver=4.4.1
+pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada')
+pkgver=4.4.2
pkgrel=1
#_snapshot=4.4-20090630
_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>=2.19.1' "gcc-libs=${pkgver}-${pkgrel}" 'mpfr>=2.4.1' 'cloog-ppl>=0.15.3')
-makedepends=('flex')
-replaces=('gcc-fortran' 'gcc-objc')
-options=('!libtool')
-install=gcc.install
-source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-{core,g++,fortran,objc}-${pkgver}.tar.bz2
- #ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-{core,g++,fortran,objc}-${_snapshot}.tar.bz2
+makedepends=('binutils>=2.20' 'mpfr>=2.4.1' 'cloog-ppl>=0.15.3' '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
ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-man.${_libstdcppmanver}.tar.bz2
#ftp://ftp.archlinux.org/other/${pkgname}/libstdc++-man.${_libstdcppmanver}.tar.bz2
gcc_pure64.patch
gcc-hash-style-both.patch)
-md5sums=('d19693308aa6b2052e14c071111df59f'
- 'd449047b5761348ceec23739f5553e0b'
- '47b92407bd15703a0ebb9e36e0314615'
- 'f7b2a606394036e81433b2f4c3251cba'
+md5sums=('d50ec5af20508974411d0c83c5f4e396'
+ '43b1e4879eb282dc4b05e4c016d356d7'
+ '184897e1b5e8c76760813c1955ee02c2'
+ 'd8d26187d386a0591222a580b5a5b3d3'
+ '7e68d87a335e8ebb832bf5390070f13e'
'3b94fe4a3cd49819bf57ecc407851b9b'
'4030ee1c08dd1e843c0225b772360e76'
'6fd395bacbd7b6e47c7b74854b478363')
build() {
- if ! locale -a | grep ^de_DE; then
+ if ! locale -a | grep ^de_DE > /dev/null; then
echo "You need the de_DE locale to build gcc."
return 1
fi
cd ${srcdir}/gcc-${pkgver}
#cd ${srcdir}/gcc-${_snapshot}
- # Don't install libiberty
+
+ # Do not install libiberty
sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in
+ # Do not run fixincludes
+ sed -i 's@\./fixinc\.sh at -c true@' gcc/Makefile.in
+
if [ "${CARCH}" = "x86_64" ]; then
patch -Np1 -i ../gcc_pure64.patch || return 1
fi
@@ -51,18 +52,60 @@
echo ${pkgver} > gcc/BASE-VER
- mkdir build
- cd build
+ mkdir build && cd build
../configure --prefix=/usr --enable-shared \
- --enable-languages=c,c++,fortran,objc,obj-c++ \
+ --enable-languages=c,c++,fortran,objc,obj-c++,ada \
--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
make || return 1
+}
+
+package_gcc-libs()
+{
+ pkgdesc="Runtime libraries shipped by GCC for C and C++ languages"
+ groups=('base')
+ depends=('glibc>=2.10.1-5')
+ install=gcc-libs.install
+
+ cd ${srcdir}/gcc-${pkgver}/build
+ make -j1 -C $CHOST/libgcc DESTDIR=${pkgdir} install-shared
+ for lib in libmudflap libgomp libssp libstdc++-v3/src; do
+ make -j1 -C $CHOST/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES
+ done
+ make -j1 -C $CHOST/libstdc++-v3/po DESTDIR=${pkgdir} install
+ make -j1 -C $CHOST/libgomp DESTDIR=${pkgdir} install-info
+
+ # remove static libraries
+ find ${pkgdir} -name *.a -delete
+
+ # Install Runtime Library Exception
+ install -Dm644 ${srcdir}/gcc-${pkgver}/COPYING.RUNTIME \
+ ${pkgdir}/usr/share/licenses/gcc-libs/RUNTIME.LIBRARY.EXCEPTION
+}
+
+package_gcc()
+{
+ depends=('binutils>=2.20' 'mpfr>=2.4.1' 'cloog-ppl>=0.15.3')
+ groups=('base-devel')
+ install=gcc.install
+
+ cd ${srcdir}/gcc-${pkgver}/build
+
+ # much, much easier to install the lot and clean-up the mess
make -j1 DESTDIR=${pkgdir} install || return 1
+ rm $pkgdir/usr/bin/{*gfortran,gnat*}
+ rm $pkgdir/usr/lib/gcc/i686-pc-linux-gnu/${pkgver}/{ada{include,lib},finclude,include/objc}/*
+ rm $pkgdir/usr/lib/gcc/i686-pc-linux-gnu/${pkgver}/{cc1obj{,plus},f951,gnat1,libgfortranbegin.a}
+ rm $pkgdir/usr/lib/{*.so*,lib{gfortran,objc}.a}
+ rm $pkgdir/usr/share/info/{gfortran,gnat*,libgomp}.info
+ rm $pkgdir/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo
+ rm $pkgdir/usr/share/man/man1/gfortran.1
+
+ # many packages require these symlinks
install -dm755 ${pkgdir}/lib
- ln -sf ../usr/bin/cpp ${pkgdir}/lib/cpp
+ ln -sf /usr/bin/cpp ${pkgdir}/lib/cpp
ln -sf gcc ${pkgdir}/usr/bin/cc
ln -sf g++ ${pkgdir}/usr/bin/c++
@@ -73,16 +116,54 @@
# deal with conflicts...
rm -f ${pkgdir}/usr/share/man/man3/{ctime,queue,random,regex,string}.3
- # Remove libraries and translations in gcc-libs
- rm -f ${pkgdir}/usr/lib/lib*
- find ${pkgdir} -name libstdc++.mo -delete
+ # Install Runtime Library Exception
+ install -Dm644 ${srcdir}/gcc-${pkgver}/COPYING.RUNTIME \
+ ${pkgdir}/usr/share/licenses/gcc/RUNTIME.LIBRARY.EXCEPTION
+}
- # Remove fixed includes, either no need for them, or they're not complete
- rm -rf ${pkgdir}/usr/lib/${CHOST}/${pkgver}/include-fixed/*
+package_gcc-fortran()
+{
+ pkgdesc="Fortran front-end for GCC"
+ depends=("gcc=$pkgver")
+ install=gcc-fortran.install
+ cd ${srcdir}/gcc-${pkgver}/build
+ make -j1 DESTDIR=$pkgdir install-target-libgfortran
+ make -j1 -C $CHOST/libgomp DESTDIR=$pkgdir install-nodist_fincludeHEADERS
+ make -j1 -C gcc DESTDIR=$pkgdir fortran.install-{common,man,info}
+ install -Dm755 gcc/f951 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/f951
+
# Install Runtime Library Exception
- install -Dm644 ../COPYING.RUNTIME ${pkgdir}/usr/share/licenses/gcc/RUNTIME.LIBRARY.EXCEPTION
+ install -Dm644 ${srcdir}/gcc-${pkgver}/COPYING.RUNTIME \
+ ${pkgdir}/usr/share/licenses/gcc-fortran/RUNTIME.LIBRARY.EXCEPTION
+}
- rm -f ${pkgdir}/usr/share/info/dir
- gzip -9 ${pkgdir}/usr/share/info/*
+package_gcc-objc()
+{
+ pkgdesc="Objective-C front-end for GCC"
+ depends=("gcc=$pkgver")
+
+ cd ${srcdir}/gcc-${pkgver}/build
+ make -j1 DESTDIR=$pkgdir install-target-libobjc
+ install -dm755 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/
+ install -m755 gcc/cc1obj{,plus} $pkgdir/usr/lib/gcc/$CHOST/$pkgver/
+
+ # Install Runtime Library Exception
+ install -Dm644 ${srcdir}/gcc-${pkgver}/COPYING.RUNTIME \
+ ${pkgdir}/usr/share/licenses/gcc-objc/RUNTIME.LIBRARY.EXCEPTION
}
+
+package_gcc-ada()
+{
+ pkgdesc="Ada front-end for GCC (GNAT)"
+ depends=("gcc=$pkgver")
+ install=gcc-ada.install
+
+ cd ${srcdir}/gcc-${pkgver}/build/gcc
+ make -j1 DESTDIR=$pkgdir ada.install-{common,info}
+ install -m755 gnat1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver
+
+ # Install Runtime Library Exception
+ install -Dm644 ${srcdir}/gcc-${pkgver}/COPYING.RUNTIME \
+ ${pkgdir}/usr/share/licenses/gcc-ada/RUNTIME.LIBRARY.EXCEPTION
+}
Added: gcc-ada.install
===================================================================
--- gcc-ada.install (rev 0)
+++ gcc-ada.install 2009-10-19 14:04:53 UTC (rev 56094)
@@ -0,0 +1,22 @@
+infodir=/usr/share/info
+filelist=(gnat-style.info gnat_rm.info gnat_ugn.info)
+
+post_install() {
+ [ -x usr/bin/install-info ] || return 0
+ for file in ${filelist[@]}; do
+ install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+ done
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ [ -x usr/bin/install-info ] || return 0
+ for file in ${filelist[@]}; do
+ install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+ done
+}
+
+# vim:set ts=2 sw=2 et:
Added: gcc-fortran.install
===================================================================
--- gcc-fortran.install (rev 0)
+++ gcc-fortran.install 2009-10-19 14:04:53 UTC (rev 56094)
@@ -0,0 +1,18 @@
+infodir=/usr/share/info
+file="gfortran.info"
+
+post_install() {
+ [ -x usr/bin/install-info ] || return 0
+ install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ [ -x usr/bin/install-info ] || return 0
+ install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+}
+
+# vim:set ts=2 sw=2 et:
Added: gcc-libs.install
===================================================================
--- gcc-libs.install (rev 0)
+++ gcc-libs.install 2009-10-19 14:04:53 UTC (rev 56094)
@@ -0,0 +1,18 @@
+infodir=/usr/share/info
+file="libgomp.info"
+
+post_install() {
+ [ -x usr/bin/install-info ] || return 0
+ install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ [ -x usr/bin/install-info ] || return 0
+ install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+}
+
+# vim:set ts=2 sw=2 et:
Modified: gcc.install
===================================================================
--- gcc.install 2009-10-19 13:16:43 UTC (rev 56093)
+++ gcc.install 2009-10-19 14:04:53 UTC (rev 56094)
@@ -1,5 +1,5 @@
infodir=/usr/share/info
-filelist=(cpp.info cppinternals.info gcc.info gccinstall.info gccint.info gfortran.info libgomp.info)
+filelist=(cpp.info cppinternals.info gcc.info gccinstall.info gccint.info)
post_install() {
[ -x usr/bin/install-info ] || return 0
More information about the arch-commits
mailing list