From 6a9b047ce1d325e58bdfdd50c6f9ddbc64783362 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 8 Nov 2017 13:16:07 +0100 Subject: [PATCH] dmd: update to 2.077.0. Enable PIC support. --- srcpkgs/dmd/files/dmd.conf | 2 +- srcpkgs/dmd/template | 23 ++++++++++++++++------- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/srcpkgs/dmd/files/dmd.conf b/srcpkgs/dmd/files/dmd.conf index bab93c17a0f..e8d42d10620 100644 --- a/srcpkgs/dmd/files/dmd.conf +++ b/srcpkgs/dmd/files/dmd.conf @@ -1,2 +1,2 @@ [Environment] -DFLAGS=-I/usr/include/d -I/usr/include/d/druntime/import -L-L/usr/lib -L-L/usr/lib -L--no-warn-search-mismatch -L--export-dynamic +DFLAGS=-I/usr/include/d -I/usr/include/d/druntime/import -L-L/usr/lib -L-L/usr/lib -L--no-warn-search-mismatch -L--export-dynamic -fPIC diff --git a/srcpkgs/dmd/template b/srcpkgs/dmd/template index 3e5b2ae7e55..050b34acacb 100644 --- a/srcpkgs/dmd/template +++ b/srcpkgs/dmd/template @@ -1,14 +1,17 @@ # Template file for 'dmd' pkgname=dmd -version=2.075.0 +version=2.077.0 revision=1 wrksrc="dmd2" short_desc="The Digital Mars D compiler" maintainer="Juan RP " homepage="http://www.digitalmars.com/d/2.0/" license="Boost Software License 1.0" -distfiles="http://downloads.dlang.org/releases/2.x/${version}/dmd.${version}.linux.tar.xz" -checksum=3f9cc1e3a467b4917c045f179f5eb9eaf7d5f350e8cfe84ea3496fe29f18fb5e +distfiles="http://downloads.dlang.org/releases/2.x/${version}/dmd.${version}.linux.tar.xz + https://raw.githubusercontent.com/dlang/dmd/5f3bdcde7a870509a3e2f1af48909c62bf8a18e7/config.sh" +skip_extraction="config.sh" +checksum="54471d7c5fdb73dd38cd8ab1d8ac4cb6b7aca0d0d18e7a9f38dcafcb242732f4 + 778834ad25225c6656565b3c66437543ed40066b9e40fde657c4d632fd4e391c" if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then _archbits=64 @@ -23,6 +26,9 @@ hostmakedepends="curl" depends="libphobos>=${version} gcc" do_build() { + cp ${XBPS_SRCDISTDIR}/${pkgname}-${version}/config.sh src + chmod +x src/config.sh + cd src # missing file in archive for some reason? @@ -30,13 +36,16 @@ do_build() { cp ${FILESDIR}/default_ddoc_theme.ddoc res cd dmd - make ${makejobs} -f posix.mak MODEL=${_archbits} AUTO_BOOTSTRAP=1 +ls + mkdir src + cp osmodel.mak src + make ${makejobs} -f posix.mak MODEL=${_archbits} AUTO_BOOTSTRAP=1 PIC=1 cd ../druntime - make ${makejobs} -f posix.mak MODEL=${_archbits} DMD=../dmd/dmd + make ${makejobs} -f posix.mak MODEL=${_archbits} DMD=../dmd/dmd PIC=1 cd ../phobos - make ${makejobs} -f posix.mak MODEL=${_archbits} DMD=../dmd/dmd + make ${makejobs} -f posix.mak MODEL=${_archbits} DMD=../dmd/dmd PUC=1 } do_install() { @@ -52,7 +61,7 @@ do_install() { find ${DESTDIR}/usr/share/d/samples -type f | xargs chmod 0644 - for f in ddemangle dman dumpobj obj2asm rdmd; do + for f in ddemangle dumpobj obj2asm rdmd; do vbin linux/bin${_archbits}/${f} done }