diff options
author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-01-01 03:24:22 +0000 |
---|---|---|
committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-01-01 03:24:22 +0000 |
commit | ce0424b2e68538f0e0c1b882300541ceed0d27e3 (patch) | |
tree | 55d80adcdcd70e60e180be3acb102a1be02f00b3 /community/gdc | |
parent | 5a81550adad5ccde4ad6924cfee2b2ef96d02c98 (diff) |
Wed Jan 1 03:20:52 UTC 2014
Diffstat (limited to 'community/gdc')
-rw-r--r-- | community/gdc/PKGBUILD | 6 | ||||
-rw-r--r-- | community/gdc/folders.diff | 27 |
2 files changed, 8 insertions, 25 deletions
diff --git a/community/gdc/PKGBUILD b/community/gdc/PKGBUILD index 3ed37cf9a..9d3fbad0a 100644 --- a/community/gdc/PKGBUILD +++ b/community/gdc/PKGBUILD @@ -5,7 +5,7 @@ pkgname=('gdc' 'libgphobos-devel') pkgver=4.8.2 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') url="https://github.com/D-Programming-GDC/GDC" license=('GPL') @@ -17,7 +17,7 @@ source=(ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz folders.diff) sha256sums=('e4e2202b15f8ba323f88c65de0e4190b0630a4b2e70b0653526b31e946877ead' 'SKIP' - '88a1f1315633e9dde18637ff5239898abd94dca9a39fdb211a66555dd84c2fec') + '805d1130394e3ff18ae7043e111fe2ea045a7da6f290d298a670f9e2c35ba533') groups=('dlang' 'dlang-gdc') conflicts=('gdc1-bin' 'gdc1-hg' 'gdc-git') @@ -72,7 +72,7 @@ package_gdc() depends=('gcc' 'binutils') optdepends=('libgphobos-devel: D standard library, GDC version') provides=("d-compiler") - pkgdesc="Compiler for D programming language wich uses gcc backend" + pkgdesc="Compiler for D programming language which uses gcc backend (2.064.2 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 diff --git a/community/gdc/folders.diff b/community/gdc/folders.diff index 05fc9991a..cf89e5d3d 100644 --- a/community/gdc/folders.diff +++ b/community/gdc/folders.diff @@ -1,33 +1,16 @@ -diff --git a/gcc/d/Make-lang.in b/gcc/d/Make-lang.in -index 9570bf3..52addc0 100644 ---- a/gcc/d/Make-lang.in -+++ b/gcc/d/Make-lang.in -@@ -25,10 +25,10 @@ D_TARGET_INSTALL_NAME = $(target_alias)-$(shell echo gdc|sed '$(program_transfor - - # This should be configured - ifeq ($(host), $(target)) -- D_include_dir = `echo $(exec_prefix) | sed -e 's|^$(prefix)||' -e 's|/[^/]*|/..|g'`/include/d/$(version) -+ D_include_dir = `echo $(exec_prefix) | sed -e 's|^$(prefix)||' -e 's|/[^/]*|/..|g'`/include/dlang/gdc/$(version) - gcc_d_include_dir = $(libsubdir)/$(unlibsubdir)/..$(D_include_dir) - else -- gcc_d_include_dir = $(libsubdir)/include/d -+ gcc_d_include_dir = $(libsubdir)/include/dlang/gdc - endif - - diff --git a/libphobos/configure.ac b/libphobos/configure.ac -index dfb8fec..0b88ff4 100644 +index 69dfc35..89b8136 100644 --- a/libphobos/configure.ac +++ b/libphobos/configure.ac -@@ -220,9 +220,9 @@ dnl (# Default case for install directory for include files.) and on +@@ -215,9 +215,9 @@ dnl (# Default case for install directory for include files.) and on # will have to modify gcc/configure.ac .. # For now, basic workaround for cross compilers .. - if test "${host}" != "${build}"; then + if test "${host}" != "${target}"; then - gdc_include_dir='${libdir}/gcc/${host_alias}'/${d_gcc_ver}/include/d -+ gdc_include_dir='${libdir}/gcc/${host_alias}'/${d_gcc_ver}/include/dlang/ ++ gdc_include_dir='${libdir}/gcc/${host_alias}'/${d_gcc_ver}/include/dlang else - gdc_include_dir='${prefix}'/include/d/${d_gcc_ver} -+ gdc_include_dir='${prefix}'/include/dlang/gdc/${d_gcc_ver} ++ gdc_include_dir='${prefix}'/include/dlang/gcc fi AC_SUBST(gdc_include_dir) AC_ARG_WITH([cross-host], |