* [gentoo-commits] repo/gentoo:master commit in: dev-libs/crc32c/, dev-libs/crc32c/files/
@ 2021-09-05 16:41 Arthur Zamarin
0 siblings, 0 replies; 3+ messages in thread
From: Arthur Zamarin @ 2021-09-05 16:41 UTC (permalink / raw
To: gentoo-commits
commit: 3c7d0c1fc96b5b4dd4ad858e4a27a0d06c823478
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 5 16:36:30 2021 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Sep 5 16:40:19 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c7d0c1f
dev-libs/crc32c: fix for big endian systems
Closes: https://bugs.gentoo.org/810688
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
...{crc32c-1.0.6.ebuild => crc32c-1.0.6-r1.ebuild} | 4 +++
.../crc32c/files/crc32c-1.0.6-fix-big-endian.patch | 29 ++++++++++++++++++++++
2 files changed, 33 insertions(+)
diff --git a/dev-libs/crc32c/crc32c-1.0.6.ebuild b/dev-libs/crc32c/crc32c-1.0.6-r1.ebuild
similarity index 92%
rename from dev-libs/crc32c/crc32c-1.0.6.ebuild
rename to dev-libs/crc32c/crc32c-1.0.6-r1.ebuild
index baf1e8683e9..53b6e710e34 100644
--- a/dev-libs/crc32c/crc32c-1.0.6.ebuild
+++ b/dev-libs/crc32c/crc32c-1.0.6-r1.ebuild
@@ -13,6 +13,10 @@ LICENSE="BSD"
SLOT="0"
KEYWORDS="amd64 ~riscv x86"
+PATCHES=(
+ "${FILESDIR}/${P}-fix-big-endian.patch"
+)
+
DOCS=( README.md )
src_prepare() {
diff --git a/dev-libs/crc32c/files/crc32c-1.0.6-fix-big-endian.patch b/dev-libs/crc32c/files/crc32c-1.0.6-fix-big-endian.patch
new file mode 100644
index 00000000000..3bd09930946
--- /dev/null
+++ b/dev-libs/crc32c/files/crc32c-1.0.6-fix-big-endian.patch
@@ -0,0 +1,29 @@
+From: Pieter Wuille <github-sipa@wuille.net>
+Date: Thu, 18 Jun 2020 21:05:38 -0700
+Subject: [PATCH] Fix (unused) ReadUint64LE for BE machines (#41)
+
+--- a/src/crc32c_read_le.h
++++ b/src/crc32c_read_le.h
+@@ -30,14 +30,14 @@ inline uint32_t ReadUint32LE(const uint8_t* buffer) {
+ // Reads a little-endian 64-bit integer from a 64-bit-aligned buffer.
+ inline uint64_t ReadUint64LE(const uint8_t* buffer) {
+ #if BYTE_ORDER_BIG_ENDIAN
+- return ((static_cast<uint32_t>(static_cast<uint8_t>(buffer[0]))) |
+- (static_cast<uint32_t>(static_cast<uint8_t>(buffer[1])) << 8) |
+- (static_cast<uint32_t>(static_cast<uint8_t>(buffer[2])) << 16) |
+- (static_cast<uint32_t>(static_cast<uint8_t>(buffer[3])) << 24) |
+- (static_cast<uint32_t>(static_cast<uint8_t>(buffer[4])) << 32) |
+- (static_cast<uint32_t>(static_cast<uint8_t>(buffer[5])) << 40) |
+- (static_cast<uint32_t>(static_cast<uint8_t>(buffer[6])) << 48) |
+- (static_cast<uint32_t>(static_cast<uint8_t>(buffer[7])) << 56));
++ return ((static_cast<uint64_t>(static_cast<uint8_t>(buffer[0]))) |
++ (static_cast<uint64_t>(static_cast<uint8_t>(buffer[1])) << 8) |
++ (static_cast<uint64_t>(static_cast<uint8_t>(buffer[2])) << 16) |
++ (static_cast<uint64_t>(static_cast<uint8_t>(buffer[3])) << 24) |
++ (static_cast<uint64_t>(static_cast<uint8_t>(buffer[4])) << 32) |
++ (static_cast<uint64_t>(static_cast<uint8_t>(buffer[5])) << 40) |
++ (static_cast<uint64_t>(static_cast<uint8_t>(buffer[6])) << 48) |
++ (static_cast<uint64_t>(static_cast<uint8_t>(buffer[7])) << 56));
+ #else // !BYTE_ORDER_BIG_ENDIAN
+ uint64_t result;
+ // This should be optimized to a single instruction.
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/crc32c/, dev-libs/crc32c/files/
@ 2021-09-05 17:17 Arthur Zamarin
0 siblings, 0 replies; 3+ messages in thread
From: Arthur Zamarin @ 2021-09-05 17:17 UTC (permalink / raw
To: gentoo-commits
commit: 6ba91da085f30cec77287139c2919281ee62ffe9
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 5 17:17:24 2021 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Sep 5 17:17:31 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ba91da0
dev-libs/crc32c: add 1.1.1, enable tests
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-libs/crc32c/Manifest | 1 +
dev-libs/crc32c/crc32c-1.1.1.ebuild | 40 ++++++++++++++++++++++
.../files/crc32c-1.1.1-system-testdeps.patch | 21 ++++++++++++
3 files changed, 62 insertions(+)
diff --git a/dev-libs/crc32c/Manifest b/dev-libs/crc32c/Manifest
index 2c2ab2c4bfe..8de75e4baf5 100644
--- a/dev-libs/crc32c/Manifest
+++ b/dev-libs/crc32c/Manifest
@@ -1 +1,2 @@
DIST crc32c-1.0.6.tar.gz 29596 BLAKE2B 5806e0a48cb3048c9b07abb75eb232491483176bbeb98bc11ad1b0ef7d4ce89929ad20b0354906fd67e8773541f9913f3948f1db9a3f3987fe7e2ca67e9d2467 SHA512 c30f6510d6348f15dcdddc06e375f21a69681cd615483d67628b32de747e5e98200fa49faf7e3fc30a1302991fd1f9c9a706c9eb4e13c9c6c09e74066474ea7b
+DIST crc32c-1.1.1.tar.gz 29829 BLAKE2B 5ffb0809e80d1fad81a77d96683d44142a7d84fc15ce18070cdcdb12fd9b67f7ec732a53d8af7dc4b77add859bf64c4fa8bc52a593830de931a7bd12c60498cc SHA512 c276160ec960a38cd535c998336472694819bc6eb37beb711bd43a31441d1808c8a14d3a1f0eccc780785b19f739a4a51f923867a20b0707c465e0cc03f457e9
diff --git a/dev-libs/crc32c/crc32c-1.1.1.ebuild b/dev-libs/crc32c/crc32c-1.1.1.ebuild
new file mode 100644
index 00000000000..e1e32e72d22
--- /dev/null
+++ b/dev-libs/crc32c/crc32c-1.1.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="CRC32C implementation with support for CPU-specific acceleration instructions"
+HOMEPAGE="https://github.com/google/crc32c"
+SRC_URI="https://github.com/google/crc32c/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( dev-cpp/gtest )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.0.6-fix-big-endian.patch"
+ "${FILESDIR}/${PN}-1.1.1-system-testdeps.patch"
+)
+
+DOCS=( README.md )
+
+src_prepare() {
+ sed -e '/-Werror/d' -i CMakeLists.txt || die
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DCRC32C_BUILD_TESTS=$(usex test)
+ -DCRC32C_BUILD_BENCHMARKS=OFF
+ -DCRC32C_USE_GLOG=OFF
+ )
+
+ cmake_src_configure
+}
diff --git a/dev-libs/crc32c/files/crc32c-1.1.1-system-testdeps.patch b/dev-libs/crc32c/files/crc32c-1.1.1-system-testdeps.patch
new file mode 100644
index 00000000000..da513c5d4ed
--- /dev/null
+++ b/dev-libs/crc32c/files/crc32c-1.1.1-system-testdeps.patch
@@ -0,0 +1,21 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8490728..c7f0952 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -315,15 +315,7 @@ if(CRC32C_BUILD_TESTS)
+ set(install_gmock OFF)
+
+ # This project is tested using GoogleTest.
+- add_subdirectory("third_party/googletest")
+-
+- # GoogleTest triggers a missing field initializers warning.
+- if(CRC32C_HAVE_NO_MISSING_FIELD_INITIALIZERS)
+- set_property(TARGET gtest
+- APPEND PROPERTY COMPILE_OPTIONS -Wno-missing-field-initializers)
+- set_property(TARGET gmock
+- APPEND PROPERTY COMPILE_OPTIONS -Wno-missing-field-initializers)
+- endif(CRC32C_HAVE_NO_MISSING_FIELD_INITIALIZERS)
++ find_package(GTest REQUIRED)
+
+ add_executable(crc32c_tests "")
+ target_sources(crc32c_tests
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/crc32c/, dev-libs/crc32c/files/
@ 2023-01-28 9:12 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2023-01-28 9:12 UTC (permalink / raw
To: gentoo-commits
commit: 006b82f11d30e433100630bc157ac7d564ce076c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 27 20:39:52 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jan 28 09:11:48 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=006b82f1
dev-libs/crc32c: drop 1.0.6-r1, 1.1.1, EAPI-7--
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-libs/crc32c/Manifest | 2 --
dev-libs/crc32c/crc32c-1.0.6-r1.ebuild | 35 -------------------
dev-libs/crc32c/crc32c-1.1.1.ebuild | 40 ----------------------
.../crc32c/files/crc32c-1.0.6-fix-big-endian.patch | 29 ----------------
4 files changed, 106 deletions(-)
diff --git a/dev-libs/crc32c/Manifest b/dev-libs/crc32c/Manifest
index 47e69b3b18f9..9cc211885656 100644
--- a/dev-libs/crc32c/Manifest
+++ b/dev-libs/crc32c/Manifest
@@ -1,3 +1 @@
-DIST crc32c-1.0.6.tar.gz 29596 BLAKE2B 5806e0a48cb3048c9b07abb75eb232491483176bbeb98bc11ad1b0ef7d4ce89929ad20b0354906fd67e8773541f9913f3948f1db9a3f3987fe7e2ca67e9d2467 SHA512 c30f6510d6348f15dcdddc06e375f21a69681cd615483d67628b32de747e5e98200fa49faf7e3fc30a1302991fd1f9c9a706c9eb4e13c9c6c09e74066474ea7b
-DIST crc32c-1.1.1.tar.gz 29829 BLAKE2B 5ffb0809e80d1fad81a77d96683d44142a7d84fc15ce18070cdcdb12fd9b67f7ec732a53d8af7dc4b77add859bf64c4fa8bc52a593830de931a7bd12c60498cc SHA512 c276160ec960a38cd535c998336472694819bc6eb37beb711bd43a31441d1808c8a14d3a1f0eccc780785b19f739a4a51f923867a20b0707c465e0cc03f457e9
DIST crc32c-1.1.2.tar.gz 29819 BLAKE2B f48720e632b6a4aaab9591651ed92b268bc8fc5faacb01888094af86ecc9dec901be6edc419c534aebf94ade5a2ce2347c0ff2962ba57c62627d6d7c420fc23b SHA512 6325c52b5a6850b9f90086e0c0c86798c008af36e7cfd3a0216184a2d37b3bf7323481ddc6bfe4cbd5b31288b3ee6c69772d03085a13094cf95d00a9756a7196
diff --git a/dev-libs/crc32c/crc32c-1.0.6-r1.ebuild b/dev-libs/crc32c/crc32c-1.0.6-r1.ebuild
deleted file mode 100644
index 53b6e710e340..000000000000
--- a/dev-libs/crc32c/crc32c-1.0.6-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="CRC32C implementation with support for CPU-specific acceleration instructions"
-HOMEPAGE="https://github.com/google/crc32c"
-SRC_URI="https://github.com/google/crc32c/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-PATCHES=(
- "${FILESDIR}/${P}-fix-big-endian.patch"
-)
-
-DOCS=( README.md )
-
-src_prepare() {
- sed -e '/-Werror/d' -i CMakeLists.txt || die
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DCRC32C_BUILD_TESTS=OFF
- -DCRC32C_BUILD_BENCHMARKS=OFF
- -DCRC32C_USE_GLOG=OFF
- )
-
- cmake_src_configure
-}
diff --git a/dev-libs/crc32c/crc32c-1.1.1.ebuild b/dev-libs/crc32c/crc32c-1.1.1.ebuild
deleted file mode 100644
index 0086632b41ee..000000000000
--- a/dev-libs/crc32c/crc32c-1.1.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="CRC32C implementation with support for CPU-specific acceleration instructions"
-HOMEPAGE="https://github.com/google/crc32c"
-SRC_URI="https://github.com/google/crc32c/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~riscv ~sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( dev-cpp/gtest )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.0.6-fix-big-endian.patch"
- "${FILESDIR}/${PN}-1.1.1-system-testdeps.patch"
-)
-
-DOCS=( README.md )
-
-src_prepare() {
- sed -e '/-Werror/d' -i CMakeLists.txt || die
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DCRC32C_BUILD_TESTS=$(usex test)
- -DCRC32C_BUILD_BENCHMARKS=OFF
- -DCRC32C_USE_GLOG=OFF
- )
-
- cmake_src_configure
-}
diff --git a/dev-libs/crc32c/files/crc32c-1.0.6-fix-big-endian.patch b/dev-libs/crc32c/files/crc32c-1.0.6-fix-big-endian.patch
deleted file mode 100644
index 3bd09930946a..000000000000
--- a/dev-libs/crc32c/files/crc32c-1.0.6-fix-big-endian.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Pieter Wuille <github-sipa@wuille.net>
-Date: Thu, 18 Jun 2020 21:05:38 -0700
-Subject: [PATCH] Fix (unused) ReadUint64LE for BE machines (#41)
-
---- a/src/crc32c_read_le.h
-+++ b/src/crc32c_read_le.h
-@@ -30,14 +30,14 @@ inline uint32_t ReadUint32LE(const uint8_t* buffer) {
- // Reads a little-endian 64-bit integer from a 64-bit-aligned buffer.
- inline uint64_t ReadUint64LE(const uint8_t* buffer) {
- #if BYTE_ORDER_BIG_ENDIAN
-- return ((static_cast<uint32_t>(static_cast<uint8_t>(buffer[0]))) |
-- (static_cast<uint32_t>(static_cast<uint8_t>(buffer[1])) << 8) |
-- (static_cast<uint32_t>(static_cast<uint8_t>(buffer[2])) << 16) |
-- (static_cast<uint32_t>(static_cast<uint8_t>(buffer[3])) << 24) |
-- (static_cast<uint32_t>(static_cast<uint8_t>(buffer[4])) << 32) |
-- (static_cast<uint32_t>(static_cast<uint8_t>(buffer[5])) << 40) |
-- (static_cast<uint32_t>(static_cast<uint8_t>(buffer[6])) << 48) |
-- (static_cast<uint32_t>(static_cast<uint8_t>(buffer[7])) << 56));
-+ return ((static_cast<uint64_t>(static_cast<uint8_t>(buffer[0]))) |
-+ (static_cast<uint64_t>(static_cast<uint8_t>(buffer[1])) << 8) |
-+ (static_cast<uint64_t>(static_cast<uint8_t>(buffer[2])) << 16) |
-+ (static_cast<uint64_t>(static_cast<uint8_t>(buffer[3])) << 24) |
-+ (static_cast<uint64_t>(static_cast<uint8_t>(buffer[4])) << 32) |
-+ (static_cast<uint64_t>(static_cast<uint8_t>(buffer[5])) << 40) |
-+ (static_cast<uint64_t>(static_cast<uint8_t>(buffer[6])) << 48) |
-+ (static_cast<uint64_t>(static_cast<uint8_t>(buffer[7])) << 56));
- #else // !BYTE_ORDER_BIG_ENDIAN
- uint64_t result;
- // This should be optimized to a single instruction.
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-01-28 9:12 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-09-05 16:41 [gentoo-commits] repo/gentoo:master commit in: dev-libs/crc32c/, dev-libs/crc32c/files/ Arthur Zamarin
-- strict thread matches above, loose matches on Subject: below --
2021-09-05 17:17 Arthur Zamarin
2023-01-28 9:12 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox