package created using the webbuild interface [release 0.0.16-1mamba;Sun Dec 03 2023]

2024-01-05 22:45:29 +01:00 · 2024-01-05 22:45:29 +01:00 · 40f50cb74b
commit 40f50cb74b
parent c928709c77
3 changed files with 326 additions and 0 deletions
--- a/README.md
+++ b/README.md
@ -1,2 +1,4 @@
 # ghc-basement

+GHC basement: Foundation scrap box of array & string.
+
--- a/ghc-basement-0.0.16-i386-fix-build.patch
+++ b/ghc-basement-0.0.16-i386-fix-build.patch
@ -0,0 +1,242 @@
+From 38be2c93acb6f459d24ed6c626981c35ccf44095 Mon Sep 17 00:00:00 2001
+From: Sylvain Henry <sylvain@haskus.fr>
+Date: Thu, 16 Feb 2023 15:40:45 +0100
+Subject: [PATCH] Fix build on 32-bit architectures
+
+---
+ basement/Basement/Bits.hs                 |  4 ++++
+ basement/Basement/From.hs                 | 24 -----------------------
+ basement/Basement/Numerical/Additive.hs   |  4 ++++
+ basement/Basement/Numerical/Conversion.hs | 20 +++++++++++++++++++
+ basement/Basement/PrimType.hs             |  6 +++++-
+ basement/Basement/Types/OffsetSize.hs     | 22 +++++++++++++++++++--
+ 6 files changed, 53 insertions(+), 27 deletions(-)
+
+diff --git a/basement/Basement/Bits.hs b/basement/Basement/Bits.hs
+index 7eeea0f5..24520ed7 100644
+--- a/basement/Basement/Bits.hs
+++ b/basement/Basement/Bits.hs
+@@ -54,8 +54,12 @@ import GHC.Int
+ import Basement.Compat.Primitive
+ 
+ #if WORD_SIZE_IN_BITS < 64
+#if __GLASGOW_HASKELL__ >= 904
+import GHC.Exts
+#else
+ import GHC.IntWord64
+ #endif
+#endif
+ 
+ -- | operation over finite bits
+ class FiniteBitsOps bits where
+diff --git a/basement/Basement/From.hs b/basement/Basement/From.hs
+index 7bbe141c..80014b3e 100644
+--- a/basement/Basement/From.hs
+++ b/basement/Basement/From.hs
+@@ -272,23 +272,11 @@ instance (NatWithinBound (CountOf ty) n, KnownNat n, PrimType ty)
+     tryFrom = BlockN.toBlockN . UArray.toBlock . BoxArray.mapToUnboxed id
+ 
+ instance (KnownNat n, NatWithinBound Word8 n) => From (Zn64 n) Word8 where
+-#if __GLASGOW_HASKELL__ >= 904
+-    from = narrow . unZn64 where narrow (W64# w) = W8# (wordToWord8# (word64ToWord# (GHC.Prim.word64ToWord# w)))
+-#else
+     from = narrow . unZn64 where narrow (W64# w) = W8# (wordToWord8# (word64ToWord# w))
+-#endif
+ instance (KnownNat n, NatWithinBound Word16 n) => From (Zn64 n) Word16 where
+-#if __GLASGOW_HASKELL__ >= 904
+-    from = narrow . unZn64 where narrow (W64# w) = W16# (wordToWord16# (word64ToWord# (GHC.Prim.word64ToWord# w)))
+-#else
+     from = narrow . unZn64 where narrow (W64# w) = W16# (wordToWord16# (word64ToWord# w))
+-#endif
+ instance (KnownNat n, NatWithinBound Word32 n) => From (Zn64 n) Word32 where
+-#if __GLASGOW_HASKELL__ >= 904
+-    from = narrow . unZn64 where narrow (W64# w) = W32# (wordToWord32# (word64ToWord# (GHC.Prim.word64ToWord# w)))
+-#else
+     from = narrow . unZn64 where narrow (W64# w) = W32# (wordToWord32# (word64ToWord# w))
+-#endif
+ instance From (Zn64 n) Word64 where
+     from = unZn64
+ instance From (Zn64 n) Word128 where
+@@ -297,23 +285,11 @@ instance From (Zn64 n) Word256 where
+     from = from . unZn64
+ 
+ instance (KnownNat n, NatWithinBound Word8 n) => From (Zn n) Word8 where
+-#if __GLASGOW_HASKELL__ >= 904
+-    from = narrow . naturalToWord64 . unZn where narrow (W64# w) = W8# (wordToWord8# (word64ToWord# (GHC.Prim.word64ToWord# w)))
+-#else
+     from = narrow . naturalToWord64 . unZn where narrow (W64# w) = W8# (wordToWord8# (word64ToWord# w))
+-#endif
+ instance (KnownNat n, NatWithinBound Word16 n) => From (Zn n) Word16 where
+-#if __GLASGOW_HASKELL__ >= 904
+-    from = narrow . naturalToWord64 . unZn where narrow (W64# w) = W16# (wordToWord16# (word64ToWord# (GHC.Prim.word64ToWord# w)))
+-#else
+     from = narrow . naturalToWord64 . unZn where narrow (W64# w) = W16# (wordToWord16# (word64ToWord# w))
+-#endif
+ instance (KnownNat n, NatWithinBound Word32 n) => From (Zn n) Word32 where
+-#if __GLASGOW_HASKELL__ >= 904
+-    from = narrow . naturalToWord64 . unZn where narrow (W64# w) = W32# (wordToWord32# (word64ToWord# (GHC.Prim.word64ToWord# w)))
+-#else
+     from = narrow . naturalToWord64 . unZn where narrow (W64# w) = W32# (wordToWord32# (word64ToWord# w))
+-#endif
+ instance (KnownNat n, NatWithinBound Word64 n) => From (Zn n) Word64 where
+     from = naturalToWord64 . unZn
+ instance (KnownNat n, NatWithinBound Word128 n) => From (Zn n) Word128 where
+diff --git a/basement/Basement/Numerical/Additive.hs b/basement/Basement/Numerical/Additive.hs
+index d0dfb973..8ab65aa0 100644
+--- a/basement/Basement/Numerical/Additive.hs
+++ b/basement/Basement/Numerical/Additive.hs
+@@ -30,8 +30,12 @@ import qualified Basement.Types.Word128 as Word128
+ import qualified Basement.Types.Word256 as Word256
+ 
+ #if WORD_SIZE_IN_BITS < 64
+#if __GLASGOW_HASKELL__ >= 904
+import           GHC.Exts
+#else
+ import           GHC.IntWord64
+ #endif
+#endif
+ 
+ -- | Represent class of things that can be added together,
+ -- contains a neutral element and is commutative.
+diff --git a/basement/Basement/Numerical/Conversion.hs b/basement/Basement/Numerical/Conversion.hs
+index db502c07..fddc8232 100644
+--- a/basement/Basement/Numerical/Conversion.hs
+++ b/basement/Basement/Numerical/Conversion.hs
+@@ -26,8 +26,12 @@ import GHC.Word
+ import Basement.Compat.Primitive
+ 
+ #if WORD_SIZE_IN_BITS < 64
+#if __GLASGOW_HASKELL__ >= 904
+import GHC.Exts
+#else
+ import GHC.IntWord64
+ #endif
+#endif
+ 
+ intToInt64 :: Int -> Int64
+ #if WORD_SIZE_IN_BITS == 64
+@@ -96,11 +100,22 @@ int64ToWord64 (I64# i) = W64# (int64ToWord64# i)
+ #endif
+ 
+ #if WORD_SIZE_IN_BITS == 64
+#if __GLASGOW_HASKELL__ >= 904
+word64ToWord# :: Word64# -> Word#
+word64ToWord# i = word64ToWord# i
+#else
+ word64ToWord# :: Word# -> Word#
+ word64ToWord# i = i
+#endif
+ {-# INLINE word64ToWord# #-}
+ #endif
+ 
+#if WORD_SIZE_IN_BITS < 64
+word64ToWord32# :: Word64# -> Word32#
+word64ToWord32# i = wordToWord32# (word64ToWord# i)
+{-# INLINE word64ToWord32# #-}
+#endif
+
+ -- | 2 Word32s
+ data Word32x2 = Word32x2 {-# UNPACK #-} !Word32
+                          {-# UNPACK #-} !Word32
+@@ -113,9 +128,14 @@ word64ToWord32s (W64# w64) = Word32x2 (W32# (wordToWord32# (uncheckedShiftRL# (G
+ word64ToWord32s (W64# w64) = Word32x2 (W32# (wordToWord32# (uncheckedShiftRL# w64 32#))) (W32# (wordToWord32# w64))
+ #endif
+ #else
+#if __GLASGOW_HASKELL__ >= 904
+word64ToWord32s :: Word64 -> Word32x2
+word64ToWord32s (W64# w64) = Word32x2 (W32# (word64ToWord32# (uncheckedShiftRL64# w64 32#))) (W32# (word64ToWord32# w64))
+#else
+ word64ToWord32s :: Word64 -> Word32x2
+ word64ToWord32s (W64# w64) = Word32x2 (W32# (word64ToWord# (uncheckedShiftRL64# w64 32#))) (W32# (word64ToWord# w64))
+ #endif
+#endif
+ 
+ wordToChar :: Word -> Char
+ wordToChar (W# word) = C# (chr# (word2Int# word))
+diff --git a/basement/Basement/PrimType.hs b/basement/Basement/PrimType.hs
+index f8ca2926..a888ec91 100644
+--- a/basement/Basement/PrimType.hs
+++ b/basement/Basement/PrimType.hs
+@@ -54,7 +54,11 @@ import           Basement.Nat
+ import qualified Prelude (quot)
+ 
+ #if WORD_SIZE_IN_BITS < 64
+-import           GHC.IntWord64
+#if __GLASGOW_HASKELL__ >= 904
+import GHC.Exts
+#else
+import GHC.IntWord64
+#endif
+ #endif
+ 
+ #ifdef FOUNDATION_BOUNDS_CHECK
+diff --git a/basement/Basement/Types/OffsetSize.hs b/basement/Basement/Types/OffsetSize.hs
+index cd944927..1ea80dad 100644
+--- a/basement/Basement/Types/OffsetSize.hs
+++ b/basement/Basement/Types/OffsetSize.hs
+@@ -70,8 +70,12 @@ import Data.List (foldl')
+ import qualified Prelude
+ 
+ #if WORD_SIZE_IN_BITS < 64
+#if __GLASGOW_HASKELL__ >= 904
+import GHC.Exts
+#else
+ import GHC.IntWord64
+ #endif
+#endif
+ 
+ -- | File size in bytes
+ newtype FileSize = FileSize Word64
+@@ -225,20 +229,26 @@ countOfRoundUp alignment (CountOf n) = CountOf ((n + (alignment-1)) .&. compleme
+ 
+ csizeOfSize :: CountOf Word8 -> CSize
+ #if WORD_SIZE_IN_BITS < 64
+#if __GLASGOW_HASKELL__ >= 904
+csizeOfSize (CountOf (I# sz)) = CSize (W32# (wordToWord32# (int2Word# sz)))
+#else
+ csizeOfSize (CountOf (I# sz)) = CSize (W32# (int2Word# sz))
+#endif
+ #else
+ #if __GLASGOW_HASKELL__ >= 904
+ csizeOfSize (CountOf (I# sz)) = CSize (W64# (wordToWord64# (int2Word# sz)))
+-
+ #else
+ csizeOfSize (CountOf (I# sz)) = CSize (W64# (int2Word# sz))
+-
+ #endif
+ #endif
+ 
+ csizeOfOffset :: Offset8 -> CSize
+ #if WORD_SIZE_IN_BITS < 64
+#if __GLASGOW_HASKELL__ >= 904
+csizeOfOffset (Offset (I# sz)) = CSize (W32# (wordToWord32# (int2Word# sz)))
+#else
+ csizeOfOffset (Offset (I# sz)) = CSize (W32# (int2Word# sz))
+#endif
+ #else
+ #if __GLASGOW_HASKELL__ >= 904
+ csizeOfOffset (Offset (I# sz)) = CSize (W64# (wordToWord64# (int2Word# sz)))
+@@ -250,7 +260,11 @@ csizeOfOffset (Offset (I# sz)) = CSize (W64# (int2Word# sz))
+ sizeOfCSSize :: CSsize -> CountOf Word8
+ sizeOfCSSize (CSsize (-1))      = error "invalid size: CSSize is -1"
+ #if WORD_SIZE_IN_BITS < 64
+#if __GLASGOW_HASKELL__ >= 904
+sizeOfCSSize (CSsize (I32# sz)) = CountOf (I# (int32ToInt# sz))
+#else
+ sizeOfCSSize (CSsize (I32# sz)) = CountOf (I# sz)
+#endif
+ #else
+ #if __GLASGOW_HASKELL__ >= 904
+ sizeOfCSSize (CSsize (I64# sz)) = CountOf (I# (int64ToInt# sz))
+@@ -261,7 +275,11 @@ sizeOfCSSize (CSsize (I64# sz)) = CountOf (I# sz)
+ 
+ sizeOfCSize :: CSize -> CountOf Word8
+ #if WORD_SIZE_IN_BITS < 64
+#if __GLASGOW_HASKELL__ >= 904
+sizeOfCSize (CSize (W32# sz)) = CountOf (I# (word2Int# (word32ToWord# sz)))
+#else
+ sizeOfCSize (CSize (W32# sz)) = CountOf (I# (word2Int# sz))
+#endif
+ #else
+ #if __GLASGOW_HASKELL__ >= 904
+ sizeOfCSize (CSize (W64# sz)) = CountOf (I# (word2Int# (word64ToWord# sz)))
--- a/ghc-basement.spec
+++ b/ghc-basement.spec
@ -0,0 +1,82 @@
+%define ghc_ver %(ghc --numeric-version)
+%define pkg_name %(echo %name | sed "s|^ghc-||")
+
+Name:          ghc-basement
+Version:       0.0.16
+Release:       1mamba
+Summary:       GHC basement: Foundation scrap box of array & string
+Group:         Development/Libraries
+Vendor:        openmamba
+Distribution:  openmamba
+Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
+URL:           http://hackage.haskell.org/package/%{pkg_name}
+Source:        https://hackage.haskell.org/package/basement-%{version}/basement-%{version}.tar.gz
+Patch0:        ghc-basement-0.0.16-i386-fix-build.patch
+License:       BSD
+## AUTOBUILDREQ-BEGIN
+BuildRequires: ghc-libs
+BuildRequires: glibc-devel
+BuildRequires: libgmp-devel
+## AUTOBUILDREQ-END
+BuildRequires: ghc
+BuildRequires: ghc-rpm-macros
+Requires:      ghc = %{ghc_ver}
+
+%description
+%{summary}.
+
+%package devel
+Summary:        Haskell %{pkg_name} library development files
+Provides:       %{name}-static = %{?epoch:%epoch:}%{version}-%{release}
+Provides:       %{name}-static%{?_isa} = %{?epoch:%epoch:}%{version}-%{release}
+%if %{defined ghc_version}
+Requires:       ghc = %{ghc_version}
+%endif
+Requires:       %{name}%{?_isa} = %{?epoch:%epoch:}%{version}-%{release}
+
+%description devel
+This package provides the Haskell %{pkg_name} library development files.
+
+%if %{with haddock}
+%package doc
+Summary:        Haskell %{pkg_name} library documentation
+Requires:       ghc-filesystem
+
+%description doc
+This package provides the Haskell %{pkg_name} library documentation.
+%endif
+
+%prep
+%setup -q -n basement-%{version}
+%patch 0 -p2 -b .i386-fix-build
+
+%build
+export LC_ALL="en_US.UTF-8"
+
+%ghc_lib_build
+
+%install
+%ghc_lib_install
+
+rm -f %{buildroot}%{_ghclicensedir}/%{name}/LICENSE
+
+%clean
+[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
+
+%files -f %{name}.files
+%defattr(-,root,root)
+%license LICENSE
+
+%files devel -f %{name}-devel.files
+%defattr(-,root,root)
+#%doc CHANGELOG.markdown README.markdown
+
+%if %{with haddock}
+%files doc -f %{name}-doc.files
+%defattr(-,root,root)
+%license LICENSE
+%endif
+
+%changelog
+* Sun Dec 03 2023 Silvan Calarco <silvan.calarco@mambasoft.it> 0.0.16-1mamba
+- package created using the webbuild interface