Date: Tuesday, January 18, 2022 @ 21:20:52 Author: wild Revision: 1110205
archrelease: copy trunk to community-x86_64 Added: dtools/repos/community-x86_64/PKGBUILD (from rev 1110204, dtools/trunk/PKGBUILD) Deleted: dtools/repos/community-x86_64/PKGBUILD dtools/repos/community-x86_64/autodetect.diff -----------------+ PKGBUILD | 96 ++++++++++++++++++++++++++---------------------------- autodetect.diff | 47 -------------------------- 2 files changed, 47 insertions(+), 96 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2022-01-18 21:20:48 UTC (rev 1110204) +++ PKGBUILD 2022-01-18 21:20:52 UTC (rev 1110205) @@ -1,49 +0,0 @@ -# Maintainer: Dan Printzell <a...@vild.io> -# Maintainer: Filipe Laíns (FFY00) <la...@archlinux.org> -# Contributor: Mihails Strasunse <pub...@dicebot.lv> - -pkgname=dtools -pkgver=2.098.0 -pkgrel=1 -pkgdesc='Ancilliary tools for the D programming language' -license=('Boost') -groups=('dlang') -arch=('x86_64') -url='https://www.dlang.org' -makedepends=('dmd' 'libphobos') -provides=('ddemangle' 'dustmite' 'rdmd') -conflicts=('ddemangle' 'dustmite' 'rdmd') -depends=('curl') -source=("$pkgname-$pkgver.tar.gz::https://github.com/dlang/tools/archive/v$pkgver.tar.gz" - 'autodetect.diff') -sha512sums=('a56abcc5b14498d82d8b1de8e545e741d1aae48ffdf904574b36a8f023389c168dc3262be05f8824f0c216f79f8d67edaac9f1f7059b06827119fdf010f27583' - '3bce3c66cf24837fcb9bf244f2b07ed6116d8d67a75b2319010cf93956e93b43262b7d9613359503e6b0352b82684be8baeeb7b1f50e77accda334ce470bf5e3') - -build() { - DMD=dmd - - # Add $LDFLAGS and $CXXFLAGS to the compilation - _linkflags=$(echo -ne $LDFLAGS | cut -d\" -f2 | tail -c+4 | sed "s/,/ -L=/g") - - cd tools-$pkgver - # rdmd is used to build others - $DMD -od. -ofdtools-rdmd -L--build-id $_linkflags rdmd.d - - for tool in DustMite/dustmite ddemangle catdoc detab tolf dget; do - ./dtools-rdmd --compiler=$DMD --build-only -od. -ofdtools-`basename $tool` $_linkflags $tool.d - done -} - -package() { - cd tools-$pkgver - - mkdir -p "$pkgdir/usr/bin" - for tool in rdmd ddemangle catdoc detab tolf dget dustmite; do - install -m755 -t "$pkgdir/usr/bin" $pkgname-$tool - done - - cd "$pkgdir" - ln -s dtools-rdmd usr/bin/rdmd - ln -s dtools-dustmite usr/bin/dustmite - ln -s dtools-ddemangle usr/bin/ddemangle -} Copied: dtools/repos/community-x86_64/PKGBUILD (from rev 1110204, dtools/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2022-01-18 21:20:52 UTC (rev 1110205) @@ -0,0 +1,47 @@ +# Maintainer: Dan Printzell <w...@archlinux.org> +# Maintainer: Filipe Laíns (FFY00) <la...@archlinux.org> +# Contributor: Mihails Strasunse <pub...@dicebot.lv> + +pkgname=dtools +pkgver=2.098.1 +pkgrel=1 +pkgdesc='Ancilliary tools for the D programming language' +license=('Boost') +groups=('dlang') +arch=('x86_64') +url='https://www.dlang.org' +makedepends=('dmd' 'libphobos') +provides=('ddemangle' 'dustmite' 'rdmd') +conflicts=('ddemangle' 'dustmite' 'rdmd') +depends=('curl') +source=("$pkgname-$pkgver.tar.gz::https://github.com/dlang/tools/archive/v$pkgver.tar.gz") +sha512sums=('a7e96cb38c95d910307c0fefa3840f8315799d4713e6c7ec591bd37863683962aede4359c7114b715a760b438df540dfc42e8da8394b1f4c892384e21fe7575e') + +build() { + DMD=dmd + + # Add $LDFLAGS to the compilation, and remove -flto + _linkflags=$(echo -ne $LDFLAGS | cut -d\" -f2 | tail -c+4 | sed -e "s/,/ -L=/g" -e "s/-flto//") + + cd tools-$pkgver + # rdmd is used to build others + $DMD -od. -ofdtools-rdmd -L--build-id $_linkflags rdmd.d + + for tool in DustMite/dustmite ddemangle catdoc detab tolf dget; do + ./dtools-rdmd --compiler=$DMD --build-only -od. -ofdtools-`basename $tool` $_linkflags $tool.d + done +} + +package() { + cd tools-$pkgver + + mkdir -p "$pkgdir/usr/bin" + for tool in rdmd ddemangle catdoc detab tolf dget dustmite; do + install -m755 -t "$pkgdir/usr/bin" $pkgname-$tool + done + + cd "$pkgdir" + ln -s dtools-rdmd usr/bin/rdmd + ln -s dtools-dustmite usr/bin/dustmite + ln -s dtools-ddemangle usr/bin/ddemangle +} Deleted: autodetect.diff =================================================================== --- autodetect.diff 2022-01-18 21:20:48 UTC (rev 1110204) +++ autodetect.diff 2022-01-18 21:20:52 UTC (rev 1110205) @@ -1,47 +0,0 @@ -diff --git a/rdmd.d b/rdmd.d -index bd82637..390d533 100644 ---- a/rdmd.d -+++ b/rdmd.d -@@ -52,7 +52,32 @@ else version (LDC) - else - static assert(false, "Unknown compiler"); - --private string compiler = defaultCompiler; -+private string compiler; -+ -+void chooseCompiler(ref string compiler) -+{ -+ import std.stdio; -+ -+ // if compiler is set explicitly, don't interefer -+ // otherwise find one that exists in PATH -+ if (!compiler.length) -+ { -+ import std.process : executeShell; -+ auto compilers = [ defaultCompiler, "dmd", "ldmd2", "gdmd2", "ldmd", "gdmd" ]; -+ -+ foreach (candidate; compilers) -+ { -+ // dirty hack, no-arg dmd invocation will return 1 -+ if (executeShell(candidate ~ "| grep Usage").status == 0) -+ { -+ compiler = candidate; -+ return; -+ } -+ } -+ -+ throw new Exception("Couldn't find any D compiler"); -+ } -+} - - version(unittest) {} else - int main(string[] args) -@@ -153,6 +178,8 @@ int main(string[] args) - if (bailout) return 0; - if (dryRun) chatty = true; // dry-run implies chatty - -+ chooseCompiler(compiler); -+ - /* Only -of is supported because Make is very susceptible to file names, and - * it doesn't do a good job resolving them. One option would be to use - * std.path.buildNormalizedPath(), but some corner cases will break, so it