diff options
Diffstat (limited to 'community/gdc')
| -rw-r--r-- | community/gdc/PKGBUILD | 16 | ||||
| -rw-r--r-- | community/gdc/folders.diff | 21 |
2 files changed, 21 insertions, 16 deletions
diff --git a/community/gdc/PKGBUILD b/community/gdc/PKGBUILD index 72fb3a5c6..31230ed9b 100644 --- a/community/gdc/PKGBUILD +++ b/community/gdc/PKGBUILD @@ -5,7 +5,7 @@ pkgname=('gdc' 'libgphobos-devel') pkgver=4.8.1 -pkgrel=1 +pkgrel=2 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' - 'cd9df3c4129092f9a3ce6f608baa83e12935d7185d0ad3e273799264a21b031e') + '88a1f1315633e9dde18637ff5239898abd94dca9a39fdb211a66555dd84c2fec') groups=('dlang' 'dlang-gdc') conflicts=('gdc1-bin' 'gdc1-hg' 'gdc-git') @@ -71,6 +71,7 @@ package_gdc() { depends=('libmpc' 'zlib') optdepends=('libgphobos-devel: D standard library, GDC version') + description="Compiler for D programming language wich uses gcc backend" 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/4.8.1/cc1d @@ -78,16 +79,19 @@ package_gdc() package_libgphobos-devel() { + description="Standard library for D programming language, GDC port" + depends=('gdc') + # druntime install -D $srcdir/gdc/libphobos/libdruntime/object.di $pkgdir/usr/include/dlang/gdc/$pkgver/object.di cp -r $srcdir/gdc/libphobos/libdruntime/core $pkgdir/usr/include/dlang/gdc/$pkgver/core cp -r $srcdir/gdc/libphobos/libdruntime/gcc $pkgdir/usr/include/dlang/gdc/$pkgver/gcc # phobos - cp $srcdir/gdc/libphobos/crc32.d ${pkgdir}/usr/include/dlang/gdc/$pkgver/crc32.d - cp -r $srcdir/gdc/libphobos/std ${pkgdir}/usr/include/dlang/gdc/$pkgver/std - cp -r $srcdir/gdc/libphobos/etc ${pkgdir}/usr/include/dlang/gdc/$pkgver/etc + cp $srcdir/gdc/libphobos/src/crc32.d ${pkgdir}/usr/include/dlang/gdc/$pkgver/crc32.d + cp -r $srcdir/gdc/libphobos/src/std ${pkgdir}/usr/include/dlang/gdc/$pkgver/std + cp -r $srcdir/gdc/libphobos/src/etc ${pkgdir}/usr/include/dlang/gdc/$pkgver/etc - install -D -m644 $srcdir/gcc-build/$CHOST/libphobos/libgphobos2.a $pkgdir/usr/lib/libgphobos2.a + install -D -m644 $srcdir/gcc-build/$CHOST/libphobos/src/libgphobos2.a $pkgdir/usr/lib/libgphobos2.a install -D -m644 $srcdir/gcc-build/$CHOST/libatomic/.libs/libatomic.a $pkgdir/usr/lib/libatomic.a } diff --git a/community/gdc/folders.diff b/community/gdc/folders.diff index 738a7e6cd..05fc9991a 100644 --- a/community/gdc/folders.diff +++ b/community/gdc/folders.diff @@ -1,29 +1,30 @@ diff --git a/gcc/d/Make-lang.in b/gcc/d/Make-lang.in -index 5bdab1b..aa1122e 100644 +index 9570bf3..52addc0 100644 --- a/gcc/d/Make-lang.in +++ b/gcc/d/Make-lang.in -@@ -25,9 +25,9 @@ D_TARGET_INSTALL_NAME = $(target_alias)-$(shell echo gdc|sed '$(program_transfor +@@ -25,10 +25,10 @@ D_TARGET_INSTALL_NAME = $(target_alias)-$(shell echo gdc|sed '$(program_transfor # This should be configured ifeq ($(host), $(target)) -- gcc_d_include_dir = $(prefix)/include/d/$(version) -+ gcc_d_include_dir = $(prefix)/include/dlang/gdc/$(version) +- 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.in b/libphobos/configure.in -index f6b3660..7e88b23 100644 ---- a/libphobos/configure.in -+++ b/libphobos/configure.in -@@ -232,9 +232,9 @@ dnl (# Default case for install directory for include files.) and on +diff --git a/libphobos/configure.ac b/libphobos/configure.ac +index dfb8fec..0b88ff4 100644 +--- a/libphobos/configure.ac ++++ b/libphobos/configure.ac +@@ -220,9 +220,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 - 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 ++ 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} |