[arch-commits] Commit in gdc/repos (10 files)
Михаил Страшун
dicebot at archlinux.org
Thu Jun 4 14:10:46 UTC 2015
Date: Thursday, June 4, 2015 @ 16:10:45
Author: dicebot
Revision: 134783
archrelease: copy trunk to community-i686, community-x86_64
Added:
gdc/repos/community-i686/PKGBUILD
(from rev 134782, gdc/trunk/PKGBUILD)
gdc/repos/community-i686/folders.diff
(from rev 134782, gdc/trunk/folders.diff)
gdc/repos/community-i686/system_zlib.diff
(from rev 134782, gdc/trunk/system_zlib.diff)
gdc/repos/community-x86_64/PKGBUILD
(from rev 134782, gdc/trunk/PKGBUILD)
gdc/repos/community-x86_64/folders.diff
(from rev 134782, gdc/trunk/folders.diff)
gdc/repos/community-x86_64/system_zlib.diff
(from rev 134782, gdc/trunk/system_zlib.diff)
Deleted:
gdc/repos/community-i686/PKGBUILD
gdc/repos/community-i686/folders.diff
gdc/repos/community-x86_64/PKGBUILD
gdc/repos/community-x86_64/folders.diff
-----------------------------------+
/PKGBUILD | 234 ++++++++++++++++++++++++++++++++++++
/folders.diff | 78 ++++++++++++
community-i686/PKGBUILD | 114 -----------------
community-i686/folders.diff | 39 ------
community-i686/system_zlib.diff | 86 +++++++++++++
community-x86_64/PKGBUILD | 114 -----------------
community-x86_64/folders.diff | 39 ------
community-x86_64/system_zlib.diff | 86 +++++++++++++
8 files changed, 484 insertions(+), 306 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2015-06-04 14:10:29 UTC (rev 134782)
+++ community-i686/PKGBUILD 2015-06-04 14:10:45 UTC (rev 134783)
@@ -1,114 +0,0 @@
-# Maintainer: Mihails Strasuns <public at dicebot.lv>
-# Contributor: Moritz Maxeiner <moritz at ucworks.org>
-# Contributor: Jerome Berger <jeberger at free.fr>
-# Contributor: Jesus Alvarez <jeezusjr at gmail.com>
-
-pkgname=('gdc' 'libgphobos-devel')
-pkgver=5.1.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' 'automake')
-options=('!emptydirs' '!buildflags')
-source=(
- "ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2"
- "gdc::git://github.com/D-Programming-GDC/GDC.git#branch=gdc-5"
- "git+https://github.com/D-Programming-GDC/GDMD.git"
- "folders.diff"
-)
-sha256sums=(
- 'b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad'
- 'SKIP'
- 'SKIP'
- 'ea5c80a28026393bd4627485602660a4a01d9fbc65299e95e768013e197bad20'
-)
-
-groups=('dlang' 'dlang-gdc')
-conflicts=('gdc1-bin' 'gdc1-hg' 'gdc-git')
-
-prepare()
-{
- cd $srcdir/gcc-$pkgver
-
- # 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
-
- cd $srcdir/gdc
- git apply $srcdir/folders.diff # fix gdc_include_path
- ./setup-gcc.sh ../gcc-$pkgver
-
- mkdir $srcdir/gcc-build
-}
-
-
-build()
-{
- cd ${srcdir}/gcc-build
-
- ${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
-
- make -j 4
-}
-
-package_gdc()
-{
- depends=('gcc' 'perl' 'binutils' 'libgphobos-devel')
- provides=("d-compiler")
- pkgdesc="Compiler for D programming language which uses gcc backend (2.065 frontend version)"
-
- install -D -m755 $srcdir/gcc-build/gcc/gdc $pkgdir/usr/bin/gdc
- install -D -m755 $srcdir/gcc-build/gcc/cc1d $pkgdir/usr/lib/gcc/$CHOST/$pkgver/cc1d
-
- # tools
- install -D -m755 $srcdir/GDMD/dmd-script $pkgdir/usr/bin/gdmd
- install -D -m644 $srcdir/GDMD/dmd-script.1 $pkgdir/usr/share/man/man1/gdmd.1
-}
-
-package_libgphobos-devel()
-{
- pkgdesc="Standard library for D programming language, GDC port"
- provides=("d-runtime" "d-stdlib")
- options=("staticlibs")
-
- # druntime
- install -D $srcdir/gdc/libphobos/libdruntime/object.di $pkgdir/usr/include/dlang/gdc/object.di
- 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
-
- # workaround for auto-generated libbacktrace issue
- # script needs to be re-written to first call normal gcc instalaltion targets to
- # avoid such problems in future
- cp $srcdir/gcc-build/$CHOST/libphobos/libdruntime/gcc/libbacktrace.d $pkgdir/usr/include/dlang/gdc/gcc/
- rm $pkgdir/usr/include/dlang/gdc/gcc/libbacktrace.d.in
-
- # phobos
- # cp $srcdir/gdc/libphobos/src/crc32.d ${pkgdir}/usr/include/dlang/gdc/
- cp -r $srcdir/gdc/libphobos/src/std ${pkgdir}/usr/include/dlang/gdc/std
- cp -r $srcdir/gdc/libphobos/src/etc ${pkgdir}/usr/include/dlang/gdc/etc
-
- install -D -m644 $srcdir/gcc-build/$CHOST/libphobos/src/libgphobos2.a $pkgdir/usr/lib/libgphobos2.a
-}
Copied: gdc/repos/community-i686/PKGBUILD (from rev 134782, gdc/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2015-06-04 14:10:45 UTC (rev 134783)
@@ -0,0 +1,117 @@
+# Maintainer: Mihails Strasuns <public at dicebot.lv>
+# Contributor: Moritz Maxeiner <moritz at ucworks.org>
+# Contributor: Jerome Berger <jeberger at free.fr>
+# Contributor: Jesus Alvarez <jeezusjr at gmail.com>
+
+pkgname=('gdc' 'libgphobos-devel')
+pkgver=5.1.0
+pkgrel=2
+arch=('i686' 'x86_64')
+url="https://github.com/D-Programming-GDC/GDC"
+license=('GPL')
+makedepends=('binutils>=2.23' 'git' 'gcc' 'make' 'perl' 'automake')
+options=('!emptydirs' '!buildflags')
+source=(
+ "ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2"
+ "gdc::git://github.com/D-Programming-GDC/GDC.git#tag=v2.066.1_gcc5"
+ "git+https://github.com/D-Programming-GDC/GDMD.git"
+ "folders.diff"
+ "system_zlib.diff"
+)
+sha256sums=(
+ 'b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad'
+ 'SKIP'
+ 'SKIP'
+ 'ea5c80a28026393bd4627485602660a4a01d9fbc65299e95e768013e197bad20'
+ '1bf81cde6a7bad096f76db2f20ad8ab2801cd0ab2dd2fa0219503073e8dae480'
+)
+
+groups=('dlang' 'dlang-gdc')
+conflicts=('gdc1-bin' 'gdc1-hg' 'gdc-git')
+
+prepare()
+{
+ cd $srcdir/gcc-$pkgver
+
+ # 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
+
+ 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
+
+ mkdir $srcdir/gcc-build
+}
+
+
+build()
+{
+ cd ${srcdir}/gcc-build
+
+ ${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
+
+ make -j 4
+}
+
+package_gdc()
+{
+ depends=('gcc' 'perl' 'binutils' 'libgphobos-devel')
+ provides=("d-compiler")
+ pkgdesc="Compiler for D programming language which uses gcc backend (2.065 frontend version)"
+
+ install -D -m755 $srcdir/gcc-build/gcc/gdc $pkgdir/usr/bin/gdc
+ install -D -m755 $srcdir/gcc-build/gcc/cc1d $pkgdir/usr/lib/gcc/$CHOST/$pkgver/cc1d
+
+ # tools
+ install -D -m755 $srcdir/GDMD/dmd-script $pkgdir/usr/bin/gdmd
+ install -D -m644 $srcdir/GDMD/dmd-script.1 $pkgdir/usr/share/man/man1/gdmd.1
+}
+
+package_libgphobos-devel()
+{
+ pkgdesc="Standard library for D programming language, GDC port"
+ provides=("d-runtime" "d-stdlib")
+ options=("staticlibs")
+
+ # druntime
+ install -D $srcdir/gdc/libphobos/libdruntime/object.di $pkgdir/usr/include/dlang/gdc/object.di
+ 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
+
+ # workaround for auto-generated libbacktrace issue
+ # script needs to be re-written to first call normal gcc instalaltion targets to
+ # avoid such problems in future
+ cp $srcdir/gcc-build/$CHOST/libphobos/libdruntime/gcc/libbacktrace.d $pkgdir/usr/include/dlang/gdc/gcc/
+ rm $pkgdir/usr/include/dlang/gdc/gcc/libbacktrace.d.in
+
+ # phobos
+ # cp $srcdir/gdc/libphobos/src/crc32.d ${pkgdir}/usr/include/dlang/gdc/
+ cp -r $srcdir/gdc/libphobos/src/std ${pkgdir}/usr/include/dlang/gdc/std
+ cp -r $srcdir/gdc/libphobos/src/etc ${pkgdir}/usr/include/dlang/gdc/etc
+
+ install -D -m644 $srcdir/gcc-build/$CHOST/libphobos/src/libgphobos2.a $pkgdir/usr/lib/libgphobos2.a
+}
Deleted: community-i686/folders.diff
===================================================================
--- community-i686/folders.diff 2015-06-04 14:10:29 UTC (rev 134782)
+++ community-i686/folders.diff 2015-06-04 14:10:45 UTC (rev 134783)
@@ -1,39 +0,0 @@
-diff --git a/gcc/d/d-incpath.cc b/gcc/d/d-incpath.cc
-index e04ddc6..168a033 100644
---- a/gcc/d/d-incpath.cc
-+++ b/gcc/d/d-incpath.cc
-@@ -202,7 +202,7 @@ add_import_paths(const char *iprefix, const char *imultilib, bool stdinc)
- import_path = xstrdup(p->fname);
-
- // Add D-specific suffix.
-- import_path = concat(import_path, "/d", NULL);
-+ import_path = concat(import_path, "/dlang/gdc", NULL);
-
- // Ignore duplicate entries.
- bool found = false;
-diff --git a/libphobos/configure b/libphobos/configure
-index 2ff7114..f7f0660 100755
---- a/libphobos/configure
-+++ b/libphobos/configure
-@@ -3883,7 +3883,7 @@ fi
-
-
- # Default case for install directory for D sources files.
--gdc_include_dir='${libdir}/gcc/${target_alias}'/${d_gcc_ver}/include/d
-+gdc_include_dir=${prefix}/include/dlang/gdc
-
-
- # Sanity check for the cross-compilation case:
-diff --git a/libphobos/configure.ac b/libphobos/configure.ac
-index 84492dd..947f6a8 100644
---- a/libphobos/configure.ac
-+++ b/libphobos/configure.ac
-@@ -167,7 +167,7 @@ AC_SUBST(phobos_toolexecdir)
- AC_SUBST(phobos_toolexeclibdir)
-
- # Default case for install directory for D sources files.
--gdc_include_dir='${libdir}/gcc/${target_alias}'/${d_gcc_ver}/include/d
-+gdc_include_dir=${prefix}/include/dlang/gdc
- AC_SUBST(gdc_include_dir)
-
- dnl Checks for header files.
Copied: gdc/repos/community-i686/folders.diff (from rev 134782, gdc/trunk/folders.diff)
===================================================================
--- community-i686/folders.diff (rev 0)
+++ community-i686/folders.diff 2015-06-04 14:10:45 UTC (rev 134783)
@@ -0,0 +1,39 @@
+diff --git a/gcc/d/d-incpath.cc b/gcc/d/d-incpath.cc
+index e04ddc6..168a033 100644
+--- a/gcc/d/d-incpath.cc
++++ b/gcc/d/d-incpath.cc
+@@ -202,7 +202,7 @@ add_import_paths(const char *iprefix, const char *imultilib, bool stdinc)
+ import_path = xstrdup(p->fname);
+
+ // Add D-specific suffix.
+- import_path = concat(import_path, "/d", NULL);
++ import_path = concat(import_path, "/dlang/gdc", NULL);
+
+ // Ignore duplicate entries.
+ bool found = false;
+diff --git a/libphobos/configure b/libphobos/configure
+index 2ff7114..f7f0660 100755
+--- a/libphobos/configure
++++ b/libphobos/configure
+@@ -3883,7 +3883,7 @@ fi
+
+
+ # Default case for install directory for D sources files.
+-gdc_include_dir='${libdir}/gcc/${target_alias}'/${d_gcc_ver}/include/d
++gdc_include_dir=${prefix}/include/dlang/gdc
+
+
+ # Sanity check for the cross-compilation case:
+diff --git a/libphobos/configure.ac b/libphobos/configure.ac
+index 84492dd..947f6a8 100644
+--- a/libphobos/configure.ac
++++ b/libphobos/configure.ac
+@@ -167,7 +167,7 @@ AC_SUBST(phobos_toolexecdir)
+ AC_SUBST(phobos_toolexeclibdir)
+
+ # Default case for install directory for D sources files.
+-gdc_include_dir='${libdir}/gcc/${target_alias}'/${d_gcc_ver}/include/d
++gdc_include_dir=${prefix}/include/dlang/gdc
+ AC_SUBST(gdc_include_dir)
+
+ dnl Checks for header files.
Copied: gdc/repos/community-i686/system_zlib.diff (from rev 134782, gdc/trunk/system_zlib.diff)
===================================================================
--- community-i686/system_zlib.diff (rev 0)
+++ community-i686/system_zlib.diff 2015-06-04 14:10:45 UTC (rev 134783)
@@ -0,0 +1,86 @@
+diff --git a/gcc/d/d-spec.cc b/gcc/d/d-spec.cc
+index a43cb34..e4bb527 100644
+--- a/gcc/d/d-spec.cc
++++ b/gcc/d/d-spec.cc
+@@ -96,7 +96,7 @@ lang_specific_driver (cl_decoded_option **in_decoded_options,
+ /* The number of arguments being added to what's in argv, other than
+ libraries. We use this to track the number of times we've inserted
+ -xd/-xnone. */
+- int added = 0;
++ int added = 1; /* -lz */
+
+ /* 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,
+ j++;
+ }
+
++ /* Use the up-to-date system zlib with libphobos */
++ {
++ generate_option (OPT_l, "z", 1, CL_DRIVER,
++ &new_decoded_options[j]);
++ added_libraries++;
++ j++;
++ }
++
+ /* 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
+--- a/libphobos/src/Makefile.in
++++ b/libphobos/src/Makefile.in
+@@ -150,7 +150,6 @@ SHELL = @SHELL@
+ STRIP = @STRIP@
+ VERSION = @VERSION@
+ WERROR = @WERROR@
+-ZLIB_OBJS = @ZLIB_OBJS@
+ 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 \
+ std/windows/charset.o std/windows/iunknown.o std/windows/registry.o \
+ std/windows/syserror.o std/internal/windows/advapi32.o
+
+-ALL_PHOBOS_OBJS = $(D_EXTRA_OBJS) $(MAIN_OBJS) $(ZLIB_OBJS)
++ALL_PHOBOS_OBJS = $(D_EXTRA_OBJS) $(MAIN_OBJS)
+
+ # 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
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2015-06-04 14:10:29 UTC (rev 134782)
+++ community-x86_64/PKGBUILD 2015-06-04 14:10:45 UTC (rev 134783)
@@ -1,114 +0,0 @@
-# Maintainer: Mihails Strasuns <public at dicebot.lv>
-# Contributor: Moritz Maxeiner <moritz at ucworks.org>
-# Contributor: Jerome Berger <jeberger at free.fr>
-# Contributor: Jesus Alvarez <jeezusjr at gmail.com>
-
-pkgname=('gdc' 'libgphobos-devel')
-pkgver=5.1.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' 'automake')
-options=('!emptydirs' '!buildflags')
-source=(
- "ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2"
- "gdc::git://github.com/D-Programming-GDC/GDC.git#branch=gdc-5"
- "git+https://github.com/D-Programming-GDC/GDMD.git"
- "folders.diff"
-)
-sha256sums=(
- 'b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad'
- 'SKIP'
- 'SKIP'
- 'ea5c80a28026393bd4627485602660a4a01d9fbc65299e95e768013e197bad20'
-)
-
-groups=('dlang' 'dlang-gdc')
-conflicts=('gdc1-bin' 'gdc1-hg' 'gdc-git')
-
-prepare()
-{
- cd $srcdir/gcc-$pkgver
-
- # 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
-
- cd $srcdir/gdc
- git apply $srcdir/folders.diff # fix gdc_include_path
- ./setup-gcc.sh ../gcc-$pkgver
-
- mkdir $srcdir/gcc-build
-}
-
-
-build()
-{
- cd ${srcdir}/gcc-build
-
- ${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
-
- make -j 4
-}
-
-package_gdc()
-{
- depends=('gcc' 'perl' 'binutils' 'libgphobos-devel')
- provides=("d-compiler")
- pkgdesc="Compiler for D programming language which uses gcc backend (2.065 frontend version)"
-
- install -D -m755 $srcdir/gcc-build/gcc/gdc $pkgdir/usr/bin/gdc
- install -D -m755 $srcdir/gcc-build/gcc/cc1d $pkgdir/usr/lib/gcc/$CHOST/$pkgver/cc1d
-
- # tools
- install -D -m755 $srcdir/GDMD/dmd-script $pkgdir/usr/bin/gdmd
- install -D -m644 $srcdir/GDMD/dmd-script.1 $pkgdir/usr/share/man/man1/gdmd.1
-}
-
-package_libgphobos-devel()
-{
- pkgdesc="Standard library for D programming language, GDC port"
- provides=("d-runtime" "d-stdlib")
- options=("staticlibs")
-
- # druntime
- install -D $srcdir/gdc/libphobos/libdruntime/object.di $pkgdir/usr/include/dlang/gdc/object.di
- 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
-
- # workaround for auto-generated libbacktrace issue
- # script needs to be re-written to first call normal gcc instalaltion targets to
- # avoid such problems in future
- cp $srcdir/gcc-build/$CHOST/libphobos/libdruntime/gcc/libbacktrace.d $pkgdir/usr/include/dlang/gdc/gcc/
- rm $pkgdir/usr/include/dlang/gdc/gcc/libbacktrace.d.in
-
- # phobos
- # cp $srcdir/gdc/libphobos/src/crc32.d ${pkgdir}/usr/include/dlang/gdc/
- cp -r $srcdir/gdc/libphobos/src/std ${pkgdir}/usr/include/dlang/gdc/std
- cp -r $srcdir/gdc/libphobos/src/etc ${pkgdir}/usr/include/dlang/gdc/etc
-
- install -D -m644 $srcdir/gcc-build/$CHOST/libphobos/src/libgphobos2.a $pkgdir/usr/lib/libgphobos2.a
-}
Copied: gdc/repos/community-x86_64/PKGBUILD (from rev 134782, gdc/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2015-06-04 14:10:45 UTC (rev 134783)
@@ -0,0 +1,117 @@
+# Maintainer: Mihails Strasuns <public at dicebot.lv>
+# Contributor: Moritz Maxeiner <moritz at ucworks.org>
+# Contributor: Jerome Berger <jeberger at free.fr>
+# Contributor: Jesus Alvarez <jeezusjr at gmail.com>
+
+pkgname=('gdc' 'libgphobos-devel')
+pkgver=5.1.0
+pkgrel=2
+arch=('i686' 'x86_64')
+url="https://github.com/D-Programming-GDC/GDC"
+license=('GPL')
+makedepends=('binutils>=2.23' 'git' 'gcc' 'make' 'perl' 'automake')
+options=('!emptydirs' '!buildflags')
+source=(
+ "ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2"
+ "gdc::git://github.com/D-Programming-GDC/GDC.git#tag=v2.066.1_gcc5"
+ "git+https://github.com/D-Programming-GDC/GDMD.git"
+ "folders.diff"
+ "system_zlib.diff"
+)
+sha256sums=(
+ 'b7dafdf89cbb0e20333dbf5b5349319ae06e3d1a30bf3515b5488f7e89dca5ad'
+ 'SKIP'
+ 'SKIP'
+ 'ea5c80a28026393bd4627485602660a4a01d9fbc65299e95e768013e197bad20'
+ '1bf81cde6a7bad096f76db2f20ad8ab2801cd0ab2dd2fa0219503073e8dae480'
+)
+
+groups=('dlang' 'dlang-gdc')
+conflicts=('gdc1-bin' 'gdc1-hg' 'gdc-git')
+
+prepare()
+{
+ cd $srcdir/gcc-$pkgver
+
+ # 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
+
+ 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
+
+ mkdir $srcdir/gcc-build
+}
+
+
+build()
+{
+ cd ${srcdir}/gcc-build
+
+ ${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
+
+ make -j 4
+}
+
+package_gdc()
+{
+ depends=('gcc' 'perl' 'binutils' 'libgphobos-devel')
+ provides=("d-compiler")
+ pkgdesc="Compiler for D programming language which uses gcc backend (2.065 frontend version)"
+
+ install -D -m755 $srcdir/gcc-build/gcc/gdc $pkgdir/usr/bin/gdc
+ install -D -m755 $srcdir/gcc-build/gcc/cc1d $pkgdir/usr/lib/gcc/$CHOST/$pkgver/cc1d
+
+ # tools
+ install -D -m755 $srcdir/GDMD/dmd-script $pkgdir/usr/bin/gdmd
+ install -D -m644 $srcdir/GDMD/dmd-script.1 $pkgdir/usr/share/man/man1/gdmd.1
+}
+
+package_libgphobos-devel()
+{
+ pkgdesc="Standard library for D programming language, GDC port"
+ provides=("d-runtime" "d-stdlib")
+ options=("staticlibs")
+
+ # druntime
+ install -D $srcdir/gdc/libphobos/libdruntime/object.di $pkgdir/usr/include/dlang/gdc/object.di
+ 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
+
+ # workaround for auto-generated libbacktrace issue
+ # script needs to be re-written to first call normal gcc instalaltion targets to
+ # avoid such problems in future
+ cp $srcdir/gcc-build/$CHOST/libphobos/libdruntime/gcc/libbacktrace.d $pkgdir/usr/include/dlang/gdc/gcc/
+ rm $pkgdir/usr/include/dlang/gdc/gcc/libbacktrace.d.in
+
+ # phobos
+ # cp $srcdir/gdc/libphobos/src/crc32.d ${pkgdir}/usr/include/dlang/gdc/
+ cp -r $srcdir/gdc/libphobos/src/std ${pkgdir}/usr/include/dlang/gdc/std
+ cp -r $srcdir/gdc/libphobos/src/etc ${pkgdir}/usr/include/dlang/gdc/etc
+
+ install -D -m644 $srcdir/gcc-build/$CHOST/libphobos/src/libgphobos2.a $pkgdir/usr/lib/libgphobos2.a
+}
Deleted: community-x86_64/folders.diff
===================================================================
--- community-x86_64/folders.diff 2015-06-04 14:10:29 UTC (rev 134782)
+++ community-x86_64/folders.diff 2015-06-04 14:10:45 UTC (rev 134783)
@@ -1,39 +0,0 @@
-diff --git a/gcc/d/d-incpath.cc b/gcc/d/d-incpath.cc
-index e04ddc6..168a033 100644
---- a/gcc/d/d-incpath.cc
-+++ b/gcc/d/d-incpath.cc
-@@ -202,7 +202,7 @@ add_import_paths(const char *iprefix, const char *imultilib, bool stdinc)
- import_path = xstrdup(p->fname);
-
- // Add D-specific suffix.
-- import_path = concat(import_path, "/d", NULL);
-+ import_path = concat(import_path, "/dlang/gdc", NULL);
-
- // Ignore duplicate entries.
- bool found = false;
-diff --git a/libphobos/configure b/libphobos/configure
-index 2ff7114..f7f0660 100755
---- a/libphobos/configure
-+++ b/libphobos/configure
-@@ -3883,7 +3883,7 @@ fi
-
-
- # Default case for install directory for D sources files.
--gdc_include_dir='${libdir}/gcc/${target_alias}'/${d_gcc_ver}/include/d
-+gdc_include_dir=${prefix}/include/dlang/gdc
-
-
- # Sanity check for the cross-compilation case:
-diff --git a/libphobos/configure.ac b/libphobos/configure.ac
-index 84492dd..947f6a8 100644
---- a/libphobos/configure.ac
-+++ b/libphobos/configure.ac
-@@ -167,7 +167,7 @@ AC_SUBST(phobos_toolexecdir)
- AC_SUBST(phobos_toolexeclibdir)
-
- # Default case for install directory for D sources files.
--gdc_include_dir='${libdir}/gcc/${target_alias}'/${d_gcc_ver}/include/d
-+gdc_include_dir=${prefix}/include/dlang/gdc
- AC_SUBST(gdc_include_dir)
-
- dnl Checks for header files.
Copied: gdc/repos/community-x86_64/folders.diff (from rev 134782, gdc/trunk/folders.diff)
===================================================================
--- community-x86_64/folders.diff (rev 0)
+++ community-x86_64/folders.diff 2015-06-04 14:10:45 UTC (rev 134783)
@@ -0,0 +1,39 @@
+diff --git a/gcc/d/d-incpath.cc b/gcc/d/d-incpath.cc
+index e04ddc6..168a033 100644
+--- a/gcc/d/d-incpath.cc
++++ b/gcc/d/d-incpath.cc
+@@ -202,7 +202,7 @@ add_import_paths(const char *iprefix, const char *imultilib, bool stdinc)
+ import_path = xstrdup(p->fname);
+
+ // Add D-specific suffix.
+- import_path = concat(import_path, "/d", NULL);
++ import_path = concat(import_path, "/dlang/gdc", NULL);
+
+ // Ignore duplicate entries.
+ bool found = false;
+diff --git a/libphobos/configure b/libphobos/configure
+index 2ff7114..f7f0660 100755
+--- a/libphobos/configure
++++ b/libphobos/configure
+@@ -3883,7 +3883,7 @@ fi
+
+
+ # Default case for install directory for D sources files.
+-gdc_include_dir='${libdir}/gcc/${target_alias}'/${d_gcc_ver}/include/d
++gdc_include_dir=${prefix}/include/dlang/gdc
+
+
+ # Sanity check for the cross-compilation case:
+diff --git a/libphobos/configure.ac b/libphobos/configure.ac
+index 84492dd..947f6a8 100644
+--- a/libphobos/configure.ac
++++ b/libphobos/configure.ac
+@@ -167,7 +167,7 @@ AC_SUBST(phobos_toolexecdir)
+ AC_SUBST(phobos_toolexeclibdir)
+
+ # Default case for install directory for D sources files.
+-gdc_include_dir='${libdir}/gcc/${target_alias}'/${d_gcc_ver}/include/d
++gdc_include_dir=${prefix}/include/dlang/gdc
+ AC_SUBST(gdc_include_dir)
+
+ dnl Checks for header files.
Copied: gdc/repos/community-x86_64/system_zlib.diff (from rev 134782, gdc/trunk/system_zlib.diff)
===================================================================
--- community-x86_64/system_zlib.diff (rev 0)
+++ community-x86_64/system_zlib.diff 2015-06-04 14:10:45 UTC (rev 134783)
@@ -0,0 +1,86 @@
+diff --git a/gcc/d/d-spec.cc b/gcc/d/d-spec.cc
+index a43cb34..e4bb527 100644
+--- a/gcc/d/d-spec.cc
++++ b/gcc/d/d-spec.cc
+@@ -96,7 +96,7 @@ lang_specific_driver (cl_decoded_option **in_decoded_options,
+ /* The number of arguments being added to what's in argv, other than
+ libraries. We use this to track the number of times we've inserted
+ -xd/-xnone. */
+- int added = 0;
++ int added = 1; /* -lz */
+
+ /* 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,
+ j++;
+ }
+
++ /* Use the up-to-date system zlib with libphobos */
++ {
++ generate_option (OPT_l, "z", 1, CL_DRIVER,
++ &new_decoded_options[j]);
++ added_libraries++;
++ j++;
++ }
++
+ /* 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
+--- a/libphobos/src/Makefile.in
++++ b/libphobos/src/Makefile.in
+@@ -150,7 +150,6 @@ SHELL = @SHELL@
+ STRIP = @STRIP@
+ VERSION = @VERSION@
+ WERROR = @WERROR@
+-ZLIB_OBJS = @ZLIB_OBJS@
+ 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 \
+ std/windows/charset.o std/windows/iunknown.o std/windows/registry.o \
+ std/windows/syserror.o std/internal/windows/advapi32.o
+
+-ALL_PHOBOS_OBJS = $(D_EXTRA_OBJS) $(MAIN_OBJS) $(ZLIB_OBJS)
++ALL_PHOBOS_OBJS = $(D_EXTRA_OBJS) $(MAIN_OBJS)
+
+ # 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
More information about the arch-commits
mailing list