[Git][haskell-team/DHG_packages][master] 2 commits: haskell-safe-exceptions: use smp to detect rtsopts in a more generic way

[Gianfranco Costamagna (@locutusofborg)]

Gianfranco Costamagna pushed to branch master at Debian Haskell Group / DHG_packages


Commits:
1ab43f46 by Gianfranco Costamagna at 2024-08-13T14:49:42+02:00
haskell-safe-exceptions: use smp to detect rtsopts in a more generic way

- - - - -
e702dedc by Gianfranco Costamagna at 2024-08-13T14:50:36+02:00
haskell-safe-exceptions: update changelog

- - - - -


4 changed files:

- p/haskell-safe-exceptions/debian/changelog
- p/haskell-safe-exceptions/debian/patches/smp-tests → p/haskell-safe-exceptions/debian/patches/no--N
- p/haskell-safe-exceptions/debian/patches/series
- p/haskell-safe-exceptions/debian/rules


Changes:

=====================================
p/haskell-safe-exceptions/debian/changelog
=====================================
@@ -1,3 +1,9 @@
+haskell-safe-exceptions (0.1.7.4-2) UNRELEASED; urgency=medium
+
+  * Add a patch to detect smp in a more generic way
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org>  Tue, 13 Aug 2024 14:50:22 +0200
+
 haskell-safe-exceptions (0.1.7.4-1) unstable; urgency=medium
 
   [ Ilias Tsitsimpis ]


=====================================
p/haskell-safe-exceptions/debian/patches/smp-tests → p/haskell-safe-exceptions/debian/patches/no--N
=====================================
@@ -1,23 +1,25 @@
---- a/safe-exceptions.cabal
-+++ b/safe-exceptions.cabal
+--- haskell-safe-exceptions-0.1.7.4.orig/safe-exceptions.cabal
++++ haskell-safe-exceptions-0.1.7.4/safe-exceptions.cabal
 @@ -13,6 +13,10 @@ build-type:          Simple
  extra-source-files:  README.md ChangeLog.md COOKBOOK.md
  cabal-version:       >=1.10
  
-+flag tests-single-threaded
-+   description: Build tests single-threaded
-+   default: False
++flag smp
++  description:          build test with -N
++  default:              True
 +
  library
    hs-source-dirs:      src
    exposed-modules:     Control.Exception.Safe
-@@ -32,7 +36,8 @@ test-suite safe-exceptions-test
+@@ -32,7 +36,10 @@ test-suite safe-exceptions-test
                       , safe-exceptions
                       , transformers
                       , void
 -  ghc-options:         -threaded -rtsopts -with-rtsopts=-N
-+  if !flag(tests-single-threaded)
++  if flag(smp)
 +    ghc-options:         -threaded -rtsopts -with-rtsopts=-N
++  else
++    ghc-options:         -threaded
    default-language:    Haskell2010
  
  source-repository head


=====================================
p/haskell-safe-exceptions/debian/patches/series
=====================================
@@ -1 +1 @@
-smp-tests
+no--N


=====================================
p/haskell-safe-exceptions/debian/rules
=====================================
@@ -5,7 +5,7 @@ DEB_CABAL_PACKAGE = safe-exceptions
 DEB_DEFAULT_COMPILER = ghc
 
 ifeq (no,$(shell ghc --info | grep -q 'Support SMP.*NO' && echo no))
-DEB_SETUP_GHC_CONFIGURE_ARGS += -ftests-single-threaded
+       DEB_SETUP_GHC_CONFIGURE_ARGS += -f-smp
 endif
 
 include /usr/share/cdbs/1/rules/debhelper.mk



View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/compare/d6f269f62c49a63ba8a28eb8f8ebcc0150029884...e702dedc8d6e27fb7b376c965c2fffd12a357b16

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/compare/d6f269f62c49a63ba8a28eb8f8ebcc0150029884...e702dedc8d6e27fb7b376c965c2fffd12a357b16
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-haskell-commits/attachments/20240813/0e97a488/attachment-0001.htm>