[arch-commits] Commit in gdc/trunk (PKGBUILD folders.diff paths.diff system_zlib.diff)
Date: Monday, December 26, 2016 @ 22:49:05 Author: dicebot Revision: 202871 upgpkg: gdc 6.2.1-1 gdc based on gcc 6.2.1 and D fe 2.068.2 Added: gdc/trunk/paths.diff Modified: gdc/trunk/PKGBUILD Deleted: gdc/trunk/folders.diff gdc/trunk/system_zlib.diff --+ PKGBUILD | 143 - folders.diff | 39 -- paths.diff | 39 ++ system_zlib.diff | 49 -- 4 files changed, 115 insertions(+), 155 deletions(-) Modified: PKGBUILD === --- PKGBUILD2016-12-26 22:42:29 UTC (rev 202870) +++ PKGBUILD2016-12-26 22:49:05 UTC (rev 202871) @@ -1,3 +1,4 @@ +# $Id$ # Maintainer: Mihails Strasuns# Contributor: Moritz Maxeiner # Contributor: Jerome Berger @@ -4,26 +5,22 @@ # Contributor: Jesus Alvarez # Contributor: Allan McRae -pkgname=('gdc' 'libgphobos-devel') -pkgver=6.1.1 +pkgname=('gdc' 'libgphobos-devel' 'libgphobos') +pkgver=6.2.1 pkgrel=1 -_pkgver=6 _islver=0.16.1 -_commit=80f78834 +_gcc_commit=c2103c1 arch=('i686' 'x86_64') license=('GPL') url="https://github.com/D-Programming-GDC/GDC; -makedepends=('binutils>=2.26' 'git' 'gcc' 'make' 'perl' 'automake') -options=('!emptydirs' '!buildflags') -groups=('dlang' 'dlang-gdc') -conflicts=('gdc1-bin' 'gdc1-hg' 'gdc-git') +makedepends=('binutils>=2.26' 'git') + source=( -git://gcc.gnu.org/git/gcc.git#commit=${_commit} -http://isl.gforge.inria.fr/isl-${_islver}.tar.bz2 - gdc::git://github.com/D-Programming-GDC/GDC.git#commit=73a7fb5d4e75c0e1a4ee7cdb67d080cceb8ff955 +git://gcc.gnu.org/git/gcc.git#commit=$_gcc_commit +http://isl.gforge.inria.fr/isl-$_islver.tar.bz2 +gdc::git://github.com/D-Programming-GDC/GDC.git#tag=v2.068.2_gcc6 git+https://github.com/D-Programming-GDC/GDMD.git -folders.diff -system_zlib.diff +paths.diff ) sha256sums=( 'SKIP' @@ -30,60 +27,73 @@ '412538bb65c799ac98e17e8cfcdacbb257a57362acfaaff254b0fcae970126d2' 'SKIP' 'SKIP' -'ea5c80a28026393bd4627485602660a4a01d9fbc65299e95e768013e197bad20' -'3c818788b5435794c37e5d3d131fe74c813368a3b7260f85fb2cd725308e4889' +'e04cea391007ebab5d9b0ff33179c1fded0afcf43059b811290472ea5361' ) -# gcc-6.0 forces a changed triplet - need to address in pacman/devtools -[[ $CARCH == "x86_64" ]] && CHOST=x86_64-pc-linux-gnu +_libdir="usr/lib/gcc/$CHOST/$pkgver" prepare() { - cd ${srcdir}/gcc +cd $srcdir/gcc - # link isl for in-tree build - ln -sf ../isl-${_islver} isl +# link isl for in-tree build +ln -s ../isl-$_islver isl - # Do not run fixincludes - sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in +# Do not run fixincludes +sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in - # Arch Linux installs x86_64 libraries /lib - [[ $CARCH == "x86_64" ]] && sed -i '/m64=/s/lib64/lib/' gcc/config/i386/t-linux64 +# Arch Linux installs x86_64 libraries /lib +[[ $CARCH == "x86_64" ]] && sed -i '/m64=/s/lib64/lib/' gcc/config/i386/t-linux64 - # hack! - some configure tests for header files using "$CPP $CPPFLAGS" - sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" {libiberty,gcc}/configure +# 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 +# GDC setup +cd $srcdir/gdc +git apply $srcdir/paths.diff +./setup-gcc.sh ../gcc - mkdir ${srcdir}/gcc-build +mkdir $srcdir/gcc-build } build() { - cd ${srcdir}/gcc-build +cd $srcdir/gcc-build - # using -pipe causes spurious test-suite failures - # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=48565 - CFLAGS=${CFLAGS/-pipe/} - CXXFLAGS=${CXXFLAGS/-pipe/} +# using -pipe causes spurious test-suite failures +# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=48565 +CFLAGS=${CFLAGS/-pipe/} +CXXFLAGS=${CXXFLAGS/-pipe/} - ${srcdir}/gcc/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 --enable-libmpx \ - --with-system-zlib --with-isl --enable-__cxa_atexit \ - --disable-libunwind-exceptions --enable-clocale=gnu \ - --disable-libstdcxx-pch --disable-libssp \ - --enable-gnu-unique-object --enable-linker-build-id \ - --enable-lto --enable-plugin --enable-install-libiberty \ - --with-linker-hash-style=gnu --enable-gnu-indirect-function \ - --disable-multilib --disable-werror \ - --enable-checking=release +
[arch-commits] Commit in gdc/trunk (PKGBUILD folders.diff)
Date: Friday, April 24, 2015 @ 19:22:12 Author: dicebot Revision: 132127 upgpkg: gdc 4.9.2-2 GDC D frontend - 2.066.1 Modified: gdc/trunk/PKGBUILD gdc/trunk/folders.diff --+ PKGBUILD |8 +++ folders.diff | 61 ++--- 2 files changed, 37 insertions(+), 32 deletions(-) Modified: PKGBUILD === --- PKGBUILD2015-04-24 17:11:41 UTC (rev 132126) +++ PKGBUILD2015-04-24 17:22:12 UTC (rev 132127) @@ -5,15 +5,15 @@ pkgname=('gdc' 'libgphobos-devel') pkgver=4.9.2 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url=https://github.com/D-Programming-GDC/GDC; license=('GPL') -makedepends=('binutils=2.23' 'git' 'gcc' 'make' 'perl' 'cloog' 'automake') +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-4.9 +gdc::git://github.com/D-Programming-GDC/GDC.git#tag=v2.066.1_gcc4.9 git+https://github.com/D-Programming-GDC/GDMD.git; folders.diff ) @@ -21,7 +21,7 @@ '2020c98295856aa13fda0f2f3a4794490757fc24bcca918d52cc8b4917b972dd' 'SKIP' 'SKIP' -'82f1ba0825164a74660bd5008d8f3acae1bacc3271c86475efc1601fe0da73c4' +'ea5c80a28026393bd4627485602660a4a01d9fbc65299e95e768013e197bad20' ) groups=('dlang' 'dlang-gdc') Modified: folders.diff === --- folders.diff2015-04-24 17:11:41 UTC (rev 132126) +++ folders.diff2015-04-24 17:22:12 UTC (rev 132127) @@ -1,34 +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 51d9b86..6ff04f1 100644 +index 84492dd..947f6a8 100644 --- a/libphobos/configure.ac +++ b/libphobos/configure.ac -@@ -239,9 +239,9 @@ else - fi +@@ -167,7 +167,7 @@ AC_SUBST(phobos_toolexecdir) + AC_SUBST(phobos_toolexeclibdir) - 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/gdc - 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 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 - - + dnl Checks for header files.
[arch-commits] Commit in gdc/trunk (PKGBUILD folders.diff)
Date: Monday, January 6, 2014 @ 14:45:20 Author: dicebot Revision: 103472 upgpkg: gdc 4.8.2-5 Adjust gdc configure.ac patch to new upstream Modified: gdc/trunk/PKGBUILD gdc/trunk/folders.diff --+ PKGBUILD | 21 +++-- folders.diff | 30 -- 2 files changed, 35 insertions(+), 16 deletions(-) Modified: PKGBUILD === --- PKGBUILD2014-01-06 13:38:05 UTC (rev 103471) +++ PKGBUILD2014-01-06 13:45:20 UTC (rev 103472) @@ -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 @@ folders.diff) sha256sums=('e4e2202b15f8ba323f88c65de0e4190b0630a4b2e70b0653526b31e946877ead' 'SKIP' -'805d1130394e3ff18ae7043e111fe2ea045a7da6f290d298a670f9e2c35ba533') +'82f1ba0825164a74660bd5008d8f3acae1bacc3271c86475efc1601fe0da73c4') groups=('dlang' 'dlang-gdc') conflicts=('gdc1-bin' 'gdc1-hg' 'gdc-git') @@ -86,20 +86,21 @@ 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 } Modified: folders.diff === --- folders.diff2014-01-06 13:38:05 UTC (rev 103471) +++ folders.diff2014-01-06 13:45:20 UTC (rev 103472) @@ -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 + +
[arch-commits] Commit in gdc/trunk (PKGBUILD folders.diff)
Date: Tuesday, December 31, 2013 @ 15:19:22 Author: dicebot Revision: 103251 upgpkg: gdc 4.8.2-4 gdc upstream has been updated to 2.064.2 frontend Modified: gdc/trunk/PKGBUILD gdc/trunk/folders.diff --+ PKGBUILD |6 +++--- folders.diff | 27 +-- 2 files changed, 8 insertions(+), 25 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-12-31 13:12:55 UTC (rev 103250) +++ PKGBUILD2013-12-31 14:19:22 UTC (rev 103251) @@ -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 @@ folders.diff) sha256sums=('e4e2202b15f8ba323f88c65de0e4190b0630a4b2e70b0653526b31e946877ead' 'SKIP' -'88a1f1315633e9dde18637ff5239898abd94dca9a39fdb211a66555dd84c2fec') +'805d1130394e3ff18ae7043e111fe2ea045a7da6f290d298a670f9e2c35ba533') groups=('dlang' 'dlang-gdc') conflicts=('gdc1-bin' 'gdc1-hg' 'gdc-git') @@ -72,7 +72,7 @@ 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 Modified: folders.diff === --- folders.diff2013-12-31 13:12:55 UTC (rev 103250) +++ folders.diff2013-12-31 14:19:22 UTC (rev 103251) @@ -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],
[arch-commits] Commit in gdc/trunk (PKGBUILD folders.diff)
Date: Monday, August 26, 2013 @ 02:30:41 Author: dicebot Revision: 96342 upgpkg: gdc 4.8.1-2 Fix FS#36669 - missing description Modified: gdc/trunk/PKGBUILD gdc/trunk/folders.diff --+ PKGBUILD | 16 ++-- folders.diff | 21 +++-- 2 files changed, 21 insertions(+), 16 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-08-25 20:41:23 UTC (rev 96341) +++ PKGBUILD2013-08-26 00:30:41 UTC (rev 96342) @@ -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 @@ folders.diff) sha256sums=('e4e2202b15f8ba323f88c65de0e4190b0630a4b2e70b0653526b31e946877ead' 'SKIP' -'cd9df3c4129092f9a3ce6f608baa83e12935d7185d0ad3e273799264a21b031e') +'88a1f1315633e9dde18637ff5239898abd94dca9a39fdb211a66555dd84c2fec') groups=('dlang' 'dlang-gdc') conflicts=('gdc1-bin' 'gdc1-hg' 'gdc-git') @@ -71,6 +71,7 @@ { 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,6 +79,9 @@ 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 @@ -84,10 +88,10 @@ 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 } Modified: folders.diff === --- folders.diff2013-08-25 20:41:23 UTC (rev 96341) +++ folders.diff2013-08-26 00:30:41 UTC (rev 96342) @@ -1,13 +1,14 @@ 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 @@ -14,16 +15,16 @@ 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}