Compare commits

..

1 Commits

Author SHA1 Message Date
David Abdurachmanov 5b93fd1556
Rebuilt for Fedora/RISCV (riscv64); adding .rvreX to Release:
Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
2022-10-30 14:31:19 +02:00
5 changed files with 64 additions and 178 deletions

1
.gitignore vendored
View File

@ -5,4 +5,3 @@
/basement-0.0.11.tar.gz
/basement-0.0.12.tar.gz
/basement-0.0.14.tar.gz
/basement-0.0.15.tar.gz

View File

@ -1,105 +0,0 @@
diff -up basement-0.0.15/Basement/Bits.hs~ basement-0.0.15/Basement/Bits.hs
--- basement-0.0.15/Basement/Bits.hs~ 2022-02-28 12:00:48.000000000 +0800
+++ basement-0.0.15/Basement/Bits.hs 2023-02-16 18:50:32.947378064 +0800
@@ -54,7 +54,7 @@ import GHC.Int
import Basement.Compat.Primitive
#if WORD_SIZE_IN_BITS < 64
-import GHC.IntWord64
+import GHC.Exts
#endif
-- | operation over finite bits
diff -up basement-0.0.15/Basement/Numerical/Additive.hs~ basement-0.0.15/Basement/Numerical/Additive.hs
--- basement-0.0.15/Basement/Numerical/Additive.hs~ 2022-02-28 12:00:48.000000000 +0800
+++ basement-0.0.15/Basement/Numerical/Additive.hs 2023-02-16 18:52:14.547975419 +0800
@@ -29,7 +29,7 @@ import qualified Basement.Types.Word128
import qualified Basement.Types.Word256 as Word256
#if WORD_SIZE_IN_BITS < 64
-import GHC.IntWord64
+import GHC.Exts
#endif
-- | Represent class of things that can be added together,
diff -up basement-0.0.15/Basement/Numerical/Conversion.hs~ basement-0.0.15/Basement/Numerical/Conversion.hs
--- basement-0.0.15/Basement/Numerical/Conversion.hs~ 2022-02-28 12:00:48.000000000 +0800
+++ basement-0.0.15/Basement/Numerical/Conversion.hs 2023-02-16 18:28:38.844400110 +0800
@@ -25,7 +25,7 @@ import GHC.Word
import Basement.Compat.Primitive
#if WORD_SIZE_IN_BITS < 64
-import GHC.IntWord64
+import GHC.Exts
#endif
intToInt64 :: Int -> Int64
@@ -114,7 +114,7 @@
#endif
#else
word64ToWord32s :: Word64 -> Word32x2
-word64ToWord32s (W64# w64) = Word32x2 (W32# (word64ToWord# (uncheckedShiftRL64# w64 32#))) (W32# (word64ToWord# w64))
+word64ToWord32s (W64# w64) = Word32x2 (W32# (wordToWord32# (word64ToWord# (uncheckedShiftRL64# w64 32#)))) (W32# (wordToWord32# (word64ToWord# w64)))
#endif
wordToChar :: Word -> Char
diff -up basement-0.0.15/Basement/PrimType.hs~ basement-0.0.15/Basement/PrimType.hs
--- basement-0.0.15/Basement/PrimType.hs~ 2022-03-03 10:51:42.000000000 +0800
+++ basement-0.0.15/Basement/PrimType.hs 2023-02-16 18:52:13.884971521 +0800
@@ -54,7 +54,7 @@ import Basement.Nat
import qualified Prelude (quot)
#if WORD_SIZE_IN_BITS < 64
-import GHC.IntWord64
+import GHC.Exts
#endif
#ifdef FOUNDATION_BOUNDS_CHECK
diff -up basement-0.0.15/Basement/Types/OffsetSize.hs~ basement-0.0.15/Basement/Types/OffsetSize.hs
--- basement-0.0.15/Basement/Types/OffsetSize.hs~ 2019-09-02 11:58:08.000000000 +0800
+++ basement-0.0.15/Basement/Types/OffsetSize.hs 2023-02-16 18:49:45.703100306 +0800
@@ -69,7 +69,7 @@ import Data.List (foldl')
import qualified Prelude
#if WORD_SIZE_IN_BITS < 64
-import GHC.IntWord64
+import GHC.Exts
#endif
-- | File size in bytes
@@ -225,7 +225,7 @@
csizeOfSize :: CountOf Word8 -> CSize
#if WORD_SIZE_IN_BITS < 64
-csizeOfSize (CountOf (I# sz)) = CSize (W32# (int2Word# sz))
+csizeOfSize (CountOf (I# sz)) = CSize (W32# (wordToWord32# (int2Word# sz)))
#else
#if __GLASGOW_HASKELL__ >= 904
csizeOfSize (CountOf (I# sz)) = CSize (W64# (wordToWord64# (int2Word# sz)))
@@ -238,7 +238,7 @@
csizeOfOffset :: Offset8 -> CSize
#if WORD_SIZE_IN_BITS < 64
-csizeOfOffset (Offset (I# sz)) = CSize (W32# (int2Word# sz))
+csizeOfOffset (Offset (I# sz)) = CSize (W32# (wordToWord32# (int2Word# sz)))
#else
#if __GLASGOW_HASKELL__ >= 904
csizeOfOffset (Offset (I# sz)) = CSize (W64# (wordToWord64# (int2Word# sz)))
@@ -250,7 +250,7 @@
sizeOfCSSize :: CSsize -> CountOf Word8
sizeOfCSSize (CSsize (-1)) = error "invalid size: CSSize is -1"
#if WORD_SIZE_IN_BITS < 64
-sizeOfCSSize (CSsize (I32# sz)) = CountOf (I# sz)
+sizeOfCSSize (CSsize (I32# sz)) = CountOf (I# (int32ToInt# sz))
#else
#if __GLASGOW_HASKELL__ >= 904
sizeOfCSSize (CSsize (I64# sz)) = CountOf (I# (int64ToInt# sz))
@@ -261,7 +261,7 @@
sizeOfCSize :: CSize -> CountOf Word8
#if WORD_SIZE_IN_BITS < 64
-sizeOfCSize (CSize (W32# sz)) = CountOf (I# (word2Int# sz))
+sizeOfCSize (CSize (W32# sz)) = CountOf (I# (word2Int# (word32ToWord# sz)))
#else
#if __GLASGOW_HASKELL__ >= 904
sizeOfCSize (CSize (W64# sz)) = CountOf (I# (word2Int# (word64ToWord# sz)))

View File

@ -1,60 +0,0 @@
* Sun Jan 22 2023 Jens Petersen <petersen@redhat.com> - 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 <releng@fedoraproject.org> - 0.0.14-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Tue Jun 07 2022 Jens Petersen <petersen@redhat.com> - 0.0.14-1
- https://hackage.haskell.org/package/basement-0.0.14/changelog
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.12-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Thu Aug 5 2021 Jens Petersen <petersen@redhat.com> - 0.0.12-1
- update to 0.0.12
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.11-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.11-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.11-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Fri Jul 17 2020 Jens Petersen <petersen@redhat.com> - 0.0.11-2
- refresh to cabal-rpm-2.0.6
* Sun Feb 09 2020 Jens Petersen <petersen@redhat.com> - 0.0.11-1
- update to 0.0.11
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.10-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Thu Jul 25 2019 Jens Petersen <petersen@redhat.com> - 0.0.10-1
- update to 0.0.10
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.8-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Sun Feb 17 2019 Jens Petersen <petersen@redhat.com> - 0.0.8-3
- refresh to cabal-rpm-0.13
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.8-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Thu Jul 26 2018 Jens Petersen <petersen@redhat.com> - 0.0.8-1
- update to 0.0.8
* Sun Jul 22 2018 Jens Petersen <petersen@redhat.com> - 0.0.7-1
- update to 0.0.7
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.4-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Fri Feb 23 2018 Jens Petersen <petersen@redhat.com> - 0.0.4-3
- bump over foundation
* Sat Jan 27 2018 Fedora Haskell SIG <haskell@lists.fedoraproject.org> - 0.0.4-1
- spec file generated by cabal-rpm-0.12

View File

@ -1,29 +1,24 @@
# generated by cabal-rpm-2.1.0
# generated by cabal-rpm-2.0.9
# 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.15
Release: %autorelease
Version: 0.0.14
Release: 2%{?dist}.rvre0
Summary: Foundation scrap box of array & string
License: BSD-3-Clause
License: BSD
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: basement-32bit-prim.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
@ -69,7 +64,6 @@ This package provides the Haskell %{pkg_name} profiling library.
# Begin cabal-rpm setup:
%setup -q -n %{pkgver}
# End cabal-rpm setup
%patch0 -p1 -b .orig
%build
@ -105,4 +99,62 @@ This package provides the Haskell %{pkg_name} profiling library.
%changelog
%autochangelog
* Sun Oct 30 2022 David Abdurachmanov <davidlt@rivosinc.com> - 0.0.14-2.rvre0
- Rebuilt for Fedora/RISCV (riscv64)
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.14-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Tue Jun 07 2022 Jens Petersen <petersen@redhat.com> - 0.0.14-1
- https://hackage.haskell.org/package/basement-0.0.14/changelog
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.12-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Thu Aug 5 2021 Jens Petersen <petersen@redhat.com> - 0.0.12-1
- update to 0.0.12
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.11-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.11-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.11-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Fri Jul 17 2020 Jens Petersen <petersen@redhat.com> - 0.0.11-2
- refresh to cabal-rpm-2.0.6
* Sun Feb 09 2020 Jens Petersen <petersen@redhat.com> - 0.0.11-1
- update to 0.0.11
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.10-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Thu Jul 25 2019 Jens Petersen <petersen@redhat.com> - 0.0.10-1
- update to 0.0.10
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.8-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Sun Feb 17 2019 Jens Petersen <petersen@redhat.com> - 0.0.8-3
- refresh to cabal-rpm-0.13
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.8-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Thu Jul 26 2018 Jens Petersen <petersen@redhat.com> - 0.0.8-1
- update to 0.0.8
* Sun Jul 22 2018 Jens Petersen <petersen@redhat.com> - 0.0.7-1
- update to 0.0.7
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.4-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Fri Feb 23 2018 Jens Petersen <petersen@redhat.com> - 0.0.4-3
- bump over foundation
* Sat Jan 27 2018 Fedora Haskell SIG <haskell@lists.fedoraproject.org> - 0.0.4-1
- spec file generated by cabal-rpm-0.12

View File

@ -1 +1 @@
SHA512 (basement-0.0.15.tar.gz) = bc69bf67685e3bf6abaab2f7b85233de7926906d4ca646a00c8c8f09ca32672090b28348e35b5a71af7ed3b1c4416b5aab4b2865502f99515342c0b457c38e28
SHA512 (basement-0.0.14.tar.gz) = f18f07be0e70d93ac357fd443d74c24bdec5166bb5fc3ce9ed89bb46549fec7dd37e14cbbb28872e49c2314d738dcc6d7adfe0c4862a745f5616e9f6aa137d31