Date: Tuesday, May 3, 2016 @ 23:47:03 Author: heftig Revision: 173611
6.1.1-1 Modified: gcc-multilib/trunk/PKGBUILD Deleted: gcc-multilib/trunk/Unlink-the-response-file.patch gcc-multilib/trunk/gcc-ada.install gcc-multilib/trunk/gcc-fortran.install gcc-multilib/trunk/gcc-go.install gcc-multilib/trunk/gcc-libs.install gcc-multilib/trunk/gcc.install --------------------------------+ PKGBUILD | 54 +++++++++++++-------------------------- Unlink-the-response-file.patch | 54 --------------------------------------- gcc-ada.install | 20 -------------- gcc-fortran.install | 16 ----------- gcc-go.install | 20 -------------- gcc-libs.install | 16 ----------- gcc.install | 20 -------------- 7 files changed, 19 insertions(+), 181 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-05-03 21:42:45 UTC (rev 173610) +++ PKGBUILD 2016-05-03 21:47:03 UTC (rev 173611) @@ -6,37 +6,31 @@ # NOTE: libtool requires rebuilt with each new gcc version pkgname=('gcc-multilib' 'gcc-libs-multilib' 'lib32-gcc-libs' 'gcc-fortran-multilib' 'gcc-objc-multilib' 'gcc-ada-multilib' 'gcc-go-multilib') -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 for multilib" arch=('x86_64') license=('GPL' 'LGPL' 'FDL' 'custom') url="http://gcc.gnu.org" -makedepends=('binutils>=2.26' 'libmpc' 'gcc-ada-multilib' 'doxygen' +makedepends=('binutils>=2.26' 'libmpc' 'gcc-ada-multilib' 'doxygen' 'git' 'lib32-glibc>=2.23') 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 +[[ $CARCH == "x86_64" ]] && 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 @@ -47,14 +41,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 } @@ -66,7 +55,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/ \ @@ -96,7 +85,7 @@ # do not abort on error as some are "expected" make -k check || true - ${srcdir}/${_basedir}/contrib/test_summary + ${srcdir}/gcc/contrib/test_summary } package_lib32-gcc-libs() @@ -132,7 +121,7 @@ rm -r ${pkgdir}/usr/lib # Install Runtime Library Exception - install -Dm644 ${srcdir}/${_basedir}/COPYING.RUNTIME \ + install -Dm644 ${srcdir}/gcc/COPYING.RUNTIME \ ${pkgdir}/usr/share/licenses/lib32-gcc-libs/RUNTIME.LIBRARY.EXCEPTION } @@ -143,7 +132,6 @@ provides=("gcc-libs=$pkgver-$pkgrel") conflicts=('gcc-libs') options=('!emptydirs' '!strip') - install=gcc-libs.install cd ${srcdir}/gcc-build @@ -183,7 +171,7 @@ rm -r ${pkgdir}/usr/lib32 # Install Runtime Library Exception - install -Dm644 ${srcdir}/${_basedir}/COPYING.RUNTIME \ + install -Dm644 ${srcdir}/gcc/COPYING.RUNTIME \ ${pkgdir}/usr/share/licenses/gcc-libs-multilib/RUNTIME.LIBRARY.EXCEPTION } @@ -195,7 +183,6 @@ options=('staticlibs') provides=("gcc=$pkgver-$pkgrel") conflicts=('gcc') - install=gcc.install cd ${srcdir}/gcc-build @@ -305,12 +292,11 @@ provides=("gcc-fortran=$pkgver-$pkgrel") conflicts=('gcc-fortran') 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/32/libgfortran DESTDIR=$pkgdir install-{caf,my}execlibLTLIBRARIES \ + make -C $CHOST/32/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} @@ -347,7 +333,6 @@ provides=("gcc-ada=$pkgver-$pkgrel") conflicts=('gcc-ada') options=('staticlibs' '!emptydirs') - install=gcc-ada.install cd ${srcdir}/gcc-build/gcc make DESTDIR=$pkgdir ada.install-{common,info} @@ -383,7 +368,6 @@ provides=("gcc-go=$pkgver-$pkgrel") conflicts=('go' 'gcc-go') options=('!emptydirs') - install=gcc-go.install cd ${srcdir}/gcc-build make -C $CHOST/libgo DESTDIR=$pkgdir install-exec-am Deleted: Unlink-the-response-file.patch =================================================================== --- Unlink-the-response-file.patch 2016-05-03 21:42:45 UTC (rev 173610) +++ Unlink-the-response-file.patch 2016-05-03 21:47:03 UTC (rev 173611) @@ -1,54 +0,0 @@ -From f591a95d1532ac7791c146a8e55ba3a32b3e476f Mon Sep 17 00:00:00 2001 -From: ebotcazou <ebotcazou@138bc75d-0d04-0410-961f-82ee72b054a4> -Date: Tue, 23 Jun 2015 20:48:07 +0000 -Subject: [PATCH] * collect-utils.c (collect_wait): Unlink the - response file here instead of... (do_wait): ...here. - (utils_cleanup): ...and here. - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@224858 138bc75d-0d04-0410-961f-82ee72b054a4 ---- - gcc/ChangeLog | 7 +++++++ - gcc/collect-utils.c | 14 ++++++-------- - 2 files changed, 13 insertions(+), 8 deletions(-) - -diff --git a/gcc/collect-utils.c b/gcc/collect-utils.c -index 6bbe9eb..517a075 100644 ---- a/gcc/collect-utils.c -+++ b/gcc/collect-utils.c -@@ -68,6 +68,12 @@ collect_wait (const char *prog, struct pex_obj *pex) - fatal_error (input_location, "can't get program status: %m"); - pex_free (pex); - -+ if (response_file && !save_temps) -+ { -+ unlink (response_file); -+ response_file = NULL; -+ } -+ - if (status) - { - if (WIFSIGNALED (status)) -@@ -90,12 +96,6 @@ do_wait (const char *prog, struct pex_obj *pex) - int ret = collect_wait (prog, pex); - if (ret != 0) - fatal_error (input_location, "%s returned %d exit status", prog, ret); -- -- if (response_file && !save_temps) -- { -- unlink (response_file); -- response_file = NULL; -- } - } - - -@@ -224,7 +224,5 @@ utils_cleanup (bool from_signal) - calls to maybe_unlink fails. */ - cleanup_done = true; - -- if (response_file) -- maybe_unlink (response_file); - tool_cleanup (from_signal); - } --- -2.7.1 - Deleted: gcc-ada.install =================================================================== --- gcc-ada.install 2016-05-03 21:42:45 UTC (rev 173610) +++ gcc-ada.install 2016-05-03 21:47:03 UTC (rev 173611) @@ -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-03 21:42:45 UTC (rev 173610) +++ gcc-fortran.install 2016-05-03 21:47:03 UTC (rev 173611) @@ -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-03 21:42:45 UTC (rev 173610) +++ gcc-go.install 2016-05-03 21:47:03 UTC (rev 173611) @@ -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-03 21:42:45 UTC (rev 173610) +++ gcc-libs.install 2016-05-03 21:47:03 UTC (rev 173611) @@ -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-03 21:42:45 UTC (rev 173610) +++ gcc.install 2016-05-03 21:47:03 UTC (rev 173611) @@ -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 -}