From c6095676b5ce06d2b83f40eeab4839b15a696925 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Thu, 21 Mar 2024 18:41:51 +0000 Subject: [PATCH] ghc-basement package is retired on branch c10s for BAKERY-412 --- .gitignore | 9 -- 573.patch | 242 ---------------------------------------------- changelog | 60 ------------ dead.package | 1 + ghc-basement.spec | 108 --------------------- sources | 1 - 6 files changed, 1 insertion(+), 420 deletions(-) delete mode 100644 .gitignore delete mode 100644 573.patch delete mode 100644 changelog create mode 100644 dead.package delete mode 100644 ghc-basement.spec delete mode 100644 sources diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 2bce753..0000000 --- a/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -/basement-0.0.4.tar.gz -/basement-0.0.7.tar.gz -/basement-0.0.8.tar.gz -/basement-0.0.10.tar.gz -/basement-0.0.11.tar.gz -/basement-0.0.12.tar.gz -/basement-0.0.14.tar.gz -/basement-0.0.15.tar.gz -/basement-0.0.16.tar.gz diff --git a/573.patch b/573.patch deleted file mode 100644 index e934f8e..0000000 --- a/573.patch +++ /dev/null @@ -1,242 +0,0 @@ -From 38be2c93acb6f459d24ed6c626981c35ccf44095 Mon Sep 17 00:00:00 2001 -From: Sylvain Henry -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))) diff --git a/changelog b/changelog deleted file mode 100644 index 51276f6..0000000 --- a/changelog +++ /dev/null @@ -1,60 +0,0 @@ -* Sun Jan 22 2023 Jens Petersen - 0.0.15-1 -- https://hackage.haskell.org/package/basement-0.0.15/changelog -- refresh to cabal-rpm-2.1.0 with SPDX migration - -* Thu Jul 21 2022 Fedora Release Engineering - 0.0.14-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Tue Jun 07 2022 Jens Petersen - 0.0.14-1 -- https://hackage.haskell.org/package/basement-0.0.14/changelog - -* Thu Jan 20 2022 Fedora Release Engineering - 0.0.12-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Thu Aug 5 2021 Jens Petersen - 0.0.12-1 -- update to 0.0.12 - -* Thu Jul 22 2021 Fedora Release Engineering - 0.0.11-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Jan 26 2021 Fedora Release Engineering - 0.0.11-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Jul 27 2020 Fedora Release Engineering - 0.0.11-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jul 17 2020 Jens Petersen - 0.0.11-2 -- refresh to cabal-rpm-2.0.6 - -* Sun Feb 09 2020 Jens Petersen - 0.0.11-1 -- update to 0.0.11 - -* Tue Jan 28 2020 Fedora Release Engineering - 0.0.10-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Jul 25 2019 Jens Petersen - 0.0.10-1 -- update to 0.0.10 - -* Thu Jul 25 2019 Fedora Release Engineering - 0.0.8-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 17 2019 Jens Petersen - 0.0.8-3 -- refresh to cabal-rpm-0.13 - -* Thu Jan 31 2019 Fedora Release Engineering - 0.0.8-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Jul 26 2018 Jens Petersen - 0.0.8-1 -- update to 0.0.8 - -* Sun Jul 22 2018 Jens Petersen - 0.0.7-1 -- update to 0.0.7 - -* Fri Jul 13 2018 Fedora Release Engineering - 0.0.4-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 23 2018 Jens Petersen - 0.0.4-3 -- bump over foundation - -* Sat Jan 27 2018 Fedora Haskell SIG - 0.0.4-1 -- spec file generated by cabal-rpm-0.12 diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..773b8dc --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +ghc-basement package is retired on branch c10s for BAKERY-412 \ No newline at end of file diff --git a/ghc-basement.spec b/ghc-basement.spec deleted file mode 100644 index 3b7c395..0000000 --- a/ghc-basement.spec +++ /dev/null @@ -1,108 +0,0 @@ -# generated by cabal-rpm-2.1.2 -# https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ - -%global pkg_name basement -%global pkgver %{pkg_name}-%{version} - -Name: ghc-%{pkg_name} -Version: 0.0.16 -Release: %autorelease -Summary: Foundation scrap box of array & string - -License: BSD-3-Clause -Url: https://hackage.haskell.org/package/%{pkg_name} -# Begin cabal-rpm sources: -Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz -# End cabal-rpm sources -# https://github.com/haskell-foundation/foundation/issues/565 -Patch0: https://patch-diff.githubusercontent.com/raw/haskell-foundation/foundation/pull/573.patch - -# Begin cabal-rpm deps: -BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros -BuildRequires: ghc-base-devel -%if %{with ghc_prof} -BuildRequires: ghc-base-prof -%endif -# End cabal-rpm deps - -%description -Foundation most basic primitives without any dependencies. - - -%package devel -Summary: Haskell %{pkg_name} library development files -Provides: %{name}-static = %{version}-%{release} -Provides: %{name}-static%{?_isa} = %{version}-%{release} -%if %{defined ghc_version} -Requires: ghc-compiler = %{ghc_version} -%endif -Requires: %{name}%{?_isa} = %{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 -BuildArch: noarch -Requires: ghc-filesystem - -%description doc -This package provides the Haskell %{pkg_name} library documentation. -%endif - - -%if %{with ghc_prof} -%package prof -Summary: Haskell %{pkg_name} profiling library -Requires: %{name}-devel%{?_isa} = %{version}-%{release} -Supplements: (%{name}-devel and ghc-prof) - -%description prof -This package provides the Haskell %{pkg_name} profiling library. -%endif - - -%prep -# Begin cabal-rpm setup: -%setup -q -n %{pkgver} -%autopatch -p2 -# End cabal-rpm setup - - -%build -# Begin cabal-rpm build: -%ghc_lib_build -# End cabal-rpm build - - -%install -# Begin cabal-rpm install -%ghc_lib_install -# End cabal-rpm install - - -%files -f %{name}.files -# Begin cabal-rpm files: -%license LICENSE -# End cabal-rpm files - - -%files devel -f %{name}-devel.files - - -%if %{with haddock} -%files doc -f %{name}-doc.files -%license LICENSE -%endif - - -%if %{with ghc_prof} -%files prof -f %{name}-prof.files -%endif - - -%changelog -%autochangelog diff --git a/sources b/sources deleted file mode 100644 index 75da167..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (basement-0.0.16.tar.gz) = dde9a98047e8bece8d938161c95cc25a5924193a271e40120d3a96f02927b5050a8d3abed6c34ae1910bb17c07feb46664dca39d7ba594afc78c055ed27023d9