diff options
Diffstat (limited to 'app-arch/snappy')
6 files changed, 3 insertions, 230 deletions
diff --git a/app-arch/snappy/Manifest b/app-arch/snappy/Manifest index a8fa92882d66..265a0e70f69e 100644 --- a/app-arch/snappy/Manifest +++ b/app-arch/snappy/Manifest @@ -1,11 +1,6 @@ -AUX snappy-1.1.6-0001-cmake-Use-GNUInstallDirs-to-provide-configurable-cor.patch 3562 BLAKE2B b4534d9969957e7ba42ca8d0d02c7605164a0ffad0b401adf77cb7b10ee09ef7bbbd20ee7bc67a45b9487456e6993685f2b44a99a5560be2dd11fc99c4beb579 SHA512 8d97bca1ec972e3b0727d5d2705cf1a499a62de478c653fba39deac5da5bc8c67f29cb83eaaa95ba08681e1c12f507d25bb6f903e6daf1da776ec017065c139d -AUX snappy-1.1.6-0002-cmake-Correct-unify-CMake-install-path.patch 1451 BLAKE2B 23ddc92164301a0e79aba0d2e5b930e0e9de5db4d69e2e566d2d64bf656ff471435b8448dfeb9ef2c22e7165d91d3a5d1831b81f3758dc962452ff498d5551b3 SHA512 2ad8647f89ff59ff96a24c7ab5067292d58269b7413e18c9b5165cfced8526abbf2d008f19bb18288a78a9a4f479790899648b1ef55df318eacae64d33fe417b -AUX snappy-1.1.6-0003-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch 1123 BLAKE2B 62e89ab3f7e9f0e8aaaf5dc6f85beb4f753e53eaf75566a263e382cd649daef15f23ec9d539debffcdbd2dc44c63a73b335d221e7f074bd0aea55806a906d30d SHA512 05265f5af9edbb69c518c4cd5260f6ef0c318292fb7d93556ab710d35d143a9d9d212b1f70b3f8e0fa6310b178f6e65bb07c370f33d7203a48a1101b660753bf AUX snappy-1.1.7-0001-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch 1017 BLAKE2B e9181a6a89bd62c3433c71008d182fcbdd2960e29542539f9ef5a48eff15347968a8a1a2d362633056f27df0a5ea84a5a721afcc375335295cb7c0cdd9267790 SHA512 52bf7db93ddfaba96fb16379f5d3e923bb27b6763db15698b5a5b6529c17e667b9b5c98108291a8eb9ddb98b7cfb0b5836602f66ac6beeacafa9da654e632ef4 DIST snappy-1.1.3.tar.gz 1509026 BLAKE2B d8dbb6e92d1788f7b13e6e36aa0297cfcb28d664fb625d0798831ccd00de818675c224821359cc66f38f274da248725737510a85b01a36efe07aa4c9a8bcfda4 SHA512 4c4f47c657a072989179be9df0e5e98d14f4a67c27ec7ae0e5a15d14289a75d4e266bc6c5c89723f3e9860408ffcc7138a815f8ad9299407c4a1946fc00ab5bf -DIST snappy-1.1.6.tar.gz 1128388 BLAKE2B e02380dae96b00a485ce7584ea3018311b039a622c928bdeff67f7233b9e001800c7c5755e389f85023bfac960e480db6b6f9615de2af81cb0353385930b2c30 SHA512 38698b7ff03b39528de88bf62a84fcfc6f3dce2e98efa25a97ebdf396b6aba49860072ffa99830323944ab41c3721a3c53ff2636beb3422d5f812e84afe8dadf DIST snappy-1.1.7.tar.gz 1090550 BLAKE2B e389c96e093de5db92b896a7fa17a90d3ad0be07972e279321f24875f0f0c8c704ff478f4902a6356d458f93c249e3e06424d5a4efc9753a23ab12b7ee83a088 SHA512 32046f532606ba545a4e4825c0c66a19be449f2ca2ff760a6fa170a3603731479a7deadb683546e5f8b5033414c50f4a9a29f6d23b7a41f047e566e69eca7caf EBUILD snappy-1.1.3-r1.ebuild 970 BLAKE2B f4794a69d78a43906d661c1e05a1810d8ec708e166b1c045ca7611b3800cd1694657a5b67b0b34155384edb28f1023e6c980d12fa963fb270f2378a7eec0bc98 SHA512 75c6fdc710845048e095963edbf50a7713cf919cabe45b5548487c27ad4e2278e06b79b3c56c16a529a82f65ef0eff8a11a3964b9f3a40b1a3293fcb4afdce29 -EBUILD snappy-1.1.6.ebuild 2112 BLAKE2B b7223cc1b5408fac7bc5b3a4d5eccd608d8ae8fff812abbcd5f21a6efd29ca5dad14c3d073c056f15dd8207df4aa4772fe06c601a45605508d8676985e0709ae SHA512 7762d015200dce6310f3a46ff18b0b3f46825592bdb1af053a00386ecf6194586bde76c7ca823fc1b6c6b9ccc7c74c36514c7457d544d33836e26b2ca66722cd -EBUILD snappy-1.1.7.ebuild 1930 BLAKE2B 83becea5bd607f345141a003720fd0a6df6c99443a86396e76bf556a1751dcce4a8aa57696eeed94047709d16ffb9fbe70a6e4fde1f14900544a38465f7de075 SHA512 2f6578ebf0fe9feeaf518811c4c7fba6fae70d27af0926d98027b61bde1891c0cea41e513f2750d7124a745eaab60968fc74850676db5b4d1d73eaf304154ada +EBUILD snappy-1.1.7.ebuild 1926 BLAKE2B 0bd32400602038e843f93689f84bf2c98fa663cf1dbb9df654a48afda082248fe8dfaa411855d1289a9f26aae44ec8f418ebdaca37d83cd572387d90e9bc0052 SHA512 8672e96d9a80d388891892dbfe5e46240826f5ab33dce96f3dedbd752c64a5be341a689435840132b3b28275df6590d56e7746638a6d158dd4af2e18ea0c2cb4 MISC metadata.xml 584 BLAKE2B 9972ee3948809ca45ea18129bde88c5a93fbe73d24c6e125cd13a45bb381099110dc0e006cf76a57d0baf7d18001bf261dd1d6db1025750b114903725e2e3aa4 SHA512 5897170c6fb84f520d879b5df295608b92376150ed2535b578ff04c5cfb5a0ba334a7aee3ad1ef41a8ed45b3fb36425e1dc0e54c0fb880e0c2bf72803a2da552 diff --git a/app-arch/snappy/files/snappy-1.1.6-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 deleted file mode 100644 index b83bc93465af..000000000000 --- a/app-arch/snappy/files/snappy-1.1.6-0001-cmake-Use-GNUInstallDirs-to-provide-configurable-cor.patch +++ /dev/null @@ -1,91 +0,0 @@ -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 & - correct install dirs - -Use the GNUInstallDirs CMake module to provide a standard set of -variables to control install paths. Otherwise, the package is -incorrectly installed into 'lib' (instead of 'lib64') on 64-bit systems. -While this could be solved via providing custom variables for each -directory, it is simpler to reuse what's already in CMake. ---- - CMakeLists.txt | 21 +++++++++------------ - cmake/SnappyConfig.cmake.in | 8 ++++---- - 2 files changed, 13 insertions(+), 16 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index de52666..1ca77c1 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -8,6 +8,7 @@ INCLUDE(CheckLibraryExists) - INCLUDE(CheckCXXSourceCompiles) - INCLUDE(TestBigEndian) - INCLUDE(CMakePackageConfigHelpers) -+INCLUDE(GNUInstallDirs) - - TEST_BIG_ENDIAN(WORDS_BIG_ENDIAN) - IF (WORDS_BIG_ENDIAN) -@@ -98,33 +99,29 @@ INSTALL(FILES snappy.h - snappy-c.h - snappy-sinksource.h - ${Snappy_BINARY_DIR}/snappy-stubs-public.h -- DESTINATION include) -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) - - INSTALL(TARGETS snappy - EXPORT SnappyTargets -- RUNTIME DESTINATION bin -- LIBRARY DESTINATION lib -- ARCHIVE DESTINATION lib) --INSTALL(EXPORT SnappyTargets NAMESPACE Snappy:: DESTINATION lib/cmake/Snappy) -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) -+INSTALL(EXPORT SnappyTargets NAMESPACE Snappy:: DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Snappy) - - SET_TARGET_PROPERTIES(snappy PROPERTIES VERSION ${PROJECT_VERSION} - SOVERSION ${PROJECT_VERSION_MAJOR}) - --SET(INCLUDE_INSTALL_DIR include) --SET(LIBRARY_INSTALL_DIR lib) --SET(BINARY_INSTALL_DIR bin) -- - CONFIGURE_PACKAGE_CONFIG_FILE(cmake/SnappyConfig.cmake.in - ${Snappy_BINARY_DIR}/SnappyConfig.cmake -- INSTALL_DESTINATION lib/Snappy/cmake -- PATH_VARS INCLUDE_INSTALL_DIR LIBRARY_INSTALL_DIR BINARY_INSTALL_DIR -+ INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/Snappy/cmake -+ PATH_VARS CMAKE_INSTALL_INCLUDEDIR CMAKE_INSTALL_LIBDIR CMAKE_INSTALL_BINDIR - ) - - WRITE_BASIC_PACKAGE_VERSION_FILE(${Snappy_BINARY_DIR}/SnappyConfigVersion.cmake - COMPATIBILITY SameMajorVersion) - INSTALL(FILES ${Snappy_BINARY_DIR}/SnappyConfig.cmake - ${Snappy_BINARY_DIR}/SnappyConfigVersion.cmake -- DESTINATION lib/cmake) -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) - - ENABLE_TESTING() - -diff --git a/cmake/SnappyConfig.cmake.in b/cmake/SnappyConfig.cmake.in -index 5e604fe..d47656b 100644 ---- a/cmake/SnappyConfig.cmake.in -+++ b/cmake/SnappyConfig.cmake.in -@@ -2,8 +2,8 @@ set(SNAPPY_VERSION @SNAPPY_MAJOR@.@SNAPPY_MINOR@.@SNAPPY_PATCHLEVEL@) - - @PACKAGE_INIT@ - --set_and_check(SNAPPY_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@") --set_and_check(SNAPPY_LIBRARY_DIR "@PACKAGE_LIBRARY_INSTALL_DIR@") --set_and_check(SNAPPY_BINARY_DIR "@PACKAGE_BINARY_INSTALL_DIR@") -+set_and_check(SNAPPY_INCLUDE_DIR "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@") -+set_and_check(SNAPPY_LIBRARY_DIR "@PACKAGE_CMAKE_INSTALL_LIBDIR@") -+set_and_check(SNAPPY_BINARY_DIR "@PACKAGE_CMAKE_INSTALL_BINDIR@") - --check_required_components(SNAPPY) -\ No newline at end of file -+check_required_components(SNAPPY) --- -2.13.2 - diff --git a/app-arch/snappy/files/snappy-1.1.6-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 deleted file mode 100644 index 0b7faa08772b..000000000000 --- a/app-arch/snappy/files/snappy-1.1.6-0002-cmake-Correct-unify-CMake-install-path.patch +++ /dev/null @@ -1,37 +0,0 @@ -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 - -The CMake file is using 'lib/cmake/Snappy', 'lib/Snappy/cmake' -and 'lib/cmake' inconsistently. Replace all of them with a single -'lib/cmake/Snappy' that matches most of standard CMake packages. ---- - CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1ca77c1..3d1a304 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -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 -- INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/Snappy/cmake -+ INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Snappy - PATH_VARS CMAKE_INSTALL_INCLUDEDIR CMAKE_INSTALL_LIBDIR CMAKE_INSTALL_BINDIR - ) - -@@ -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 -- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Snappy) - - ENABLE_TESTING() - --- -2.13.2 - diff --git a/app-arch/snappy/files/snappy-1.1.6-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 deleted file mode 100644 index b1b8a2cd5e97..000000000000 --- a/app-arch/snappy/files/snappy-1.1.6-0003-cmake-Add-missing-linking-to-GTEST_LIBRARIES.patch +++ /dev/null @@ -1,28 +0,0 @@ -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 - -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 | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3d1a304..9f2cc23 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -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} -- ${GFLAGS_LIBRARIES}) -+ ${GFLAGS_LIBRARIES} ${GTEST_LIBRARIES}) - TARGET_INCLUDE_DIRECTORIES(snappy-unittest BEFORE PRIVATE ${Snappy_SOURCE_DIR} - ${GTEST_INCLUDE_DIRS} ${GFLAGS_INCLUDE_DIRS}) - --- -2.13.2 - diff --git a/app-arch/snappy/snappy-1.1.6.ebuild b/app-arch/snappy/snappy-1.1.6.ebuild deleted file mode 100644 index 2556b836d776..000000000000 --- a/app-arch/snappy/snappy-1.1.6.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# 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.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 - # 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=( - # 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 - -DHAVE_LIBLZF=NO - -DHAVE_LIBQUICKLZ=NO - ) - cmake-utils_src_configure -} - -multilib_src_test() { - # run tests directly to get verbose output - cd "${S}" || die - "${BUILD_DIR}"/snappy-unittest || die -} diff --git a/app-arch/snappy/snappy-1.1.7.ebuild b/app-arch/snappy/snappy-1.1.7.ebuild index eea333450b70..b56e491c71da 100644 --- a/app-arch/snappy/snappy-1.1.7.ebuild +++ b/app-arch/snappy/snappy-1.1.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -10,7 +10,7 @@ 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 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 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) |