* [gentoo-commits] repo/gentoo:master commit in: app-arch/snappy/, app-arch/snappy/files/
@ 2017-07-14 4:12 Michał Górny
0 siblings, 0 replies; 5+ messages in thread
From: Michał Górny @ 2017-07-14 4:12 UTC (permalink / raw
To: gentoo-commits
commit: ff285f3f5ff70506351158dbc5f64b7f951fb860
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 14 04:11:41 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jul 14 04:12:10 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff285f3f
app-arch/snappy: Bump to 1.1.6 that includes SONAME fix
app-arch/snappy/Manifest | 2 +-
...1-cmake-Use-GNUInstallDirs-to-provide-configurable-cor.patch} | 9 +++++----
...appy-1.1.6-0002-cmake-Correct-unify-CMake-install-path.patch} | 8 ++++----
....1.6-0003-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch} | 6 +++---
app-arch/snappy/{snappy-1.1.5.ebuild => snappy-1.1.6.ebuild} | 9 ++++-----
5 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/app-arch/snappy/Manifest b/app-arch/snappy/Manifest
index 23b469f7acc..9f20015b497 100644
--- a/app-arch/snappy/Manifest
+++ b/app-arch/snappy/Manifest
@@ -1,3 +1,3 @@
DIST snappy-1.1.2.tar.gz 1485435 SHA256 f9d8fe1c85494f62dbfa3efe8e73bc23d8dec7a254ff7fe09ec4b0ebfc586af4 SHA512 da0e80528dfc815d765347c60dc5f14bc7fb882cc6894b87d3a43dec1a127cf8bcfe46e6cb93e130790c0ebd67368a1042500d9080f844441803c1b69c3cc07e WHIRLPOOL a9cf520cc578a0a63ebb7fb127428b50d282cdf2448938ad88349f775e21b3dd27f2c6843f86dd749d66e9df5e29094bc5c67032f0219932fec69f882ec91246
DIST snappy-1.1.3.tar.gz 1509026 SHA256 2f1e82adf0868c9e26a5a7a3115111b6da7e432ddbac268a7ca2fae2a247eef3 SHA512 4c4f47c657a072989179be9df0e5e98d14f4a67c27ec7ae0e5a15d14289a75d4e266bc6c5c89723f3e9860408ffcc7138a815f8ad9299407c4a1946fc00ab5bf WHIRLPOOL 97f82d1439973582f0ba3fde43ba2ee2c23b2512e0ee426b9e372fbfbba87921355c1f6bf0bf80671d7c4da26a23d480508cb7a188e414b9cb5d95996bfabe39
-DIST snappy-1.1.5.tar.gz 1128197 SHA256 c67d8d23387b1902ceff134af26e401d5412c510adeeabe6bb6b47c106b08e45 SHA512 99f29f3b4ada0b25692f594a17c0c4b2625fb6c6ffbc875b8dd940fd8080f1e9afdb000c866380f2375246e7b3fbab8521e1bb4d226789798459c628318d571b WHIRLPOOL f0947129ab01bf9545bc5138a5382c555ff1f1b032fe9d53f045ef07ddc79ad0bc2a7fbdd6d058e126b07942c43fa155de2af5070d1df8edbaa677184d63f684
+DIST snappy-1.1.6.tar.gz 1128388 SHA256 6fa92cde5b2caefd0d9a60336991ba42e5a7ddc3bdc36c5610451373751d0495 SHA512 38698b7ff03b39528de88bf62a84fcfc6f3dce2e98efa25a97ebdf396b6aba49860072ffa99830323944ab41c3721a3c53ff2636beb3422d5f812e84afe8dadf WHIRLPOOL 87ee2fd77e4c68911d5bd5c5a278460b8e4200a2b4c96a454b2af0b61444588dfad68015effd22bebfb2bf8f9d3e0c6b8f8cc3e89614626f0bc1f91b18402eec
diff --git a/app-arch/snappy/files/snappy-1.1.5-0001-cmake-Use-GNUInstallDirs-to-provide-configurable-cor.patch b/app-arch/snappy/files/snappy-1.1.6-0001-cmake-Use-GNUInstallDirs-to-provide-configurable-cor.patch
similarity index 92%
rename from app-arch/snappy/files/snappy-1.1.5-0001-cmake-Use-GNUInstallDirs-to-provide-configurable-cor.patch
rename to app-arch/snappy/files/snappy-1.1.6-0001-cmake-Use-GNUInstallDirs-to-provide-configurable-cor.patch
index 468a11618c3..b83bc93465a 100644
--- a/app-arch/snappy/files/snappy-1.1.5-0001-cmake-Use-GNUInstallDirs-to-provide-configurable-cor.patch
+++ b/app-arch/snappy/files/snappy-1.1.6-0001-cmake-Use-GNUInstallDirs-to-provide-configurable-cor.patch
@@ -1,4 +1,4 @@
-From a35f15515db7cdfdee2b7fd04624d1b6c9a8a6bc Mon Sep 17 00:00:00 2001
+From 7507c5fcadc53894b128f3b9fc4b073d15564704 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
Date: Thu, 29 Jun 2017 11:12:44 +0200
Subject: [PATCH 1/3] cmake: Use GNUInstallDirs to provide configurable &
@@ -15,7 +15,7 @@ directory, it is simpler to reuse what's already in CMake.
2 files changed, 13 insertions(+), 16 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2c79e46..adda7fa 100644
+index de52666..1ca77c1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,6 +8,7 @@ INCLUDE(CheckLibraryExists)
@@ -26,7 +26,7 @@ index 2c79e46..adda7fa 100644
TEST_BIG_ENDIAN(WORDS_BIG_ENDIAN)
IF (WORDS_BIG_ENDIAN)
-@@ -98,32 +99,28 @@ INSTALL(FILES snappy.h
+@@ -98,33 +99,29 @@ INSTALL(FILES snappy.h
snappy-c.h
snappy-sinksource.h
${Snappy_BINARY_DIR}/snappy-stubs-public.h
@@ -44,7 +44,8 @@ index 2c79e46..adda7fa 100644
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+INSTALL(EXPORT SnappyTargets NAMESPACE Snappy:: DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Snappy)
- SET_TARGET_PROPERTIES(snappy PROPERTIES SOVERSION ${PROJECT_VERSION})
+ SET_TARGET_PROPERTIES(snappy PROPERTIES VERSION ${PROJECT_VERSION}
+ SOVERSION ${PROJECT_VERSION_MAJOR})
-SET(INCLUDE_INSTALL_DIR include)
-SET(LIBRARY_INSTALL_DIR lib)
diff --git a/app-arch/snappy/files/snappy-1.1.5-0002-cmake-Correct-unify-CMake-install-path.patch b/app-arch/snappy/files/snappy-1.1.6-0002-cmake-Correct-unify-CMake-install-path.patch
similarity index 82%
rename from app-arch/snappy/files/snappy-1.1.5-0002-cmake-Correct-unify-CMake-install-path.patch
rename to app-arch/snappy/files/snappy-1.1.6-0002-cmake-Correct-unify-CMake-install-path.patch
index ab241275791..0b7faa08772 100644
--- a/app-arch/snappy/files/snappy-1.1.5-0002-cmake-Correct-unify-CMake-install-path.patch
+++ b/app-arch/snappy/files/snappy-1.1.6-0002-cmake-Correct-unify-CMake-install-path.patch
@@ -1,4 +1,4 @@
-From 0f0ff7be9bd4d2ad2cd7e5c6092b1d0261c09335 Mon Sep 17 00:00:00 2001
+From e801bd3553dc4e49e19a031ce4007620c35764f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
Date: Thu, 29 Jun 2017 11:14:37 +0200
Subject: [PATCH 2/3] cmake: Correct & unify CMake install path
@@ -11,10 +11,10 @@ and 'lib/cmake' inconsistently. Replace all of them with a single
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index adda7fa..b88cb20 100644
+index 1ca77c1..3d1a304 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -112,7 +112,7 @@ SET_TARGET_PROPERTIES(snappy PROPERTIES SOVERSION ${PROJECT_VERSION})
+@@ -113,7 +113,7 @@ SET_TARGET_PROPERTIES(snappy PROPERTIES VERSION ${PROJECT_VERSION}
CONFIGURE_PACKAGE_CONFIG_FILE(cmake/SnappyConfig.cmake.in
${Snappy_BINARY_DIR}/SnappyConfig.cmake
@@ -23,7 +23,7 @@ index adda7fa..b88cb20 100644
PATH_VARS CMAKE_INSTALL_INCLUDEDIR CMAKE_INSTALL_LIBDIR CMAKE_INSTALL_BINDIR
)
-@@ -120,7 +120,7 @@ WRITE_BASIC_PACKAGE_VERSION_FILE(${Snappy_BINARY_DIR}/SnappyConfigVersion.cmake
+@@ -121,7 +121,7 @@ WRITE_BASIC_PACKAGE_VERSION_FILE(${Snappy_BINARY_DIR}/SnappyConfigVersion.cmake
COMPATIBILITY SameMajorVersion)
INSTALL(FILES ${Snappy_BINARY_DIR}/SnappyConfig.cmake
${Snappy_BINARY_DIR}/SnappyConfigVersion.cmake
diff --git a/app-arch/snappy/files/snappy-1.1.5-0003-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch b/app-arch/snappy/files/snappy-1.1.6-0003-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch
similarity index 87%
rename from app-arch/snappy/files/snappy-1.1.5-0003-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch
rename to app-arch/snappy/files/snappy-1.1.6-0003-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch
index 3d7d8fcb59d..b1b8a2cd5e9 100644
--- a/app-arch/snappy/files/snappy-1.1.5-0003-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch
+++ b/app-arch/snappy/files/snappy-1.1.6-0003-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch
@@ -1,4 +1,4 @@
-From 57b13b68466e2ac81d8faa2c92f55e629a3184f8 Mon Sep 17 00:00:00 2001
+From 93d30c53e28759c9dbe82535821f3b1df29e5767 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
Date: Thu, 29 Jun 2017 10:01:37 +0200
Subject: [PATCH 3/3] cmake: Add missing linking to GTEST_LIBRARIES
@@ -11,10 +11,10 @@ to unavailable gtest symbols.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b88cb20..bbe4d38 100644
+index 3d1a304..9f2cc23 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -143,7 +143,7 @@ ENDIF (HAVE_LIBQUICKLZ)
+@@ -144,7 +144,7 @@ ENDIF (HAVE_LIBQUICKLZ)
ADD_EXECUTABLE(snappy-unittest snappy_unittest.cc snappy-test.cc)
TARGET_COMPILE_DEFINITIONS(snappy-unittest PRIVATE -DHAVE_CONFIG_H)
TARGET_LINK_LIBRARIES(snappy-unittest snappy ${COMPRESSION_LIBS}
diff --git a/app-arch/snappy/snappy-1.1.5.ebuild b/app-arch/snappy/snappy-1.1.6.ebuild
similarity index 89%
rename from app-arch/snappy/snappy-1.1.5.ebuild
rename to app-arch/snappy/snappy-1.1.6.ebuild
index d1daec39ebb..bd50aa80144 100644
--- a/app-arch/snappy/snappy-1.1.5.ebuild
+++ b/app-arch/snappy/snappy-1.1.6.ebuild
@@ -9,8 +9,7 @@ HOMEPAGE="https://github.com/google/snappy"
SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
-# matches SONAME...
-SLOT="0/${PV}"
+SLOT="0/${PV%%.*}"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
IUSE="static-libs test"
# upstream killed static lib support with build system update
@@ -29,9 +28,9 @@ DOCS=( format_description.txt framing_format.txt NEWS README.md )
src_prepare() {
local PATCHES=(
- "${FILESDIR}"/snappy-1.1.5-0001-cmake-Use-GNUInstallDirs-to-provide-configurable-cor.patch
- "${FILESDIR}"/snappy-1.1.5-0002-cmake-Correct-unify-CMake-install-path.patch
- "${FILESDIR}"/snappy-1.1.5-0003-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch
+ "${FILESDIR}"/snappy-1.1.6-0001-cmake-Use-GNUInstallDirs-to-provide-configurable-cor.patch
+ "${FILESDIR}"/snappy-1.1.6-0002-cmake-Correct-unify-CMake-install-path.patch
+ "${FILESDIR}"/snappy-1.1.6-0003-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch
)
# command-line option parsing does not work at all, so just force
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-arch/snappy/, app-arch/snappy/files/
@ 2017-08-25 13:01 Michał Górny
0 siblings, 0 replies; 5+ messages in thread
From: Michał Górny @ 2017-08-25 13:01 UTC (permalink / raw
To: gentoo-commits
commit: 6d52d0ad4a081351b41371668330f880262ca5ac
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 25 11:50:38 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Aug 25 13:01:01 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d52d0ad
app-arch/snappy: Bump to 1.1.7
app-arch/snappy/Manifest | 1 +
...ke-Add-missing-linking-to-GTEST_LIBRARIES.patch | 31 +++++++++++
app-arch/snappy/snappy-1.1.7.ebuild | 64 ++++++++++++++++++++++
3 files changed, 96 insertions(+)
diff --git a/app-arch/snappy/Manifest b/app-arch/snappy/Manifest
index b72e53b2017..b7252570e19 100644
--- a/app-arch/snappy/Manifest
+++ b/app-arch/snappy/Manifest
@@ -1,2 +1,3 @@
DIST snappy-1.1.3.tar.gz 1509026 SHA256 2f1e82adf0868c9e26a5a7a3115111b6da7e432ddbac268a7ca2fae2a247eef3 SHA512 4c4f47c657a072989179be9df0e5e98d14f4a67c27ec7ae0e5a15d14289a75d4e266bc6c5c89723f3e9860408ffcc7138a815f8ad9299407c4a1946fc00ab5bf WHIRLPOOL 97f82d1439973582f0ba3fde43ba2ee2c23b2512e0ee426b9e372fbfbba87921355c1f6bf0bf80671d7c4da26a23d480508cb7a188e414b9cb5d95996bfabe39
DIST snappy-1.1.6.tar.gz 1128388 SHA256 6fa92cde5b2caefd0d9a60336991ba42e5a7ddc3bdc36c5610451373751d0495 SHA512 38698b7ff03b39528de88bf62a84fcfc6f3dce2e98efa25a97ebdf396b6aba49860072ffa99830323944ab41c3721a3c53ff2636beb3422d5f812e84afe8dadf WHIRLPOOL 87ee2fd77e4c68911d5bd5c5a278460b8e4200a2b4c96a454b2af0b61444588dfad68015effd22bebfb2bf8f9d3e0c6b8f8cc3e89614626f0bc1f91b18402eec
+DIST snappy-1.1.7.tar.gz 1090550 SHA256 3dfa02e873ff51a11ee02b9ca391807f0c8ea0529a4924afa645fbf97163f9d4 SHA512 32046f532606ba545a4e4825c0c66a19be449f2ca2ff760a6fa170a3603731479a7deadb683546e5f8b5033414c50f4a9a29f6d23b7a41f047e566e69eca7caf WHIRLPOOL ed5dacdbdcbfbe88982b23d389d781548bf8780c1ecb9b99c8a09442821a97b6aca2fe5eec86b8db1c8e305e17b381391a595d5abacd24b9ace5048dc64cf232
diff --git a/app-arch/snappy/files/snappy-1.1.7-0001-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch b/app-arch/snappy/files/snappy-1.1.7-0001-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch
new file mode 100644
index 00000000000..3327b8bcf0a
--- /dev/null
+++ b/app-arch/snappy/files/snappy-1.1.7-0001-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch
@@ -0,0 +1,31 @@
+From 1c9f699a6275f085ad710c9ae940e096ce552452 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Mon, 31 Jul 2017 20:49:22 +0200
+Subject: [PATCH] cmake: Add missing linking to GTEST_LIBRARIES
+
+Since the snappy_unittest target uses gtest routines (when available),
+it needs to link to gtest explicitly. Otherwise, the build fails due
+to unavailable gtest symbols.
+---
+ CMakeLists.txt | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3f534b1..3a44aa9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -118,7 +118,10 @@ if(SNAPPY_BUILD_TESTS)
+ "${PROJECT_SOURCE_DIR}/snappy-test.cc"
+ )
+ target_compile_definitions(snappy_unittest PRIVATE -DHAVE_CONFIG_H)
+- target_link_libraries(snappy_unittest snappy ${GFLAGS_LIBRARIES})
++ target_link_libraries(snappy_unittest
++ snappy
++ ${GFLAGS_LIBRARIES}
++ ${GTEST_LIBRARIES})
+
+ if(HAVE_LIBZ)
+ target_link_libraries(snappy_unittest z)
+--
+2.14.1
+
diff --git a/app-arch/snappy/snappy-1.1.7.ebuild b/app-arch/snappy/snappy-1.1.7.ebuild
new file mode 100644
index 00000000000..c87bf5a2015
--- /dev/null
+++ b/app-arch/snappy/snappy-1.1.7.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-multilib
+
+DESCRIPTION="A high-speed compression/decompression library by Google"
+HOMEPAGE="https://github.com/google/snappy"
+SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV%%.*}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+IUSE="static-libs test"
+# upstream killed static lib support with build system update
+# (and we have packages depending on the flag)
+REQUIRED_USE="!static-libs"
+
+# all test dependencies are optional:
+# - gflags-2.2 is supposedly needed for command-line option parsing
+# but it's a huge hack and does not work,
+# - gtest probably gives nicer output,
+# - compression libraries are used for benchmarks which we do not run.
+DEPEND="test? ( dev-cpp/gtest )"
+
+# AUTHORS is useless, ChangeLog is stale
+DOCS=( format_description.txt framing_format.txt NEWS README.md )
+
+src_prepare() {
+ local PATCHES=(
+ "${FILESDIR}"/snappy-1.1.7-0001-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch
+ )
+
+ # command-line option parsing does not work at all, so just force
+ # it off
+ sed -i -e '/run_microbenchmarks/s:true:false:' snappy-test.cc || die
+
+ default
+}
+
+multilib_src_configure() {
+ # TODO: would be nice to make unittest build conditional
+ # but it is not a priority right now
+ local mycmakeargs=(
+ -DBUILD_SHARED_LIBS=ON
+
+ # use gtest for tests only
+ -DCMAKE_DISABLE_FIND_PACKAGE_GTest=$(usex '!test')
+ # gflags does not work anyway
+ -DCMAKE_DISABLE_FIND_PACKAGE_Gflags=ON
+
+ # we do not want to run benchmarks, and those are only used
+ # for benchmarks
+ -DHAVE_LIBZ=NO
+ -DHAVE_LIBLZO2=NO
+ )
+ cmake-utils_src_configure
+}
+
+multilib_src_test() {
+ # run tests directly to get verbose output
+ cd "${S}" || die
+ "${BUILD_DIR}"/snappy_unittest || die
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-arch/snappy/, app-arch/snappy/files/
@ 2020-01-15 7:20 Michał Górny
0 siblings, 0 replies; 5+ messages in thread
From: Michał Górny @ 2020-01-15 7:20 UTC (permalink / raw
To: gentoo-commits
commit: 4fa70a7a39b0c4a4dff4a553da1a37441fa204ce
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 15 06:26:56 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jan 15 07:20:17 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fa70a7a
app-arch/snappy: Bump to 1.1.8
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
app-arch/snappy/Manifest | 1 +
...ke-Add-missing-linking-to-GTEST_LIBRARIES.patch | 3 +-
app-arch/snappy/snappy-1.1.8.ebuild | 62 ++++++++++++++++++++++
3 files changed, 64 insertions(+), 2 deletions(-)
diff --git a/app-arch/snappy/Manifest b/app-arch/snappy/Manifest
index 60e8583cc5d..1eaae3f2d80 100644
--- a/app-arch/snappy/Manifest
+++ b/app-arch/snappy/Manifest
@@ -1 +1,2 @@
DIST snappy-1.1.7.tar.gz 1090550 BLAKE2B e389c96e093de5db92b896a7fa17a90d3ad0be07972e279321f24875f0f0c8c704ff478f4902a6356d458f93c249e3e06424d5a4efc9753a23ab12b7ee83a088 SHA512 32046f532606ba545a4e4825c0c66a19be449f2ca2ff760a6fa170a3603731479a7deadb683546e5f8b5033414c50f4a9a29f6d23b7a41f047e566e69eca7caf
+DIST snappy-1.1.8.tar.gz 1096137 BLAKE2B e21f2ea23727f118920b7f67981354194f12d1d61eaa18eb1cb2f4285fabafdd221b88cf1e3b3261634f65469a714d3efe6b218c0b1e9d41639cdeb21097d75e SHA512 efe18ff1b3edda1b4b6cefcbc6da8119c05d63afdbf7a784f3490353c74dced76baed7b5f1aa34b99899729192b9d657c33c76de4b507a51553fa8001ae75c1c
diff --git a/app-arch/snappy/files/snappy-1.1.7-0001-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch b/app-arch/snappy/files/snappy-1.1.7-0001-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch
index 3327b8bcf0a..f4fdd472748 100644
--- a/app-arch/snappy/files/snappy-1.1.7-0001-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch
+++ b/app-arch/snappy/files/snappy-1.1.7-0001-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch
@@ -14,8 +14,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3f534b1..3a44aa9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -118,7 +118,10 @@ if(SNAPPY_BUILD_TESTS)
- "${PROJECT_SOURCE_DIR}/snappy-test.cc"
+@@ -119,6 +119,9 @@ if(SNAPPY_BUILD_TESTS)
)
target_compile_definitions(snappy_unittest PRIVATE -DHAVE_CONFIG_H)
- target_link_libraries(snappy_unittest snappy ${GFLAGS_LIBRARIES})
diff --git a/app-arch/snappy/snappy-1.1.8.ebuild b/app-arch/snappy/snappy-1.1.8.ebuild
new file mode 100644
index 00000000000..974a2a8e147
--- /dev/null
+++ b/app-arch/snappy/snappy-1.1.8.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit cmake-multilib
+
+DESCRIPTION="A high-speed compression/decompression library by Google"
+HOMEPAGE="https://github.com/google/snappy"
+SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV%%.*}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# all test dependencies are optional:
+# - gflags-2.2 is supposedly needed for command-line option parsing
+# but it's a huge hack and does not work,
+# - gtest probably gives nicer output,
+# - compression libraries are used for benchmarks which we do not run.
+DEPEND="test? ( dev-cpp/gtest )"
+
+# AUTHORS is useless, ChangeLog is stale
+DOCS=( format_description.txt framing_format.txt NEWS README.md )
+
+src_prepare() {
+ local PATCHES=(
+ "${FILESDIR}"/snappy-1.1.7-0001-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch
+ )
+
+ # command-line option parsing does not work at all, so just force
+ # it off
+ sed -i -e '/run_microbenchmarks/s:true:false:' snappy-test.cc || die
+
+ cmake-utils_src_prepare
+}
+
+multilib_src_configure() {
+ # TODO: would be nice to make unittest build conditional
+ # but it is not a priority right now
+ local mycmakeargs=(
+ -DBUILD_SHARED_LIBS=ON
+
+ # use gtest for tests only
+ -DCMAKE_DISABLE_FIND_PACKAGE_GTest=$(usex '!test')
+ # gflags does not work anyway
+ -DCMAKE_DISABLE_FIND_PACKAGE_Gflags=ON
+
+ # we do not want to run benchmarks, and those are only used
+ # for benchmarks
+ -DHAVE_LIBZ=NO
+ -DHAVE_LIBLZO2=NO
+ )
+ cmake-utils_src_configure
+}
+
+multilib_src_test() {
+ # run tests directly to get verbose output
+ cd "${S}" || die
+ "${BUILD_DIR}"/snappy_unittest || die
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-arch/snappy/, app-arch/snappy/files/
@ 2021-10-11 0:01 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2021-10-11 0:01 UTC (permalink / raw
To: gentoo-commits
commit: 71cd057da9e59309b6deed3919c7815022587e1d
Author: James Beddek <telans <AT> posteo <DOT> de>
AuthorDate: Sun Oct 10 23:43:35 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Oct 11 00:00:57 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71cd057d
app-arch/snappy: disable -Werror with Clang
Signed-off-by: James Beddek <telans <AT> posteo.de>
Closes: https://github.com/gentoo/gentoo/pull/22550
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-arch/snappy/files/snappy-1.1.9-clang-werror.patch | 16 ++++++++++++++++
app-arch/snappy/snappy-1.1.9.ebuild | 1 +
2 files changed, 17 insertions(+)
diff --git a/app-arch/snappy/files/snappy-1.1.9-clang-werror.patch b/app-arch/snappy/files/snappy-1.1.9-clang-werror.patch
new file mode 100644
index 00000000000..e89a8305e73
--- /dev/null
+++ b/app-arch/snappy/files/snappy-1.1.9-clang-werror.patch
@@ -0,0 +1,16 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -66,13 +66,6 @@ else(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wextra")
+ endif(NOT CMAKE_CXX_FLAGS MATCHES "-Wextra")
+
+- # Use -Werror for clang only.
+- if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+- if(NOT CMAKE_CXX_FLAGS MATCHES "-Werror")
+- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
+- endif(NOT CMAKE_CXX_FLAGS MATCHES "-Werror")
+- endif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+-
+ # Disable C++ exceptions.
+ string(REGEX REPLACE "-fexceptions" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions")
diff --git a/app-arch/snappy/snappy-1.1.9.ebuild b/app-arch/snappy/snappy-1.1.9.ebuild
index 1d6d63ebf93..85387dbf364 100644
--- a/app-arch/snappy/snappy-1.1.9.ebuild
+++ b/app-arch/snappy/snappy-1.1.9.ebuild
@@ -23,6 +23,7 @@ DOCS=( format_description.txt framing_format.txt NEWS README.md )
PATCHES=(
"${FILESDIR}/${P}_gcc_inline.patch"
"${FILESDIR}/${P}_external_gtest.patch"
+ "${FILESDIR}/${PN}-1.1.9-clang-werror.patch"
)
multilib_src_configure() {
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-arch/snappy/, app-arch/snappy/files/
@ 2024-04-11 21:44 Yixun Lan
0 siblings, 0 replies; 5+ messages in thread
From: Yixun Lan @ 2024-04-11 21:44 UTC (permalink / raw
To: gentoo-commits
commit: e61b1991025e879f7c039f548421043fb7d5b6a7
Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Thu Apr 11 06:55:13 2024 +0000
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Thu Apr 11 21:43:43 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e61b1991
app-arch/snappy: drop 1.1.9-r1
Signed-off-by: Azamat H. Hackimov <azamat.hackimov <AT> gmail.com>
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>
app-arch/snappy/Manifest | 1 -
.../snappy/files/snappy-1.1.9_gcc_inline.patch | 67 ----------------------
app-arch/snappy/snappy-1.1.9-r1.ebuild | 46 ---------------
3 files changed, 114 deletions(-)
diff --git a/app-arch/snappy/Manifest b/app-arch/snappy/Manifest
index 2b0fde8309f0..24675ae6e384 100644
--- a/app-arch/snappy/Manifest
+++ b/app-arch/snappy/Manifest
@@ -1,2 +1 @@
DIST snappy-1.1.10.tar.gz 1105312 BLAKE2B 5195335fb1883974d290e7dca2b6d928bde2b183f3f61bca9da28855b39fd9a4ee1c24014322d238d2ec94f3a3a55fd43110c88283e85865272226e11cbb4834 SHA512 3578597f1d4ec09104ce0296b825b013590351230dfe56c635081fd282ce7a13a34caf2c283ac77bd24065e2d27af6db068d1f84b98cec2fd39a0e37a0d77070
-DIST snappy-1.1.9.tar.gz 1102382 BLAKE2B 926d03156168e3d4800dc17144db3de2c182c6eb9970d87a00b94fb09b67e403479a64cbed75833b83fd03173c1bb8caaf248a55627e89fe2a34456f12ff3b42 SHA512 f1f8a90f5f7f23310423574b1d8c9acb84c66ea620f3999d1060395205e5760883476837aba02f0aa913af60819e34c625d8308c18a5d7a9c4e190f35968b024
diff --git a/app-arch/snappy/files/snappy-1.1.9_gcc_inline.patch b/app-arch/snappy/files/snappy-1.1.9_gcc_inline.patch
deleted file mode 100644
index 04d35f56ee98..000000000000
--- a/app-arch/snappy/files/snappy-1.1.9_gcc_inline.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 0c716d435abe65250100c2caea0e5126ac4e14bd Mon Sep 17 00:00:00 2001
-From: "Georgi D. Sotirov" <gdsotirov@gmail.com>
-Date: Wed, 5 May 2021 14:16:46 +0300
-Subject: [PATCH] Add inline with SNAPPY_ATTRIBUTE_ALWAYS_INLINE
-
-Add inline with SNAPPY_ATTRIBUTE_ALWAYS_INLINE on AdvanceToNextTag to
-fix the following compilation errors and a warning with GCC:
-
-[ 2%] Building CXX object CMakeFiles/snappy.dir/snappy.cc.o
-/usr/bin/c++ -DHAVE_CONFIG_H -Dsnappy_EXPORTS
--I/tmp/snappy-1.1.9/build -I/tmp/snappy-1.1.9 -O3
--march=i586 -mtune=i686 -Wall -Wextra -fno-exceptions -fno-rtti -O3
--DNDEBUG -fPIC -std=c++11 -o CMakeFiles/snappy.dir/snappy.cc.o -c
-/tmp/snappy-1.1.9/snappy.cc
-/tmp/snappy-1.1.9/snappy.cc:1017:8: warning: always_inline
-function might not be inlinable [-Wattributes]
- size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) {
- ^
-/tmp/snappy-1.1.9/snappy.cc: In function 'std::pair<const
-unsigned char*, int> snappy::DecompressBranchless(const uint8_t*, const
-uint8_t*, ptrdiff_t, T, ptrdiff_t) [with T = char*; uint8_t = unsigned
-char; ptrdiff_t = int]':
-/tmp/snappy-1.1.9/snappy.cc:1017:8: error: inlining failed in
-call to always_inline 'size_t snappy::AdvanceToNextTag(const uint8_t**,
-size_t*)': function body can be overwritten at link time
-/tmp/snappy-1.1.9/snappy.cc:1097:53: error: called from here
- size_t tag_type = AdvanceToNextTag(&ip, &tag);
- ^
-/tmp/snappy-1.1.9/snappy.cc:1017:8: error: inlining failed in
-call to always_inline 'size_t snappy::AdvanceToNextTag(const uint8_t**,
-size_t*)': function body can be overwritten at link time
- size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) {
- ^
-/tmp/snappy-1.1.9/snappy.cc:1097:53: error: called from here
- size_t tag_type = AdvanceToNextTag(&ip, &tag);
- ^
-/tmp/snappy-1.1.9/snappy.cc:1017:8: error: inlining failed in
-call to always_inline 'size_t snappy::AdvanceToNextTag(const uint8_t**,
-size_t*)': function body can be overwritten at link time
- size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) {
- ^
-/tmp/snappy-1.1.9/snappy.cc:1097:53: error: called from here
- size_t tag_type = AdvanceToNextTag(&ip, &tag);
- ^
-CMakeFiles/snappy.dir/build.make:137: recipe for target
-'CMakeFiles/snappy.dir/snappy.cc.o' failed
-
-Just like with other functions using SNAPPY_ATTRIBUTE_ALWAYS_INLINE
-macro (i.e. __attribute__((always_inline)) ) it is necessary to use C++
-inline specifier.
----
- snappy.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/snappy.cc b/snappy.cc
-index 79dc0e8..51157be 100644
---- a/snappy.cc
-+++ b/snappy.cc
-@@ -1014,7 +1014,7 @@ void MemMove(ptrdiff_t dst, const void* src, size_t size) {
- }
-
- SNAPPY_ATTRIBUTE_ALWAYS_INLINE
--size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) {
-+inline size_t AdvanceToNextTag(const uint8_t** ip_p, size_t* tag) {
- const uint8_t*& ip = *ip_p;
- // This section is crucial for the throughput of the decompression loop.
- // The latency of an iteration is fundamentally constrained by the
diff --git a/app-arch/snappy/snappy-1.1.9-r1.ebuild b/app-arch/snappy/snappy-1.1.9-r1.ebuild
deleted file mode 100644
index b6cbd7792108..000000000000
--- a/app-arch/snappy/snappy-1.1.9-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib
-
-DESCRIPTION="A high-speed compression/decompression library by Google"
-HOMEPAGE="https://github.com/google/snappy"
-SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV%%.*}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( dev-cpp/gtest )"
-
-DOCS=( format_description.txt framing_format.txt NEWS README.md )
-
-PATCHES=(
- "${FILESDIR}/${P}_gcc_inline.patch"
- "${FILESDIR}/${P}_external_gtest.patch"
- "${FILESDIR}/${P}-clang-werror.patch"
- "${FILESDIR}/${P}_remove-no-rtti.patch"
-)
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DCMAKE_CXX_STANDARD=14 # Latest gtest needs -std=c++14 or newer
- -DSNAPPY_BUILD_TESTS=$(usex test)
- -DSNAPPY_BUILD_BENCHMARKS=OFF
- # Options below are related to benchmarking, that we disable.
- -DHAVE_LIBZ=NO
- -DHAVE_LIBLZO2=NO
- -DHAVE_LIBLZ4=NO
- )
- cmake_src_configure
-}
-
-multilib_src_test() {
- # run tests directly to get verbose output
- cd "${S}" || die
- "${BUILD_DIR}"/snappy_unittest || die
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-04-11 21:44 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-08-25 13:01 [gentoo-commits] repo/gentoo:master commit in: app-arch/snappy/, app-arch/snappy/files/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2024-04-11 21:44 Yixun Lan
2021-10-11 0:01 Sam James
2020-01-15 7:20 Michał Górny
2017-07-14 4:12 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox