Date: Friday, May 6, 2016 @ 07:01:00 Author: dicebot Revision: 173915
upgpkg: gdc 6.1.1-1 gdc adapted for gcc 6.1.1 Modified: gdc/trunk/PKGBUILD gdc/trunk/system_zlib.diff ------------------+ PKGBUILD | 108 ++++++++++++++++++++++++++++------------------------- system_zlib.diff | 47 ++--------------------- 2 files changed, 64 insertions(+), 91 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-05-06 02:52:36 UTC (rev 173914) +++ PKGBUILD 2016-05-06 05:01:00 UTC (rev 173915) @@ -2,78 +2,88 @@ # Contributor: Moritz Maxeiner <mor...@ucworks.org> # Contributor: Jerome Berger <jeber...@free.fr> # Contributor: Jesus Alvarez <jeezu...@gmail.com> +# Contributor: Allan McRae <al...@archlinux.org> pkgname=('gdc' 'libgphobos-devel') -pkgver=5.3.0 -pkgrel=2 +pkgver=6.1.1 +pkgrel=1 +_pkgver=6 +_islver=0.16.1 +_commit=80f78834 arch=('i686' 'x86_64') +license=('GPL') url="https://github.com/D-Programming-GDC/GDC" -license=('GPL') -makedepends=('binutils>=2.23' 'git' 'gcc' 'make' 'perl' 'automake') +makedepends=('binutils>=2.26' 'git' 'gcc' 'make' 'perl' 'automake') options=('!emptydirs' '!buildflags') +groups=('dlang' 'dlang-gdc') +conflicts=('gdc1-bin' 'gdc1-hg' 'gdc-git') source=( - "ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2" - "gdc::git://github.com/D-Programming-GDC/GDC.git#commit=e95a735b978da70467bbb553fab40efa3ea17569" - "git+https://github.com/D-Programming-GDC/GDMD.git" - "folders.diff" - "system_zlib.diff" + git://gcc.gnu.org/git/gcc.git#commit=${_commit} + http://isl.gforge.inria.fr/isl-${_islver}.tar.bz2 + gdc::git://github.com/D-Programming-GDC/GDC.git#commit=73a7fb5d4e75c0e1a4ee7cdb67d080cceb8ff955 + git+https://github.com/D-Programming-GDC/GDMD.git + folders.diff + system_zlib.diff ) sha256sums=( - 'b84f5592e9218b73dbae612b5253035a7b34a9a1f7688d2e1bfaaf7267d5c4db' 'SKIP' + '412538bb65c799ac98e17e8cfcdacbb257a57362acfaaff254b0fcae970126d2' 'SKIP' + 'SKIP' 'ea5c80a28026393bd4627485602660a4a01d9fbc65299e95e768013e197bad20' - '4c679ac426a841182215654f5555c0294449e4fde107da0e0f6c2dbb6476f0b2' + '3c818788b5435794c37e5d3d131fe74c813368a3b7260f85fb2cd725308e4889' ) -groups=('dlang' 'dlang-gdc') -conflicts=('gdc1-bin' 'gdc1-hg' 'gdc-git') +# gcc-6.0 forces a changed triplet - need to address in pacman/devtools +[[ $CARCH == "x86_64" ]] && CHOST=x86_64-pc-linux-gnu -prepare() -{ - cd $srcdir/gcc-$pkgver +prepare() { + cd ${srcdir}/gcc - # Arch Linux installs x86_64 libraries /lib - [[ $CARCH == "x86_64" ]] && sed -i '/m64=/s/lib64/lib/' gcc/config/i386/t-linux64 + # link isl for in-tree build + ln -sf ../isl-${_islver} isl - echo ${pkgver} > gcc/BASE-VER + # Do not run fixincludes + sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in - # hack! - some configure tests for header files using "$CPP $CPPFLAGS" - sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" {libiberty,gcc}/configure + # Arch Linux installs x86_64 libraries /lib + [[ $CARCH == "x86_64" ]] && sed -i '/m64=/s/lib64/lib/' gcc/config/i386/t-linux64 - cd $srcdir/gdc - git apply $srcdir/folders.diff # fix gdc_include_path - git apply $srcdir/system_zlib.diff # use correct system zlib - ./setup-gcc.sh ../gcc-$pkgver + # hack! - some configure tests for header files using "$CPP $CPPFLAGS" + sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" {libiberty,gcc}/configure - mkdir $srcdir/gcc-build + cd $srcdir/gdc + git apply $srcdir/folders.diff # fix gdc_include_path + git apply $srcdir/system_zlib.diff # use correct system zlib + ./setup-gcc.sh ../gcc + + mkdir ${srcdir}/gcc-build } +build() { + cd ${srcdir}/gcc-build -build() -{ - cd ${srcdir}/gcc-build + # using -pipe causes spurious test-suite failures + # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=48565 + CFLAGS=${CFLAGS/-pipe/} + CXXFLAGS=${CXXFLAGS/-pipe/} - ${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/ \ - --enable-languages=d \ - --enable-shared --enable-threads=posix \ - --with-system-zlib --enable-__cxa_atexit \ - --disable-libunwind-exceptions --enable-clocale=gnu \ - --disable-libstdcxx-pch --disable-libssp \ - --enable-gnu-unique-object --enable-linker-build-id \ - --enable-cloog-backend=isl --disable-cloog-version-check \ - --enable-gold --enable-plugin --enable-ld=default \ - --enable-install-libiberty --with-plugin-ld=ld.gold \ - --with-linker-hash-style=gnu \ - --disable-multilib --disable-werror \ - --disable-nls --disable-bootstrap \ - --disable-libgomp --disable-libmudflap --disable-libquadmath \ - --enable-checking=release + ${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/ \ + --enable-languages=d \ + --enable-shared --enable-threads=posix --enable-libmpx \ + --with-system-zlib --with-isl --enable-__cxa_atexit \ + --disable-libunwind-exceptions --enable-clocale=gnu \ + --disable-libstdcxx-pch --disable-libssp \ + --enable-gnu-unique-object --enable-linker-build-id \ + --enable-lto --enable-plugin --enable-install-libiberty \ + --with-linker-hash-style=gnu --enable-gnu-indirect-function \ + --disable-multilib --disable-werror \ + --enable-checking=release - make -j 4 + make -j 4 } package_gdc() @@ -97,7 +107,7 @@ options=("staticlibs") # druntime - install -D $srcdir/gdc/libphobos/libdruntime/object.di $pkgdir/usr/include/dlang/gdc/object.di + install -D $srcdir/gdc/libphobos/libdruntime/object.d $pkgdir/usr/include/dlang/gdc/object.d install -D $srcdir/gdc/libphobos/libdruntime/__entrypoint.di ${pkgdir}/usr/include/dlang/gdc/__entrypoint.di cp -r $srcdir/gdc/libphobos/libdruntime/core $pkgdir/usr/include/dlang/gdc/core cp -r $srcdir/gdc/libphobos/libdruntime/gcc $pkgdir/usr/include/dlang/gdc/gcc Modified: system_zlib.diff =================================================================== --- system_zlib.diff 2016-05-06 02:52:36 UTC (rev 173914) +++ system_zlib.diff 2016-05-06 05:01:00 UTC (rev 173915) @@ -1,5 +1,5 @@ diff --git a/gcc/d/d-spec.c b/gcc/d/d-spec.c -index a43cb34..e4bb527 100644 +index d45c648..9010edb 100644 --- a/gcc/d/d-spec.c +++ b/gcc/d/d-spec.c @@ -96,7 +96,7 @@ lang_specific_driver (cl_decoded_option **in_decoded_options, @@ -11,7 +11,7 @@ /* The new argument list will be contained in this. */ cl_decoded_option *new_decoded_options; -@@ -462,6 +462,14 @@ lang_specific_driver (cl_decoded_option **in_decoded_options, +@@ -468,6 +468,14 @@ lang_specific_driver (cl_decoded_option **in_decoded_options, j++; } @@ -26,33 +26,11 @@ /* Add `-lgphobos' if we haven't already done so. */ if (library > 0 && phobos) { -diff --git a/libphobos/src/Makefile.am b/libphobos/src/Makefile.am -index de99b58..d174646 100644 ---- a/libphobos/src/Makefile.am -+++ b/libphobos/src/Makefile.am -@@ -92,8 +92,6 @@ Z_OBJS=zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/deflate.o \ - zlib/infback.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o \ - zlib/trees.o zlib/uncompr.o zlib/zutil.o - --ZLIB_OBJS=@ZLIB_OBJS@ -- - - # modules which require some kind of operating system - OS_OBJS=std/file.o std/mmfile.o std/path.o std/process.o \ -@@ -113,7 +111,7 @@ WINDOWS_OBJS=std/c/windows/com.o std/c/windows/stat.o std/c/wcharh.o \ - - D_EXTRA_OBJS=@D_EXTRA_OBJS@ - --ALL_PHOBOS_OBJS = $(D_EXTRA_OBJS) $(MAIN_OBJS) $(ZLIB_OBJS) -+ALL_PHOBOS_OBJS = $(D_EXTRA_OBJS) $(MAIN_OBJS) - - - libgphobos2.a : $(ALL_PHOBOS_OBJS) ../libdruntime/libgdruntime.a diff --git a/libphobos/src/Makefile.in b/libphobos/src/Makefile.in -index 6d3a91f..803e4aa 100644 +index 6597116..f0f42e3 100644 --- a/libphobos/src/Makefile.in +++ b/libphobos/src/Makefile.in -@@ -150,7 +150,6 @@ SHELL = @SHELL@ +@@ -151,7 +151,6 @@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ WERROR = @WERROR@ @@ -60,7 +38,7 @@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ -@@ -272,7 +271,7 @@ WINDOWS_OBJS = std/c/windows/com.o std/c/windows/stat.o std/c/wcharh.o \ +@@ -283,7 +282,7 @@ WINDOWS_OBJS = std/c/windows/com.o std/c/windows/stat.o std/c/wcharh.o \ std/windows/charset.o std/windows/iunknown.o std/windows/registry.o \ std/windows/syserror.o std/internal/windows/advapi32.o @@ -69,18 +47,3 @@ # Work around what appears to be a GNU make bug handling MAKEFLAGS # values defined in terms of make variables, as is the case for CC and -diff --git a/libphobos/src/etc/c/zlib.d b/libphobos/src/etc/c/zlib.d -index 65b1d92..b41b63a 100644 ---- a/libphobos/src/etc/c/zlib.d -+++ b/libphobos/src/etc/c/zlib.d -@@ -37,8 +37,8 @@ import core.stdc.config; - - extern (C): - --const char[] ZLIB_VERSION = "1.2.3"; --const ZLIB_VERNUM = 0x1230; -+const char[] ZLIB_VERSION = "1.2.8"; -+const ZLIB_VERNUM = 0x1280; - - /* - The 'zlib' compression library provides in-memory compression and