[arch-commits] Commit in (5 files)
Eli Schwartz
eschwartz at archlinux.org
Thu Jun 14 01:50:41 UTC 2018
Date: Thursday, June 14, 2018 @ 01:50:40
Author: eschwartz
Revision: 343031
FS#58797 Fix more makedepends build cycles
Modified:
haskell-colour/trunk/PKGBUILD
haskell-hspec/trunk/PKGBUILD
haskell-http-streams/trunk/PKGBUILD
haskell-snap-server/trunk/PKGBUILD
haskell-stringbuilder/trunk/PKGBUILD
--------------------------------------+
haskell-colour/trunk/PKGBUILD | 6 +++---
haskell-hspec/trunk/PKGBUILD | 11 +++++++++--
haskell-http-streams/trunk/PKGBUILD | 11 +++++++++--
haskell-snap-server/trunk/PKGBUILD | 11 +++++++++--
haskell-stringbuilder/trunk/PKGBUILD | 11 +++++++++--
5 files changed, 39 insertions(+), 11 deletions(-)
Modified: haskell-colour/trunk/PKGBUILD
===================================================================
--- haskell-colour/trunk/PKGBUILD 2018-06-14 01:34:15 UTC (rev 343030)
+++ haskell-colour/trunk/PKGBUILD 2018-06-14 01:50:40 UTC (rev 343031)
@@ -26,13 +26,13 @@
cd "${srcdir}/${_hkgname}-${pkgver}"
if (( CHECKFUNC )); then
- opts=('--enable-tests')
+ _opts=('--enable-tests')
else
- opts=('--disable-tests')
+ _opts=('--disable-tests')
fi
runhaskell Setup configure -O --enable-shared --enable-executable-dynamic --disable-library-vanilla \
- --prefix=/usr --docdir="/usr/share/doc/${pkgname}" --datasubdir="$pkgname" "${opts[@]}" \
+ --prefix=/usr --docdir="/usr/share/doc/${pkgname}" --datasubdir="$pkgname" "${_opts[@]}" \
--dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid
runhaskell Setup build
runhaskell Setup register --gen-script
Modified: haskell-hspec/trunk/PKGBUILD
===================================================================
--- haskell-hspec/trunk/PKGBUILD 2018-06-14 01:34:15 UTC (rev 343030)
+++ haskell-hspec/trunk/PKGBUILD 2018-06-14 01:50:40 UTC (rev 343031)
@@ -11,15 +11,22 @@
arch=('x86_64')
depends=('ghc-libs' 'haskell-hunit' 'haskell-quickcheck' 'haskell-call-stack' 'haskell-hspec-core'
'haskell-hspec-discover' 'haskell-hspec-expectations')
-makedepends=('ghc' 'haskell-hspec-meta' 'haskell-stringbuilder')
+makedepends=('ghc')
+checkdepends=('haskell-hspec-meta' 'haskell-stringbuilder')
source=(https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
sha512sums=('8f680fcf233791a775feda58d51b33067db2de3e63d6e77c0f47fca0a3a442e828b78ccd9bdda5730d92d28151a503af1992c2d6d541ba006016057927285f58')
build() {
cd $_hkgname-$pkgver
+
+ if (( CHECKFUNC )); then
+ _opts=('--enable-tests')
+ else
+ _opts=('--disable-tests')
+ fi
runhaskell Setup configure -O --enable-shared --enable-executable-dynamic --disable-library-vanilla \
- --prefix=/usr --docdir="/usr/share/doc/${pkgname}" --enable-tests \
+ --prefix=/usr --docdir="/usr/share/doc/${pkgname}" "${_opts[@]}" \
--dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid
runhaskell Setup build
runhaskell Setup register --gen-script
Modified: haskell-http-streams/trunk/PKGBUILD
===================================================================
--- haskell-http-streams/trunk/PKGBUILD 2018-06-14 01:34:15 UTC (rev 343030)
+++ haskell-http-streams/trunk/PKGBUILD 2018-06-14 01:50:40 UTC (rev 343031)
@@ -13,7 +13,8 @@
'haskell-case-insensitive' 'haskell-io-streams' 'haskell-hsopenssl'
'haskell-openssl-streams' 'haskell-unordered-containers' 'haskell-aeson'
'haskell-http-common' 'haskell-network' 'haskell-network-uri')
-makedepends=('ghc' 'haskell-hunit' 'haskell-aeson-pretty' 'haskell-hspec'
+makedepends=('ghc')
+checkdepends=('haskell-hunit' 'haskell-aeson-pretty' 'haskell-hspec'
'haskell-hspec-expectations' 'haskell-snap-core' 'haskell-snap-server'
'haskell-system-fileio' 'haskell-system-filepath')
source=(https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
@@ -27,8 +28,14 @@
build() {
cd $_hkgname-$pkgver
+ if (( CHECKFUNC )); then
+ _opts=('--enable-tests')
+ else
+ _opts=('--disable-tests')
+ fi
+
runhaskell Setup configure -O --enable-shared --enable-executable-dynamic --disable-library-vanilla \
- --prefix=/usr --docdir="/usr/share/doc/${pkgname}" --enable-tests \
+ --prefix=/usr --docdir="/usr/share/doc/${pkgname}" "${_opts[@]}" \
--dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid
runhaskell Setup build
runhaskell Setup register --gen-script
Modified: haskell-snap-server/trunk/PKGBUILD
===================================================================
--- haskell-snap-server/trunk/PKGBUILD 2018-06-14 01:34:15 UTC (rev 343030)
+++ haskell-snap-server/trunk/PKGBUILD 2018-06-14 01:50:40 UTC (rev 343031)
@@ -13,7 +13,8 @@
'haskell-clock' 'haskell-io-streams' 'haskell-io-streams-haproxy' 'haskell-lifted-base'
'haskell-network' 'haskell-old-locale' 'haskell-snap-core' 'haskell-unix-compat'
'haskell-vector')
-makedepends=('ghc' 'haskell-base16-bytestring' 'haskell-monad-control' 'haskell-random'
+makedepends=('ghc')
+checkdepends=('haskell-base16-bytestring' 'haskell-monad-control' 'haskell-random'
'haskell-threads' 'haskell-hunit' 'haskell-quickcheck' 'haskell-http-streams'
'haskell-http-common' 'haskell-parallel' 'haskell-test-framework'
'haskell-test-framework-hunit' 'haskell-test-framework-quickcheck2')
@@ -28,8 +29,14 @@
build() {
cd $_hkgname-$pkgver
+ if (( CHECKFUNC )); then
+ _opts=('--enable-tests')
+ else
+ _opts=('--disable-tests')
+ fi
+
runhaskell Setup configure -O --enable-shared --enable-executable-dynamic --disable-library-vanilla \
- --prefix=/usr --docdir="/usr/share/doc/${pkgname}" --enable-tests \
+ --prefix=/usr --docdir="/usr/share/doc/${pkgname}" "${_opts[@]}" \
--dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid
runhaskell Setup build
runhaskell Setup register --gen-script
Modified: haskell-stringbuilder/trunk/PKGBUILD
===================================================================
--- haskell-stringbuilder/trunk/PKGBUILD 2018-06-14 01:34:15 UTC (rev 343030)
+++ haskell-stringbuilder/trunk/PKGBUILD 2018-06-14 01:50:40 UTC (rev 343031)
@@ -11,7 +11,8 @@
license=("MIT")
arch=('x86_64')
depends=('ghc-libs')
-makedepends=('ghc' 'haskell-hspec' 'haskell-quickcheck')
+makedepends=('ghc')
+checkdepends=('haskell-hspec' 'haskell-quickcheck')
source=("https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
sha512sums=('09cbf01dce82b325393c0d6f0264792695d528a184052f5e1d5dbd3fc181fd11c280e77ba445f1e44c6a8dabc0b267aa90f4a9f1fc34135f1b741d2a5dca9369')
@@ -18,8 +19,14 @@
build() {
cd "${srcdir}/${_hkgname}-${pkgver}"
+ if (( CHECKFUNC )); then
+ _opts=('--enable-tests')
+ else
+ _opts=('--disable-tests')
+ fi
+
runhaskell Setup configure -O --enable-shared --enable-executable-dynamic --disable-library-vanilla \
- --prefix=/usr --docdir="/usr/share/doc/${pkgname}" --enable-tests \
+ --prefix=/usr --docdir="/usr/share/doc/${pkgname}" "${_opts[@]}" \
--dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid
runhaskell Setup build
runhaskell Setup register --gen-script
More information about the arch-commits
mailing list