From 3bac0ece72651b31d7ec7e417d94a0935f7dd4f0 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Thu, 23 Jul 2015 13:05:21 +0100 Subject: [PATCH] creduce{,-git}: Some fixes 1. Drop dependency on delta, internal clang_delta now used. 2. Add dependency of clang since clang-format is used at runtime. 3. Only sed #!${MINGW_PREFIX} -> #!/usr, not the other one(s). --- mingw-w64-creduce-git/PKGBUILD | 12 ++++++------ mingw-w64-creduce/PKGBUILD | 14 +++++++------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/mingw-w64-creduce-git/PKGBUILD b/mingw-w64-creduce-git/PKGBUILD index 779b235048..eb6259b684 100644 --- a/mingw-w64-creduce-git/PKGBUILD +++ b/mingw-w64-creduce-git/PKGBUILD @@ -4,18 +4,18 @@ _realname=creduce pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}-git") provides=("${MINGW_PACKAGE_PREFIX}-${_realname}") conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}") -pkgver=creduce.2.3.0.14.g49782e7 +pkgver=creduce.2.3.0.18.g7b3ce38 pkgrel=1 pkgdesc="A C program reducer (mingw-w64)" -depends=('delta' - 'perl-Benchmark-Timer' +depends=('perl-Benchmark-Timer' 'perl-Exporter-Lite' 'perl-File-Which' 'perl-Getopt-Tabular' 'perl-Regexp-Common' 'perl-Sys-CPU' "${MINGW_PACKAGE_PREFIX}-astyle" - "${MINGW_PACKAGE_PREFIX}-indent") + "${MINGW_PACKAGE_PREFIX}-indent" + "${MINGW_PACKAGE_PREFIX}-clang") arch=('any') url='https://github.com/csmith-project/creduce' license=('custom:University of Illinois/NCSA Open Source License') @@ -57,8 +57,8 @@ package() { install -Dm644 "../${_realname}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING" # Point creduce perl script: - # lib $FindBin::Bin, '${MINGW_PREFIX}/share/creduce/perl'; + # #!/${MINGW_PREFIX} -> #!/usr # .. to msys2 perl. - sed "s|${MINGW_PREFIX}|/usr|g" \ + sed "s|#!${MINGW_PREFIX}|#!/usr|g" \ -i ${pkgdir}${MINGW_PREFIX}/bin/creduce } diff --git a/mingw-w64-creduce/PKGBUILD b/mingw-w64-creduce/PKGBUILD index a0626a14c3..bca83f7422 100644 --- a/mingw-w64-creduce/PKGBUILD +++ b/mingw-w64-creduce/PKGBUILD @@ -4,21 +4,21 @@ _realname=creduce pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") replaces=("${MINGW_PACKAGE_PREFIX}-${_realname}-git") pkgver=2.3.0 -pkgrel=1 +pkgrel=2 pkgdesc="A C program reducer (mingw-w64)" -depends=('delta' - 'perl-Benchmark-Timer' +depends=('perl-Benchmark-Timer' 'perl-Exporter-Lite' 'perl-File-Which' 'perl-Getopt-Tabular' 'perl-Regexp-Common' 'perl-Sys-CPU' "${MINGW_PACKAGE_PREFIX}-astyle" - "${MINGW_PACKAGE_PREFIX}-indent") + "${MINGW_PACKAGE_PREFIX}-indent" + "${MINGW_PACKAGE_PREFIX}-clang") arch=('any') url='https://github.com/csmith-project/creduce' license=('custom:University of Illinois/NCSA Open Source License') -makedepends=('flex' "${MINGW_PACKAGE_PREFIX}-clang") +makedepends=("flex" "${MINGW_PACKAGE_PREFIX}-clang") source=(https://github.com/csmith-project/creduce/archive/${_realname}-${pkgver}.tar.gz "llvm-config-cygpath") sha256sums=('47a42751aab8b51bc10d8df62f359bdc1b4a644f16feb85b9f7325f0c5bce4a3' @@ -51,8 +51,8 @@ package() { install -Dm644 "../${_realname}-${_realname}-${pkgver}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING" # Point creduce perl script: - # lib $FindBin::Bin, '${MINGW_PREFIX}/share/creduce/perl'; + # #!/${MINGW_PREFIX} -> #!/usr # .. to msys2 perl. - sed "s|${MINGW_PREFIX}|/usr|g" \ + sed "s|#!${MINGW_PREFIX}|#!/usr|g" \ -i ${pkgdir}${MINGW_PREFIX}/bin/creduce }