Date: Friday, May 2, 2014 @ 00:59:34
  Author: dicebot
Revision: 110504

gdc: preparation for gcc 4.9.0 switch

Modified:
  gdc/trunk/PKGBUILD

----------+
 PKGBUILD |   25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2014-05-01 18:40:21 UTC (rev 110503)
+++ PKGBUILD    2014-05-01 22:59:34 UTC (rev 110504)
@@ -4,22 +4,21 @@
 # Contributor: Jesus Alvarez <jeezu...@gmail.com>
 
 pkgname=('gdc' 'libgphobos-devel')
-pkgver=4.8.2
-pkgrel=7
+pkgver=4.9.0
+pkgrel=1
 arch=('i686' 'x86_64')
 url="https://github.com/D-Programming-GDC/GDC";
 license=('GPL')
 makedepends=('binutils>=2.23' 'git' 'gcc' 'make' 'perl' 'cloog' 'automake')
 options=('!emptydirs' '!buildflags')
-_snapshot=4.8-20130725
 source=(
-    "ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2";
-    "gdc::git://github.com/D-Programming-GDC/GDC.git#branch=gdc-4.8"
+    "ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2";
+    "gdc::git://github.com/D-Programming-GDC/GDC.git#branch=gdc-4.9"
     "git+https://github.com/D-Programming-GDC/GDMD.git";
     "folders.diff"
 )
 sha256sums=(
-    'e4e2202b15f8ba323f88c65de0e4190b0630a4b2e70b0653526b31e946877ead'
+    'b9b047a97bade9c1c89970bc8e211ff57b7b8998a1730a80a653d329f8ed1257'
     'SKIP'
     'SKIP'
     '82f1ba0825164a74660bd5008d8f3acae1bacc3271c86475efc1601fe0da73c4'
@@ -30,12 +29,12 @@
 
 prepare()
 {
-    cd $srcdir/gcc-$_snapshot
+    cd $srcdir/gcc-$pkgver
 
-    # Do not run fixincludes
-    sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
+    # 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
+    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
@@ -42,7 +41,7 @@
 
     cd $srcdir/gdc
     git apply $srcdir/folders.diff # fix gdc_include_path
-    ./setup-gcc.sh ../gcc-$_snapshot
+    ./setup-gcc.sh ../gcc-$pkgver
 
     mkdir $srcdir/gcc-build
 }
@@ -52,7 +51,7 @@
 {
     cd ${srcdir}/gcc-build
 
-    ${srcdir}/gcc-$_snapshot/configure --prefix=/usr \
+    ${srcdir}/gcc-$pkgver/configure --prefix=/usr \
         --libdir=/usr/lib --libexecdir=/usr/lib \
         --mandir=/usr/share/man --infodir=/usr/share/info \
         --with-bugurl=https://bugs.archlinux.org/ \
@@ -63,7 +62,7 @@
         --disable-libstdcxx-pch --disable-libssp \
         --enable-gnu-unique-object --enable-linker-build-id \
         --enable-cloog-backend=isl --disable-cloog-version-check \
-        --enable-lto --enable-gold --enable-plugin --enable-ld=default \
+        --enable-gold --enable-plugin --enable-ld=default \
         --enable-install-libiberty --with-plugin-ld=ld.gold \
         --with-linker-hash-style=gnu \
         --disable-multilib --disable-werror \

Reply via email to