[rpms/ghc9.8] rawhide: patch os-string for s390x (#14)

[rpms/ghc9.8] rawhide: patch os-string for s390x (#14)

[Jens Petersen]

            A new commit has been pushed.

            Repo   : rpms/ghc9.8
            Branch : rawhide
            Commit : 1e21ff5e424381d41c5fa3483948cf40f118fe0f
            Author : Jens Petersen <petersen@redhat.com>
            Date   : 2026-08-08T22:16:00+08:00
            Stats  : +32/-0 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/ghc9.8/c/1e21ff5e424381d41c5fa3483948cf40f118fe0f?branch=rawhide

            Log:
            patch os-string for s390x (#14)

Building library for os-string-2.0.2.1...
[ 1 of 10] Compiling System.OsString.Data.ByteString.Short.Internal
System/OsString/Data/ByteString/Short/Internal.hs:314:15: error: [GHC-83865]
    • Couldn't match type ‘Word#’ with ‘Word16#’
      Expected: Word16# -> Word16#
        Actual: Word# -> Word#
    • In the expression: byteSwap16#
      In an equation for ‘word16ToLE#’: word16ToLE# = byteSwap16#

---
diff --git a/bafe87d871399b58ce4a50592b980c990a3eac39.patch b/bafe87d871399b58ce4a50592b980c990a3eac39.patch
new file mode 100644
index 0000000..d90f3ef
--- /dev/null
+++ b/bafe87d871399b58ce4a50592b980c990a3eac39.patch
@@ -0,0 +1,25 @@
+From bafe87d871399b58ce4a50592b980c990a3eac39 Mon Sep 17 00:00:00 2001
+From: Bodigrim <andrew.lelechenko@gmail.com>
+Date: Thu, 9 May 2024 01:02:44 +0100
+Subject: [PATCH] Fix compilation on big-endian arches
+
+---
+ System/OsString/Data/ByteString/Short/Internal.hs | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/System/OsString/Data/ByteString/Short/Internal.hs b/System/OsString/Data/ByteString/Short/Internal.hs
+index fedc199..f7ddcd8 100644
+--- a/System/OsString/Data/ByteString/Short/Internal.hs
++++ b/System/OsString/Data/ByteString/Short/Internal.hs
+@@ -311,7 +311,11 @@ word16ToLE#, word16FromLE# :: Word16# -> Word16#
+ word16ToLE#, word16FromLE# :: Word# -> Word#
+ #endif
+ #ifdef WORDS_BIGENDIAN
++#if MIN_VERSION_base(4,16,0)
++word16ToLE# w = wordToWord16# (byteSwap16# (word16ToWord# w))
++#else
+ word16ToLE# = byteSwap16#
++#endif
+ #else
+ word16ToLE# w# = w#
+ #endif

diff --git a/ghc9.8.spec b/ghc9.8.spec
index ec690f4..96ce603 100644
--- a/ghc9.8.spec
+++ b/ghc9.8.spec
@@ -124,6 +124,10 @@ Patch60: ghc9.8-32bit-unique-word-revert.patch
 # https://github.com/haskell/directory/pull/184 (directory.buildinfo)
 Patch50: https://patch-diff.githubusercontent.com/raw/haskell/directory/pull/184.patch
 
+# os-string (s390x)
+# https://github.com/haskell/os-string/pull/14
+Patch70: https://github.com/haskell/os-string/commit/bafe87d871399b58ce4a50592b980c990a3eac39.patch
+
 # https://gitlab.haskell.org/ghc/ghc/-/wikis/platforms
 
 # fedora ghc has been bootstrapped on
@@ -413,6 +417,9 @@ Installing this package causes %{name}-*-prof packages corresponding to
       mv $i ..
   done
   )
+  (cd os-string-2.0.2.1
+   %patch -P70 -p1 -b .orig
+  )
   ln -sf ../libraries/Cabal/Cabal-syntax Cabal-syntax-%{Cabal_ver}
   ln -sf ../libraries/Cabal/Cabal Cabal-%{Cabal_ver}
 )