[Git][haskell-team/DHG_packages][master] haskell-versions: tweak patch to be more generic

[Gianfranco Costamagna (@locutusofborg)]

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


Commits:
23c0b37d by Gianfranco Costamagna at 2024-08-13T14:54:23+02:00
haskell-versions: tweak patch to be more generic

- - - - -


4 changed files:

- p/haskell-versions/debian/changelog
- p/haskell-versions/debian/patches/no-rts-n → p/haskell-versions/debian/patches/no--N
- p/haskell-versions/debian/patches/series
- p/haskell-versions/debian/rules


Changes:

=====================================
p/haskell-versions/debian/changelog
=====================================
@@ -3,6 +3,9 @@ haskell-versions (6.0.2-2) UNRELEASED; urgency=medium
   [ zhangdandan <zhangdandan at loongson.cn> ]
   * Fix build on loongarch64 (Closes: #1069769)
 
+  [ Gianfranco Costamagna ]
+  * Tweak patch to be more generic
+
  -- Gianfranco Costamagna <locutusofborg at debian.org>  Tue, 13 Aug 2024 14:11:16 +0200
 
 haskell-versions (6.0.2-1) unstable; urgency=medium


=====================================
p/haskell-versions/debian/patches/no-rts-n → p/haskell-versions/debian/patches/no--N
=====================================
@@ -1,14 +1,23 @@
---- a/versions.cabal
-+++ b/versions.cabal
-@@ -58,7 +58,10 @@ test-suite versions-test
+--- haskell-versions-6.0.2.orig/versions.cabal
++++ haskell-versions-6.0.2/versions.cabal
+@@ -53,12 +53,19 @@ library
+     , hashable  >=1.2
+     , parser-combinators >= 1.0
+ 
++flag smp
++  description:          build test with -N
++  default:              True
++
+ test-suite versions-test
+   import:         commons
    type:           exitcode-stdio-1.0
    main-is:        Test.hs
    hs-source-dirs: test
 -  ghc-options:    -threaded -with-rtsopts=-N
-+  if arch(arm) || arch(mips) || arch(s390x) || arch(i386) || arch(riscv64) || arch(loongarch64)
-+    ghc-options:    -threaded
-+  else
++  if flag(smp)
 +    ghc-options:    -threaded -with-rtsopts=-N
++  else
++    ghc-options:    -threaded
    other-modules:  TH
    build-depends:
      , microlens         >=0.4


=====================================
p/haskell-versions/debian/patches/series
=====================================
@@ -1 +1 @@
-no-rts-n
+no--N


=====================================
p/haskell-versions/debian/rules
=====================================
@@ -5,5 +5,9 @@ DEB_SETUP_BIN_NAME = debian/hlibrary.setup
 DEB_CABAL_PACKAGE = versions
 DEB_DEFAULT_COMPILER = ghc
 
+ifeq (no,$(shell ghc --info | grep -q 'Support SMP.*NO' && echo no))
+	DEB_SETUP_GHC_CONFIGURE_ARGS += -f-smp
+endif
+
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/hlibrary.mk



View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/23c0b37d5676724bf6f3b37f1be509f7d1dc3f82

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/23c0b37d5676724bf6f3b37f1be509f7d1dc3f82
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/b1f104b8/attachment-0001.htm>