diff options
Diffstat (limited to 'community/gdc')
| -rw-r--r-- | community/gdc/PKGBUILD | 21 | ||||
| -rw-r--r-- | community/gdc/folders.diff | 30 |
2 files changed, 35 insertions, 16 deletions
diff --git a/community/gdc/PKGBUILD b/community/gdc/PKGBUILD index 9d3fbad0a..01aeea0fe 100644 --- a/community/gdc/PKGBUILD +++ b/community/gdc/PKGBUILD @@ -5,7 +5,7 @@ pkgname=('gdc' 'libgphobos-devel') pkgver=4.8.2 -pkgrel=4 +pkgrel=5 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' - '805d1130394e3ff18ae7043e111fe2ea045a7da6f290d298a670f9e2c35ba533') + '82f1ba0825164a74660bd5008d8f3acae1bacc3271c86475efc1601fe0da73c4') groups=('dlang' 'dlang-gdc') conflicts=('gdc1-bin' 'gdc1-hg' 'gdc-git') @@ -86,20 +86,21 @@ package_libgphobos-devel() 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 + 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/$pkgver/gcc - rm $pkgdir/usr/include/dlang/gdc/$pkgver/gcc/libbacktrace.d.in + 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/$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 + 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 } diff --git a/community/gdc/folders.diff b/community/gdc/folders.diff index cf89e5d3d..625d844b0 100644 --- a/community/gdc/folders.diff +++ b/community/gdc/folders.diff @@ -1,16 +1,34 @@ diff --git a/libphobos/configure.ac b/libphobos/configure.ac -index 69dfc35..89b8136 100644 +index 51d9b86..6ff04f1 100644 --- a/libphobos/configure.ac +++ b/libphobos/configure.ac -@@ -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}" != "${target}"; then +@@ -239,9 +239,9 @@ else + fi + + if test "${gdc_host}" != "${gdc_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 else - gdc_include_dir='${prefix}'/include/d/${d_gcc_ver} -+ gdc_include_dir='${prefix}'/include/dlang/gcc ++ gdc_include_dir='${prefix}'/include/dlang/gdc fi AC_SUBST(gdc_include_dir) AC_ARG_WITH([cross-host], + +diff --git a/gcc/d/Make-lang.in b/gcc/d/Make-lang.in +index 17e5c45..8a656b1 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 + 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 + + |