diff --git a/srcpkgs/dmd/files/musl.patch b/srcpkgs/dmd/files/musl.patch index 023b7d5eb5..f2e4538c40 100644 --- a/srcpkgs/dmd/files/musl.patch +++ b/srcpkgs/dmd/files/musl.patch @@ -1,11 +1,11 @@ --- dmd/src/dmd/mars.d +++ dmd/src/dmd/mars.d -@@ -1374,7 +1374,7 @@ void addDefaultVersionIdentifiers() - } - else static if (TARGET.Linux) - { +@@ -1101,7 +1101,7 @@ void addDefaultVersionIdentifiers(const ref Param params) + VersionCondition.addPredefinedGlobalIdent("Posix"); + VersionCondition.addPredefinedGlobalIdent("linux"); + VersionCondition.addPredefinedGlobalIdent("ELFv1"); - VersionCondition.addPredefinedGlobalIdent("CRuntime_Glibc"); + VersionCondition.addPredefinedGlobalIdent("CRuntime_Musl"); + VersionCondition.addPredefinedGlobalIdent("CppRuntime_Gcc"); } - - if (global.params.isLP64) + else if (params.isOSX) diff --git a/srcpkgs/dmd/template b/srcpkgs/dmd/template index e03b62bdc8..545a5940fb 100644 --- a/srcpkgs/dmd/template +++ b/srcpkgs/dmd/template @@ -1,11 +1,11 @@ # Template file for 'dmd' pkgname=dmd -version=2.081.1 +version=2.085.0 revision=1 create_wrksrc=yes -makedepends="dmd-bootstrap" +makedepends="dmd2.081 git" depends="libphobos>=${version} gcc" -short_desc="The Digital Mars D compiler" +short_desc="Digital Mars D compiler" maintainer="Juan RP " license="BSL-1.0" homepage="http://www.digitalmars.com/d/2.0/" @@ -14,13 +14,13 @@ distfiles=" https://github.com/dlang/druntime/archive/v${version}.tar.gz>druntime-${version}.tar.gz https://github.com/dlang/phobos/archive/v${version}.tar.gz>phobos-${version}.tar.gz http://downloads.dlang.org/releases/2.x/${version}/dmd.${version}.linux.tar.xz" -checksum="14f3aafe1c93c86646aaeb3ed7361a5fc5a24374cf25c8848c81942bfd9fae1a - 8313af32dce71f767fb0072cae699cbfe7196cf01b0ce1c5dd416a71d94f5fee - d945c6fd1be14dff5fcbf45c1e11302e12bebac56d55e4e97e48e150f2899e04 - a93f15fba1786322310492118785de759d8badf8b5a1583256fcb8486e4f74f8" +checksum="5e45e9ccf07fb0b500f63500b143f8b66dbaf3f4348d2a5250799fc2d22f8225 + b490b04afbd771a51188fd864497b5bf01b28d5a49fb06da420036fc8ea2f7d2 + c2018c8275cf83b542a9cc2c8dc99a770e9b8b89e638f8971dc9945bd0e5385e + 25d53bb87ff337f99984fcf77d4216d0b9af53ce9dfaf1c3fadf9c3959338487" conf_files="/etc/dmd.conf" provides="d-compiler-${version}_${revision}" -conflicts="dmd-bootstrap" +conflicts="dmd-bootstrap dmd2.081" nopie=yes LDFLAGS="-lpthread" @@ -50,16 +50,16 @@ do_build() { local dmd cd dmd - make ${makejobs} -f posix.mak MODEL=${_archbits} TARGET_CPU=X86 BUILD=release PIC=1 + make ${makejobs} -f posix.mak MODEL=${_archbits} TARGET_CPU=X86 ENABLE_RELEASE=1 PIC=1 dmd=${wrksrc}/dmd/generated/linux/release/$_archbits/dmd make ${makejobs} -C docs cd ../druntime - make ${makejobs} -f posix.mak MODEL=${_archbits} DMD=$dmd BUILD=release PIC=1 + make ${makejobs} -f posix.mak MODEL=${_archbits} DMD=$dmd ENABLE_RELEASE=1 PIC=1 cd ../phobos - make ${makejobs} -f posix.mak MODEL=${_archbits} DMD=$dmd BUILD=release PIC=1 + make ${makejobs} -f posix.mak MODEL=${_archbits} DMD=$dmd ENABLE_RELEASE=1 PIC=1 } do_install() {