From d8edcfa53b533afbd88da66b71a591001115436a Mon Sep 17 00:00:00 2001 From: oreo639 Date: Sat, 17 Dec 2022 18:58:59 -0800 Subject: [PATCH] dmd: update to 2.101.1. --- srcpkgs/dmd/files/musl.patch | 4 ++-- srcpkgs/dmd/template | 29 +++++++++++------------------ 2 files changed, 13 insertions(+), 20 deletions(-) diff --git a/srcpkgs/dmd/files/musl.patch b/srcpkgs/dmd/files/musl.patch index bf41a3e4961..79b7bcd7e6d 100644 --- a/srcpkgs/dmd/files/musl.patch +++ b/srcpkgs/dmd/files/musl.patch @@ -1,5 +1,5 @@ ---- dmd/src/dmd/link.d -+++ dmd/src/dmd/link.d +--- dmd/compiler/src/dmd/link.d ++++ dmd/compiler/src/dmd/link.d @@ -759,8 +759,7 @@ perror("unable to create pipe to linker"); return -1; diff --git a/srcpkgs/dmd/template b/srcpkgs/dmd/template index 0f6801ad1fe..fc75ca12b91 100644 --- a/srcpkgs/dmd/template +++ b/srcpkgs/dmd/template @@ -1,8 +1,7 @@ # Template file for 'dmd' pkgname=dmd -version=2.098.0 -revision=3 -reverts="2.100.0_1" +version=2.101.1 +revision=1 create_wrksrc=yes hostmakedepends="dmd2.091 which" makedepends="git" @@ -12,14 +11,12 @@ maintainer="streaks " license="BSL-1.0" homepage="http://www.digitalmars.com/d/2.0/" distfiles=" - https://github.com/dlang/dmd/archive/v${version}.tar.gz>dmd-${version}.tar.gz - https://github.com/dlang/druntime/archive/v${version}.tar.gz>druntime-${version}.tar.gz + https://github.com/dlang/dmd/archive/refs/tags/v${version}.tar.gz>dmd-${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="437e7abae7f747ce8a027e512d2f98f0c27badd623347141c3f6fb0834d85ad0 - f150400756c7940bc9d67a3ed7f89777e49b42a1ef2dff6f40727f83b3cea6f4 - f91c6c7f2d5683af2804a183c287bf6991b99c49692759d7844e1919ca59e974 - 1104e5e59fd47828b798d77a72be547bf086bba1d374a1855c6b5814c4db0145" +checksum="e369396dbbe4eec9311122fa24c975688b209a000bf2062a9f86b49ab2e4a7b0 + 8a275b3f46d921be87744ec80d3094421a979d6f607dbd43e88e251bbb3f503a + 58333e57ed3812077dc2f8cc8759998b3b59c9ea3dbe01571eab4b2944a84bfe" conf_files="/etc/dmd.conf" provides="d-compiler-${version}_${revision}" conflicts="dmd-bootstrap dmd2.081 dmd2.091" @@ -38,7 +35,6 @@ esac post_extract() { mv dmd-${version} dmd - mv druntime-${version} druntime mv phobos-${version} phobos } @@ -55,10 +51,7 @@ do_build() { 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 ENABLE_RELEASE=1 PIC=1 + make ${makejobs} -C compiler/docs cd ../phobos make ${makejobs} -f posix.mak MODEL=${_archbits} DMD=$dmd ENABLE_RELEASE=1 PIC=1 @@ -94,17 +87,17 @@ dmd-doc_package() { libphobos_package() { short_desc+=" - standard library" license="BSL-1.0" - conflicts="dmd-bootstrap" + conflicts="dmd-bootstrap dmd2.081 dmd2.091" pkg_install() { - vinstall ${wrksrc}/druntime/generated/linux/release/$_archbits/libdruntime.a 644 usr/lib libdruntime.a + vinstall ${wrksrc}/dmd/generated/linux/release/$_archbits/libdruntime.a 644 usr/lib libdruntime.a vinstall ${wrksrc}/phobos/generated/linux/release/$_archbits/libphobos2.a 644 usr/lib libphobos2.a vmkdir usr/include/d cp -r ${wrksrc}/phobos/{*.d,etc,std} ${PKGDESTDIR}/usr/include/d vmkdir usr/include/d/druntime - cp -r ${wrksrc}/druntime/import ${PKGDESTDIR}/usr/include/d/druntime + cp -r ${wrksrc}/dmd/druntime/import ${PKGDESTDIR}/usr/include/d/druntime - vlicense ${wrksrc}/druntime/LICENSE.txt + vlicense ${wrksrc}/dmd/LICENSE.txt } }