[arch-commits] Commit in gdc/repos/community-x86_64 (PKGBUILD PKGBUILD paths.diff)
Filipe Laíns
ffy00 at archlinux.org
Wed Aug 29 22:35:29 UTC 2018
Date: Wednesday, August 29, 2018 @ 22:35:29
Author: ffy00
Revision: 375392
archrelease: copy trunk to community-x86_64
Added:
gdc/repos/community-x86_64/PKGBUILD
(from rev 375391, gdc/trunk/PKGBUILD)
gdc/repos/community-x86_64/paths.diff
(from rev 375391, gdc/trunk/paths.diff)
Deleted:
gdc/repos/community-x86_64/PKGBUILD
------------+
PKGBUILD | 281 +++++++++++++++++++++++++++++------------------------------
paths.diff | 39 ++++++++
2 files changed, 181 insertions(+), 139 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-08-29 22:35:15 UTC (rev 375391)
+++ PKGBUILD 2018-08-29 22:35:29 UTC (rev 375392)
@@ -1,139 +0,0 @@
-# $Id$
-# Maintainer: Filipe Laíns (FFY00) <lains at archlinux.org>
-# Contributor: Daniel Kozak (kozzi) <kozzi11 at gmail.com>
-# Contributor: Mihails Strasuns <public at dicebot.lv>
-# Contributor: Moritz Maxeiner <moritz at ucworks.org>
-# Contributor: Jerome Berger <jeberger at free.fr>
-# Contributor: Jesus Alvarez <jeezusjr at gmail.com>
-# Contributor: Allan McRae <allan at archlinux.org>
-# Contributor: Elijah Stone <elronnd at elronnd.net>
-
-pkgbase=gdc
-pkgname=('gdc' 'libgphobos')
-pkgver=8.2.0+2.068.2
-_branch=gdc-8-stable # Change here! pkgver/_gccver/_d_ver will be automatically updated.
-_islver=0.19 # Change here!
-_gccver=$(curl https://raw.githubusercontent.com/D-Programming-GDC/GDC/$_branch/gcc.version)
-_d_ver=''
-pkgrel=1
-arch=('x86_64')
-license=('GPL3')
-url="https://github.com/D-Programming-GDC/GDC"
-pkgdesc="GCC based D compiler"
-groups=('dlang' 'dlang-dmd')
-makedepends=('git')
-source=("ftp://gcc.gnu.org/pub/gcc/snapshots/${_gccver#gcc-}/$_gccver.tar.xz"
- "http://isl.gforge.inria.fr/isl-$_islver.tar.bz2"
- 'gdc::git+https://github.com/D-Programming-GDC/GDC.git'
- 'git+https://github.com/D-Programming-GDC/GDMD.git'
- 'paths.diff')
-sha512sums=('64898a165f67e136d802a92e7633bf1b06c85266027e52127ea025bf5fc2291b5e858288aac0bdba246e6cdf7c6ec88bc8e0e7f3f6f1985f4297710cafde56ed'
- '08f4db964d9e02ec8aa9779378ed76e0ddf1d56f81f87664dbf787555ce496cdc87e836f8a51ae137f45e648c604870cce07ee45919eafb549e404afb8f27083'
- 'SKIP'
- 'SKIP'
- '841504e9dffe718f7e5a5fbbf03299f2b51acd783d47f99894aa5d411abcc56aedfffd4b16595e3a9446f2206f9eb29cb01e235e82c211796cd24dc23c02b578')
-
-pkgver() {
- echo "$(cat gdc/gcc.version | sed -e 's|gcc-||' -e 's|-.*||')$_d_ver"
-}
-
-prepare() {
- # Setup paths
- ln -sf "$srcdir"/$_gccver "$srcdir"/gcc
- ln -sf "$srcdir"/isl-$_islver "$srcdir"/gcc/isl
-
- # Setup gcc
- cd "$srcdir"/gcc
-
- sed -i 's|\./fixinc\.sh|-c true|' gcc/Makefile.in # Do not run fixincludes
- sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" {libiberty,gcc}/configure # hack! - some configure tests for header files using "$CPP $CPPFLAGS"
-
- # Seup gdc
- cd "$srcdir"/gdc
-
- git checkout $_branch
- git apply "$srcdir"/paths.diff
- ./setup-gcc.sh ../gcc
-
- mkdir "$srcdir"/gcc-build
-
- if [ -f gcc/d/verstr.h ]; then
- _d_ver="+$(cat gcc/d/verstr.h | sed 's|\"||g')"
- elif [ -f gcc/d/VERSION ]; then
- _d_ver="+$(cat gcc/d/VERSION | sed 's|\"||g')"
- fi
-}
-
-build() {
- cd "$srcdir"/gcc-build
-
- # using -pipe causes spurious test-suite failures
- # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=48565
- export CFLAGS="${CFLAGS/-pipe/} -O2"
- export CXXFLAGS="${CXXFLAGS/-pipe/} -O2"
-
- "$srcdir"/gcc/configure --prefix=/usr \
- --libdir=/usr/lib \
- --libexecdir=/usr/lib \
- --mandir=/usr/share/man \
- --infodir=/usr/share/info \
- --enable-languages=d \
- --enable-shared \
- --enable-static \
- --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 \
- --enable-default-pie \
- --enable-default-ssp \
- --enable-cet=auto \
- --with-bugurl=https://bugs.archlinux.org/ \
- --with-pkgversion="GDC ${pkgver%+*} based on D v$_d_ver built with ISL $_isl for Arch Linux" \
- gdc_include_dir=/usr/include/dlang/gdc
-
- #--enable-gold \
-
-
- make
-}
-
-package_gdc() {
- depends=('gcc' 'perl' 'binutils' 'libgphobos')
- provides=("d-compiler=${pkgver#*+}")
- pkgdesc="Compiler for D programming language which uses gcc backend"
-
- _libdir=usr/lib/gcc/$CHOST/${pkgver%+*}
-
- # Binaries
- install -Dm 755 gcc-build/gcc/gdc "$pkgdir"/usr/bin/gdc
- install -Dm 755 gcc-build/gcc/cc1d "$pkgdir"/$_libdir/cc1d
- install -Dm 755 GDMD/dmd-script "$pkgdir"/usr/bin/gdmd
-
- # Doc
- install -Dm 644 "$srcdir"/GDMD/dmd-script.1 "$pkgdir"/usr/share/man/man1/gdmd.1
-}
-
-
-package_libgphobos() {
- pkgdesc="Standard library for D programming language, GDC port"
- provides=('d-runtime' 'd-stdlib')
- options=('staticlibs')
-
- cd "$srcdir"/gcc-build
- make -C $CHOST/libphobos DESTDIR="$pkgdir" install
-}
Copied: gdc/repos/community-x86_64/PKGBUILD (from rev 375391, gdc/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-08-29 22:35:29 UTC (rev 375392)
@@ -0,0 +1,142 @@
+# Maintainer: Filipe Laíns (FFY00) <lains at archlinux.org>
+# Contributor: Daniel Kozak (kozzi) <kozzi11 at gmail.com>
+# Contributor: Mihails Strasuns <public at dicebot.lv>
+# Contributor: Moritz Maxeiner <moritz at ucworks.org>
+# Contributor: Jerome Berger <jeberger at free.fr>
+# Contributor: Jesus Alvarez <jeezusjr at gmail.com>
+# Contributor: Allan McRae <allan at archlinux.org>
+# Contributor: Elijah Stone <elronnd at elronnd.net>
+
+pkgbase=gdc
+pkgname=('gdc' 'libgphobos')
+pkgver=8.2.0+2.068.2
+_branch=gdc-8-stable # Change here! pkgver/_gccver/_d_ver will be automatically updated.
+_islver=0.19 # Change here!
+_gccver=$(curl https://raw.githubusercontent.com/D-Programming-GDC/GDC/$_branch/gcc.version)
+_d_ver=''
+pkgrel=2
+arch=('x86_64')
+license=('GPL3')
+url="https://github.com/D-Programming-GDC/GDC"
+pkgdesc="GCC based D compiler"
+groups=('dlang')
+makedepends=('git')
+source=("ftp://gcc.gnu.org/pub/gcc/snapshots/${_gccver#gcc-}/$_gccver.tar.xz"
+ "http://isl.gforge.inria.fr/isl-$_islver.tar.bz2"
+ 'gdc::git+https://github.com/D-Programming-GDC/GDC.git'
+ 'git+https://github.com/D-Programming-GDC/GDMD.git'
+ 'paths.diff')
+sha512sums=('64898a165f67e136d802a92e7633bf1b06c85266027e52127ea025bf5fc2291b5e858288aac0bdba246e6cdf7c6ec88bc8e0e7f3f6f1985f4297710cafde56ed'
+ '08f4db964d9e02ec8aa9779378ed76e0ddf1d56f81f87664dbf787555ce496cdc87e836f8a51ae137f45e648c604870cce07ee45919eafb549e404afb8f27083'
+ 'SKIP'
+ 'SKIP'
+ '841504e9dffe718f7e5a5fbbf03299f2b51acd783d47f99894aa5d411abcc56aedfffd4b16595e3a9446f2206f9eb29cb01e235e82c211796cd24dc23c02b578')
+
+pkgver() {
+ echo "$(cat gdc/gcc.version | sed -e 's|gcc-||' -e 's|-.*||')$_d_ver"
+}
+
+prepare() {
+ # Setup paths
+ ln -sf "$srcdir"/$_gccver "$srcdir"/gcc
+ ln -sf "$srcdir"/isl-$_islver "$srcdir"/gcc/isl
+
+ # Setup gcc
+ cd "$srcdir"/gcc
+
+ sed -i 's|\./fixinc\.sh|-c true|' gcc/Makefile.in # Do not run fixincludes
+ sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" {libiberty,gcc}/configure # hack! - some configure tests for header files using "$CPP $CPPFLAGS"
+
+ # Seup gdc
+ cd "$srcdir"/gdc
+
+ git checkout $_branch
+ git apply "$srcdir"/paths.diff
+ ./setup-gcc.sh ../gcc
+
+ mkdir "$srcdir"/gcc-build
+
+ if [ -f gcc/d/verstr.h ]; then
+ _d_ver="+$(cat gcc/d/verstr.h | sed 's|\"||g')"
+ elif [ -f gcc/d/VERSION ]; then
+ _d_ver="+$(cat gcc/d/VERSION | sed 's|\"||g')"
+ fi
+}
+
+build() {
+ cd "$srcdir"/gcc-build
+
+ # using -pipe causes spurious test-suite failures
+ # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=48565
+ export CFLAGS="${CFLAGS/-pipe/} -O2"
+ export CXXFLAGS="${CXXFLAGS/-pipe/} -O2"
+
+ "$srcdir"/gcc/configure --prefix=/usr \
+ --libdir=/usr/lib \
+ --libexecdir=/usr/lib \
+ --mandir=/usr/share/man \
+ --infodir=/usr/share/info \
+ --enable-languages=d \
+ --enable-shared \
+ --enable-static \
+ --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-plugin \
+ --enable-install-libiberty \
+ --with-linker-hash-style=gnu \
+ --enable-gnu-indirect-function \
+ --disable-multilib \
+ --disable-werror \
+ --disable-bootstrap \
+ --enable-default-pie \
+ --enable-default-ssp \
+ --with-bugurl=https://bugs.archlinux.org/ \
+ --with-pkgversion="GDC ${pkgver%+*} based on D v$_d_ver built with ISL $_isl for Arch Linux" \
+ gdc_include_dir=/usr/include/dlang/gdc
+
+ #--enable-gold \
+
+
+ make
+}
+
+package_gdc() {
+ depends=('gcc' 'perl' 'binutils' 'libgphobos')
+ provides=("d-compiler=${pkgver#*+}")
+ pkgdesc="Compiler for D programming language which uses gcc backend"
+
+ _libdir=usr/lib/gcc/$CHOST/${pkgver%+*}
+
+ # Binaries
+ install -Dm 755 gcc-build/gcc/gdc "$pkgdir"/usr/bin/gdc
+ install -Dm 755 gcc-build/gcc/cc1d "$pkgdir"/$_libdir/cc1d
+ install -Dm 755 GDMD/dmd-script "$pkgdir"/usr/bin/gdmd
+
+ # Doc
+ install -Dm 644 "$srcdir"/GDMD/dmd-script.1 "$pkgdir"/usr/share/man/man1/gdmd.1
+}
+
+
+package_libgphobos() {
+ pkgdesc="Standard library for D programming language, GDC port"
+ provides=('d-runtime' 'd-stdlib')
+ options=('staticlibs')
+
+ cd "$srcdir"/gcc-build
+ make -C $CHOST/libphobos DESTDIR="$pkgdir" install
+
+ if [ -d "$pkgdir"/usr/lib64 ]; then
+ echo "/usr/lib64 detected - !!!"
+ mv "$pkgdir"/usr/lib64/* "$pkgdir"/usr/lib
+ rmdir "$pkgdir"/usr/lib64
+ fi
+}
Copied: gdc/repos/community-x86_64/paths.diff (from rev 375391, gdc/trunk/paths.diff)
===================================================================
--- paths.diff (rev 0)
+++ paths.diff 2018-08-29 22:35:29 UTC (rev 375392)
@@ -0,0 +1,39 @@
+diff --git a/gcc/d/d-incpath.cc b/gcc/d/d-incpath.cc
+index e6cc314c..2618f571 100644
+--- a/gcc/d/d-incpath.cc
++++ b/gcc/d/d-incpath.cc
+@@ -140,7 +140,7 @@ add_import_paths (const char *iprefix, const char *imultilib, bool stdinc)
+ path = xstrdup (p->fname);
+
+ /* Add D-specific suffix. */
+- path = concat (path, "/d", NULL);
++ path = concat (path, "/dlang/gdc", NULL);
+
+ /* Ignore duplicate entries. */
+ bool found = false;
+diff --git a/libphobos/configure b/libphobos/configure
+index 3fdd8dfd..ac6d77a5 100755
+--- a/libphobos/configure
++++ b/libphobos/configure
+@@ -14547,7 +14547,7 @@ fi
+
+
+ # Default case for install directory for D sources files.
+- gdc_include_dir='$(libdir)/gcc/${target_alias}/${gcc_version}/include/d'
++ gdc_include_dir='/usr/include/dlang/gdc/'
+
+
+
+diff --git a/libphobos/m4/druntime.m4 b/libphobos/m4/druntime.m4
+index 93f01efc..6049eaf9 100644
+--- a/libphobos/m4/druntime.m4
++++ b/libphobos/m4/druntime.m4
+@@ -97,7 +97,7 @@ AC_DEFUN([DRUNTIME_INSTALL_DIRECTORIES],
+ AC_SUBST(toolexeclibdir)
+
+ # Default case for install directory for D sources files.
+- gdc_include_dir='$(libdir)/gcc/${target_alias}/${gcc_version}/include/d'
++ gdc_include_dir='/usr/include/dlang/gdc/'
+ AC_SUBST(gdc_include_dir)
+ ])
+
More information about the arch-commits
mailing list