Date: Wednesday, October 2, 2013 @ 15:36:04 Author: dicebot Revision: 97978
archrelease: copy trunk to community-i686, community-x86_64 Added: gdc/repos/community-i686/PKGBUILD (from rev 97977, gdc/trunk/PKGBUILD) gdc/repos/community-i686/folders.diff (from rev 97977, gdc/trunk/folders.diff) gdc/repos/community-x86_64/PKGBUILD (from rev 97977, gdc/trunk/PKGBUILD) gdc/repos/community-x86_64/folders.diff (from rev 97977, gdc/trunk/folders.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 | 196 ++++++++++++++++++++++++++++++++++++++++ /folders.diff | 66 +++++++++++++ community-i686/PKGBUILD | 96 ------------------- community-i686/folders.diff | 33 ------ community-x86_64/PKGBUILD | 96 ------------------- community-x86_64/folders.diff | 33 ------ 6 files changed, 262 insertions(+), 258 deletions(-) Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2013-10-02 13:34:59 UTC (rev 97977) +++ community-i686/PKGBUILD 2013-10-02 13:36:04 UTC (rev 97978) @@ -1,96 +0,0 @@ -# Maintainer: Mihails Strasuns <pub...@dicebot.lv> -# Contributor: Moritz Maxeiner <mor...@ucworks.org> -# Contributor: Jerome Berger <jeber...@free.fr> -# Contributor: Jesus Alvarez <jeezu...@gmail.com> - -pkgname=('gdc' 'libgphobos-devel') -pkgver=4.8.1 -pkgrel=5 -arch=('i686' 'x86_64') -url="https://github.com/D-Programming-GDC/GDC" -license=('GPL') -makedepends=('binutils>=2.23' 'git' 'gcc' 'make' 'perl' 'cloog' 'automake') -options=('!libtool' '!emptydirs' '!buildflags') -_snapshot=4.8-20130725 -source=(ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2 - gdc::git://github.com/D-Programming-GDC/GDC.git#branch=gdc-4.8 - folders.diff) -sha256sums=('e4e2202b15f8ba323f88c65de0e4190b0630a4b2e70b0653526b31e946877ead' - 'SKIP' - '88a1f1315633e9dde18637ff5239898abd94dca9a39fdb211a66555dd84c2fec') - -groups=('dlang' 'dlang-gdc') -conflicts=('gdc1-bin' 'gdc1-hg' 'gdc-git') - -prepare() -{ - cd $srcdir/gcc-$_snapshot - - # Do not run fixincludes - sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in - - 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-$_snapshot - - mkdir $srcdir/gcc-build -} - - -build() -{ - cd ${srcdir}/gcc-build - - ${srcdir}/gcc-$_snapshot/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 \ - --enable-gnu-unique-object --enable-linker-build-id \ - --enable-cloog-backend=isl --disable-cloog-version-check \ - --enable-lto --enable-gold --enable-ld=default \ - --enable-plugin --with-plugin-ld=ld.gold \ - --with-linker-hash-style=gnu --disable-install-libiberty \ - --disable-multilib --disable-libssp --disable-werror \ - --disable-nls --disable-bootstrap \ - --disable-libgomp --disable-libmudflap --disable-libquadmath - - make -} - -package_gdc() -{ - depends=('gcc' 'binutils') - optdepends=('libgphobos-devel: D standard library, GDC version') - pkgdesc="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 -} - -package_libgphobos-devel() -{ - pkgdesc="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/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/src/libgphobos2.a $pkgdir/usr/lib/libgphobos2.a -} Copied: gdc/repos/community-i686/PKGBUILD (from rev 97977, gdc/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2013-10-02 13:36:04 UTC (rev 97978) @@ -0,0 +1,98 @@ +# Maintainer: Mihails Strasuns <pub...@dicebot.lv> +# Contributor: Moritz Maxeiner <mor...@ucworks.org> +# Contributor: Jerome Berger <jeber...@free.fr> +# Contributor: Jesus Alvarez <jeezu...@gmail.com> + +pkgname=('gdc' 'libgphobos-devel') +pkgver=4.8.1 +pkgrel=6 +arch=('i686' 'x86_64') +url="https://github.com/D-Programming-GDC/GDC" +license=('GPL') +makedepends=('binutils>=2.23' 'git' 'gcc' 'make' 'perl' 'cloog' 'automake') +options=('!libtool' '!emptydirs' '!buildflags') +_snapshot=4.8-20130725 +source=(ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2 + gdc::git://github.com/D-Programming-GDC/GDC.git#branch=gdc-4.8 + folders.diff) +sha256sums=('e4e2202b15f8ba323f88c65de0e4190b0630a4b2e70b0653526b31e946877ead' + 'SKIP' + '88a1f1315633e9dde18637ff5239898abd94dca9a39fdb211a66555dd84c2fec') + +groups=('dlang' 'dlang-gdc') +conflicts=('gdc1-bin' 'gdc1-hg' 'gdc-git') + +prepare() +{ + cd $srcdir/gcc-$_snapshot + + # Do not run fixincludes + sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in + + 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-$_snapshot + + mkdir $srcdir/gcc-build +} + + +build() +{ + cd ${srcdir}/gcc-build + + ${srcdir}/gcc-$_snapshot/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 \ + --enable-gnu-unique-object --enable-linker-build-id \ + --enable-cloog-backend=isl --disable-cloog-version-check \ + --enable-lto --enable-gold --enable-ld=default \ + --enable-plugin --with-plugin-ld=ld.gold \ + --with-linker-hash-style=gnu --disable-install-libiberty \ + --disable-multilib --disable-libssp --disable-werror \ + --disable-nls --disable-bootstrap \ + --disable-libgomp --disable-libmudflap --disable-libquadmath + + make +} + +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" + + 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 +} + +package_libgphobos-devel() +{ + pkgdesc="Standard library for D programming language, GDC port" + provides=("d-runtime" "d-stdlib") + 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/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/src/libgphobos2.a $pkgdir/usr/lib/libgphobos2.a +} Deleted: community-i686/folders.diff =================================================================== --- community-i686/folders.diff 2013-10-02 13:34:59 UTC (rev 97977) +++ community-i686/folders.diff 2013-10-02 13:36:04 UTC (rev 97978) @@ -1,33 +0,0 @@ -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 ---- 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/ - else -- gdc_include_dir='${prefix}'/include/d/${d_gcc_ver} -+ gdc_include_dir='${prefix}'/include/dlang/gdc/${d_gcc_ver} - fi - AC_SUBST(gdc_include_dir) - AC_ARG_WITH([cross-host], Copied: gdc/repos/community-i686/folders.diff (from rev 97977, gdc/trunk/folders.diff) =================================================================== --- community-i686/folders.diff (rev 0) +++ community-i686/folders.diff 2013-10-02 13:36:04 UTC (rev 97978) @@ -0,0 +1,33 @@ +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 +--- 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/ + else +- gdc_include_dir='${prefix}'/include/d/${d_gcc_ver} ++ gdc_include_dir='${prefix}'/include/dlang/gdc/${d_gcc_ver} + fi + AC_SUBST(gdc_include_dir) + AC_ARG_WITH([cross-host], Deleted: community-x86_64/PKGBUILD =================================================================== --- community-x86_64/PKGBUILD 2013-10-02 13:34:59 UTC (rev 97977) +++ community-x86_64/PKGBUILD 2013-10-02 13:36:04 UTC (rev 97978) @@ -1,96 +0,0 @@ -# Maintainer: Mihails Strasuns <pub...@dicebot.lv> -# Contributor: Moritz Maxeiner <mor...@ucworks.org> -# Contributor: Jerome Berger <jeber...@free.fr> -# Contributor: Jesus Alvarez <jeezu...@gmail.com> - -pkgname=('gdc' 'libgphobos-devel') -pkgver=4.8.1 -pkgrel=5 -arch=('i686' 'x86_64') -url="https://github.com/D-Programming-GDC/GDC" -license=('GPL') -makedepends=('binutils>=2.23' 'git' 'gcc' 'make' 'perl' 'cloog' 'automake') -options=('!libtool' '!emptydirs' '!buildflags') -_snapshot=4.8-20130725 -source=(ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2 - gdc::git://github.com/D-Programming-GDC/GDC.git#branch=gdc-4.8 - folders.diff) -sha256sums=('e4e2202b15f8ba323f88c65de0e4190b0630a4b2e70b0653526b31e946877ead' - 'SKIP' - '88a1f1315633e9dde18637ff5239898abd94dca9a39fdb211a66555dd84c2fec') - -groups=('dlang' 'dlang-gdc') -conflicts=('gdc1-bin' 'gdc1-hg' 'gdc-git') - -prepare() -{ - cd $srcdir/gcc-$_snapshot - - # Do not run fixincludes - sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in - - 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-$_snapshot - - mkdir $srcdir/gcc-build -} - - -build() -{ - cd ${srcdir}/gcc-build - - ${srcdir}/gcc-$_snapshot/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 \ - --enable-gnu-unique-object --enable-linker-build-id \ - --enable-cloog-backend=isl --disable-cloog-version-check \ - --enable-lto --enable-gold --enable-ld=default \ - --enable-plugin --with-plugin-ld=ld.gold \ - --with-linker-hash-style=gnu --disable-install-libiberty \ - --disable-multilib --disable-libssp --disable-werror \ - --disable-nls --disable-bootstrap \ - --disable-libgomp --disable-libmudflap --disable-libquadmath - - make -} - -package_gdc() -{ - depends=('gcc' 'binutils') - optdepends=('libgphobos-devel: D standard library, GDC version') - pkgdesc="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 -} - -package_libgphobos-devel() -{ - pkgdesc="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/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/src/libgphobos2.a $pkgdir/usr/lib/libgphobos2.a -} Copied: gdc/repos/community-x86_64/PKGBUILD (from rev 97977, gdc/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2013-10-02 13:36:04 UTC (rev 97978) @@ -0,0 +1,98 @@ +# Maintainer: Mihails Strasuns <pub...@dicebot.lv> +# Contributor: Moritz Maxeiner <mor...@ucworks.org> +# Contributor: Jerome Berger <jeber...@free.fr> +# Contributor: Jesus Alvarez <jeezu...@gmail.com> + +pkgname=('gdc' 'libgphobos-devel') +pkgver=4.8.1 +pkgrel=6 +arch=('i686' 'x86_64') +url="https://github.com/D-Programming-GDC/GDC" +license=('GPL') +makedepends=('binutils>=2.23' 'git' 'gcc' 'make' 'perl' 'cloog' 'automake') +options=('!libtool' '!emptydirs' '!buildflags') +_snapshot=4.8-20130725 +source=(ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2 + gdc::git://github.com/D-Programming-GDC/GDC.git#branch=gdc-4.8 + folders.diff) +sha256sums=('e4e2202b15f8ba323f88c65de0e4190b0630a4b2e70b0653526b31e946877ead' + 'SKIP' + '88a1f1315633e9dde18637ff5239898abd94dca9a39fdb211a66555dd84c2fec') + +groups=('dlang' 'dlang-gdc') +conflicts=('gdc1-bin' 'gdc1-hg' 'gdc-git') + +prepare() +{ + cd $srcdir/gcc-$_snapshot + + # Do not run fixincludes + sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in + + 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-$_snapshot + + mkdir $srcdir/gcc-build +} + + +build() +{ + cd ${srcdir}/gcc-build + + ${srcdir}/gcc-$_snapshot/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 \ + --enable-gnu-unique-object --enable-linker-build-id \ + --enable-cloog-backend=isl --disable-cloog-version-check \ + --enable-lto --enable-gold --enable-ld=default \ + --enable-plugin --with-plugin-ld=ld.gold \ + --with-linker-hash-style=gnu --disable-install-libiberty \ + --disable-multilib --disable-libssp --disable-werror \ + --disable-nls --disable-bootstrap \ + --disable-libgomp --disable-libmudflap --disable-libquadmath + + make +} + +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" + + 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 +} + +package_libgphobos-devel() +{ + pkgdesc="Standard library for D programming language, GDC port" + provides=("d-runtime" "d-stdlib") + 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/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/src/libgphobos2.a $pkgdir/usr/lib/libgphobos2.a +} Deleted: community-x86_64/folders.diff =================================================================== --- community-x86_64/folders.diff 2013-10-02 13:34:59 UTC (rev 97977) +++ community-x86_64/folders.diff 2013-10-02 13:36:04 UTC (rev 97978) @@ -1,33 +0,0 @@ -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 ---- 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/ - else -- gdc_include_dir='${prefix}'/include/d/${d_gcc_ver} -+ gdc_include_dir='${prefix}'/include/dlang/gdc/${d_gcc_ver} - fi - AC_SUBST(gdc_include_dir) - AC_ARG_WITH([cross-host], Copied: gdc/repos/community-x86_64/folders.diff (from rev 97977, gdc/trunk/folders.diff) =================================================================== --- community-x86_64/folders.diff (rev 0) +++ community-x86_64/folders.diff 2013-10-02 13:36:04 UTC (rev 97978) @@ -0,0 +1,33 @@ +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 +--- 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/ + else +- gdc_include_dir='${prefix}'/include/d/${d_gcc_ver} ++ gdc_include_dir='${prefix}'/include/dlang/gdc/${d_gcc_ver} + fi + AC_SUBST(gdc_include_dir) + AC_ARG_WITH([cross-host],