[arch-commits] Commit in gcc/trunk (6 files)
Allan McRae
allan at archlinux.org
Mon May 2 02:22:55 UTC 2016
Date: Monday, May 2, 2016 @ 04:22:54
Author: allan
Revision: 266741
gcc-6 build, move to using git release branch rather than snapshots, remove install file handling of info pages, temporary fix for CHOST triplet change
Modified:
gcc/trunk/PKGBUILD
Deleted:
gcc/trunk/gcc-ada.install
gcc/trunk/gcc-fortran.install
gcc/trunk/gcc-go.install
gcc/trunk/gcc-libs.install
gcc/trunk/gcc.install
---------------------+
PKGBUILD | 49 +++++++++++++++++--------------------------------
gcc-ada.install | 20 --------------------
gcc-fortran.install | 16 ----------------
gcc-go.install | 20 --------------------
gcc-libs.install | 16 ----------------
gcc.install | 20 --------------------
6 files changed, 17 insertions(+), 124 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2016-05-02 02:21:21 UTC (rev 266740)
+++ PKGBUILD 2016-05-02 02:22:54 UTC (rev 266741)
@@ -5,11 +5,11 @@
# NOTE: libtool requires rebuilt with each new gcc version
pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada' 'gcc-go')
-pkgver=5.3.0
-_pkgver=5
-_islver=0.15
-pkgrel=5
-_snapshot=5-20160209
+pkgver=6.1.1
+_pkgver=6
+_islver=0.16.1
+pkgrel=1
+_commit=80f78834
pkgdesc="The GNU Compiler Collection"
arch=('i686' 'x86_64')
license=('GPL' 'LGPL' 'FDL' 'custom')
@@ -17,24 +17,18 @@
makedepends=('binutils>=2.26' 'libmpc' 'gcc-ada' 'doxygen')
checkdepends=('dejagnu' 'inetutils')
options=('!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
- http://isl.gforge.inria.fr/isl-${_islver}.tar.bz2
- Unlink-the-response-file.patch)
-md5sums=('499161c65b639aa5c12a14944582b7ec'
- '8428efbbc6f6e2810ce5c1ba73ecf98c'
- '1f4d4ef71004261376d26d5ba6a84499')
+source=(git://gcc.gnu.org/git/gcc.git#commit=${_commit}
+ http://isl.gforge.inria.fr/isl-${_islver}.tar.bz2)
+md5sums=('SKIP'
+ 'ac1f25a0677912952718a51f5bc20f32')
-if [ -n "${_snapshot}" ]; then
- _basedir=gcc-${_snapshot}
-else
- _basedir=gcc-${pkgver}
-fi
+# gcc-6.0 forces a changed triplet - need to address in pacman/devtools
+CHOST=x86_64-pc-linux-gnu
_libdir="usr/lib/gcc/$CHOST/$pkgver"
prepare() {
- cd ${srcdir}/${_basedir}
+ cd ${srcdir}/gcc
# link isl for in-tree build
ln -s ../isl-${_islver} isl
@@ -45,14 +39,9 @@
# Arch Linux installs x86_64 libraries /lib
[[ $CARCH == "x86_64" ]] && sed -i '/m64=/s/lib64/lib/' gcc/config/i386/t-linux64
- 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
- # https://bugs.archlinux.org/task/47874 - commit f591a95d
- patch -p1 -i $srcdir/Unlink-the-response-file.patch
-
mkdir ${srcdir}/gcc-build
}
@@ -64,7 +53,7 @@
CFLAGS=${CFLAGS/-pipe/}
CXXFLAGS=${CXXFLAGS/-pipe/}
- ${srcdir}/${_basedir}/configure --prefix=/usr \
+ ${srcdir}/gcc/configure --prefix=/usr \
--libdir=/usr/lib --libexecdir=/usr/lib \
--mandir=/usr/share/man --infodir=/usr/share/info \
--with-bugurl=https://bugs.archlinux.org/ \
@@ -94,9 +83,10 @@
# do not abort on error as some are "expected"
make -k check || true
- ${srcdir}/${_basedir}/contrib/test_summary
+ ${srcdir}/gcc/contrib/test_summary
}
+
package_gcc-libs()
{
pkgdesc="Runtime libraries shipped by GCC"
@@ -103,7 +93,6 @@
groups=('base')
depends=('glibc>=2.23')
options=('!emptydirs' '!strip')
- install=gcc-libs.install
cd ${srcdir}/gcc-build
@@ -140,7 +129,7 @@
done
# Install Runtime Library Exception
- install -Dm644 ${srcdir}/${_basedir}/COPYING.RUNTIME \
+ install -Dm644 ${srcdir}/gcc/COPYING.RUNTIME \
${pkgdir}/usr/share/licenses/gcc-libs/RUNTIME.LIBRARY.EXCEPTION
}
@@ -150,7 +139,6 @@
depends=("gcc-libs=$pkgver-$pkgrel" 'binutils>=2.26' 'libmpc')
groups=('base-devel')
options=('staticlibs')
- install=gcc.install
cd ${srcdir}/gcc-build
@@ -248,10 +236,9 @@
pkgdesc="Fortran front-end for GCC"
depends=("gcc=$pkgver-$pkgrel")
options=('!emptydirs')
- install=gcc-fortran.install
cd ${srcdir}/gcc-build
- make -C $CHOST/libgfortran DESTDIR=$pkgdir install-{caf,my}execlibLTLIBRARIES \
+ make -C $CHOST/libgfortran DESTDIR=$pkgdir install-cafexeclibLTLIBRARIES \
install-{toolexeclibDATA,nodist_fincludeHEADERS}
make -C $CHOST/libgomp DESTDIR=$pkgdir install-nodist_fincludeHEADERS
make -C gcc DESTDIR=$pkgdir fortran.install-{common,man,info}
@@ -284,7 +271,6 @@
pkgdesc="Ada front-end for GCC (GNAT)"
depends=("gcc=$pkgver-$pkgrel")
options=('staticlibs' '!emptydirs')
- install=gcc-ada.install
cd ${srcdir}/gcc-build/gcc
make DESTDIR=$pkgdir ada.install-{common,info}
@@ -309,7 +295,6 @@
depends=("gcc=$pkgver-$pkgrel")
conflicts=('go')
options=('!emptydirs')
- install=gcc-go.install
cd ${srcdir}/gcc-build
make -C $CHOST/libgo DESTDIR=$pkgdir install-exec-am
Deleted: gcc-ada.install
===================================================================
--- gcc-ada.install 2016-05-02 02:21:21 UTC (rev 266740)
+++ gcc-ada.install 2016-05-02 02:22:54 UTC (rev 266741)
@@ -1,20 +0,0 @@
-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
-}
Deleted: gcc-fortran.install
===================================================================
--- gcc-fortran.install 2016-05-02 02:21:21 UTC (rev 266740)
+++ gcc-fortran.install 2016-05-02 02:22:54 UTC (rev 266741)
@@ -1,16 +0,0 @@
-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
-}
Deleted: gcc-go.install
===================================================================
--- gcc-go.install 2016-05-02 02:21:21 UTC (rev 266740)
+++ gcc-go.install 2016-05-02 02:22:54 UTC (rev 266741)
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(gccgo.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
-}
Deleted: gcc-libs.install
===================================================================
--- gcc-libs.install 2016-05-02 02:21:21 UTC (rev 266740)
+++ gcc-libs.install 2016-05-02 02:22:54 UTC (rev 266741)
@@ -1,16 +0,0 @@
-infodir=usr/share/info
-filelist=(libgomp.info libquadmath.info)
-
-post_upgrade() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
-
-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
-}
Deleted: gcc.install
===================================================================
--- gcc.install 2016-05-02 02:21:21 UTC (rev 266740)
+++ gcc.install 2016-05-02 02:22:54 UTC (rev 266741)
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(cpp.info cppinternals.info gcc.info gccinstall.info gccint.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
-}
More information about the arch-commits
mailing list