* [gentoo-commits] repo/gentoo:master commit in: net-libs/google-cloud-cpp/files/, net-libs/google-cloud-cpp/
@ 2018-09-07 18:03 Jason Zaman
0 siblings, 0 replies; 4+ messages in thread
From: Jason Zaman @ 2018-09-07 18:03 UTC (permalink / raw
To: gentoo-commits
commit: 7fc4eccc4345963c8e8bd5bd1e12988f31e2fc96
Author: Jason Zaman <perfinion <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 7 18:02:02 2018 +0000
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Fri Sep 7 18:02:18 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fc4eccc
net-libs/google-cloud-cpp: new package
ebuild by me
Package-Manager: Portage-2.3.40, Repoman-2.3.9
net-libs/google-cloud-cpp/Manifest | 3 +
...GOOGLE_CLOUD_CPP_GRPC_PROVIDER-pkg-config.patch | 33 ++++
.../files/0002-cmake-fix-library-issues.patch | 180 +++++++++++++++++++++
.../google-cloud-cpp/google-cloud-cpp-0.2.0.ebuild | 60 +++++++
net-libs/google-cloud-cpp/metadata.xml | 11 ++
5 files changed, 287 insertions(+)
diff --git a/net-libs/google-cloud-cpp/Manifest b/net-libs/google-cloud-cpp/Manifest
new file mode 100644
index 00000000000..410732fa271
--- /dev/null
+++ b/net-libs/google-cloud-cpp/Manifest
@@ -0,0 +1,3 @@
+DIST google-cloud-cpp-0.2.0.tar.gz 687020 BLAKE2B 45c09c7cb5b9cc93c87e6d1faedf04f29ae81196dda95660abeadeaaf522376b4e50fd42489476c081e8de7336202d3883ab276c0e2334f1ad1b0e4e1f90fdb8 SHA512 ded3b564ef264a8bff4d81b08f2a97462e063127bf75a006bc7b18d18cfaee2f3cbe5957fe2c56cec06da5a7765854444fad8cd5045579c416c5f3de8462382e
+DIST googleapis-79ab27f3b70ebc221e265d2e8ab30a8cc2d21fa2.tar.gz 874997 BLAKE2B c837323124d26364c83dba72d4f73f3147ad117468b271e8d9502991c1f9a7b20d4f5405351147b65e99c57d207a2b8c1471228d2060ad238ade5159be1b009e SHA512 774e56fc30a4daf2e88d8d3b6747c1ac369d016e9d52527565b88d93252a22597339c17e612304f8823867da4b6df4b58a42dc9d4d480fc59962ee5314a85ab8
+DIST nlohmann-json-3.1.2-json.hpp 595822 BLAKE2B 510278344a510a516606f84aea53c682a64a7d1f4703e41503a1688e7c62ab1df8f197a697bd1149e958d21ab986d1b42cb78db6261b07239d9587756813acf5 SHA512 05df0ad3338f0bca885c0aa9da523922b99016986a9b01426b13888c0febd83bf1f6f063886f6c75f8a656ef79abac6292fe442dc05b1897d546ba5b70be48a5
diff --git a/net-libs/google-cloud-cpp/files/0001-cmake-Fix-GOOGLE_CLOUD_CPP_GRPC_PROVIDER-pkg-config.patch b/net-libs/google-cloud-cpp/files/0001-cmake-Fix-GOOGLE_CLOUD_CPP_GRPC_PROVIDER-pkg-config.patch
new file mode 100644
index 00000000000..d479a82b1e3
--- /dev/null
+++ b/net-libs/google-cloud-cpp/files/0001-cmake-Fix-GOOGLE_CLOUD_CPP_GRPC_PROVIDER-pkg-config.patch
@@ -0,0 +1,33 @@
+From eb0155e90498a5d7341490b9ed123f7638bffe44 Mon Sep 17 00:00:00 2001
+From: Jason Zaman <jason@perfinion.com>
+Date: Fri, 7 Sep 2018 21:19:11 +0800
+Subject: [PATCH 1/2] cmake: Fix GOOGLE_CLOUD_CPP_GRPC_PROVIDER=pkg-config
+
+The grpc_cpp_plugin executable needs to be marked imported otherwise
+cmake will try (and fail) to build it.
+Also the location variable was typo'd.
+
+Signed-off-by: Jason Zaman <jason@perfinion.com>
+---
+ cmake/IncludeGrpc.cmake | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cmake/IncludeGrpc.cmake b/cmake/IncludeGrpc.cmake
+index 14273cbb..929f984d 100644
+--- a/cmake/IncludeGrpc.cmake
++++ b/cmake/IncludeGrpc.cmake
+@@ -231,9 +231,9 @@ elseif("${GOOGLE_CLOUD_CPP_GRPC_PROVIDER}" STREQUAL "pkg-config")
+ ${PROTOBUF_SRC_ROOT_FOLDER}/vsprojects/${_PROTOBUF_ARCH_DIR}Release
+ ${PROTOBUF_SRC_ROOT_FOLDER}/vsprojects/${_PROTOBUF_ARCH_DIR}Debug)
+ mark_as_advanced(PROTOC_GRPCPP_PLUGIN_EXECUTABLE)
+- add_executable(grpc_cpp_plugin ${PROTOC_GRPC_PLUGIN_EXECUTABLE})
++ add_executable(grpc_cpp_plugin IMPORTED)
+ set_property(TARGET grpc_cpp_plugin
+ PROPERTY IMPORTED_LOCATION
+- ${PROTOC_GRPCPP_CPP_PLUGIN_EXECUTABLE})
++ ${PROTOC_GRPCPP_PLUGIN_EXECUTABLE})
+
+ endif ()
+--
+2.16.4
+
diff --git a/net-libs/google-cloud-cpp/files/0002-cmake-fix-library-issues.patch b/net-libs/google-cloud-cpp/files/0002-cmake-fix-library-issues.patch
new file mode 100644
index 00000000000..23a6d24d54d
--- /dev/null
+++ b/net-libs/google-cloud-cpp/files/0002-cmake-fix-library-issues.patch
@@ -0,0 +1,180 @@
+From 9978d05d4418bf813b8a457a2e49d0fc8fc8b26b Mon Sep 17 00:00:00 2001
+From: Jason Zaman <jason@perfinion.com>
+Date: Fri, 7 Sep 2018 22:35:24 +0800
+Subject: [PATCH 2/2] cmake: fix library issues
+
+Set library soversions so CMake sets the symlinks and soversions
+properly.
+Install the cmake files in the correct dir.
+
+Signed-off-by: Jason Zaman <jason@perfinion.com>
+---
+ google/cloud/CMakeLists.txt | 14 +++++++-------
+ google/cloud/bigtable/CMakeLists.txt | 11 ++++++++---
+ google/cloud/firestore/CMakeLists.txt | 14 ++++++++------
+ google/cloud/storage/CMakeLists.txt | 12 +++++++-----
+ 4 files changed, 30 insertions(+), 21 deletions(-)
+
+diff --git a/google/cloud/CMakeLists.txt b/google/cloud/CMakeLists.txt
+index 4d777261..4e26290c 100644
+--- a/google/cloud/CMakeLists.txt
++++ b/google/cloud/CMakeLists.txt
+@@ -99,6 +99,9 @@ target_include_directories(google_cloud_cpp_common
+ $<INSTALL_INTERFACE:include>)
+ target_compile_options(google_cloud_cpp_common
+ PUBLIC ${GOOGLE_CLOUD_CPP_EXCEPTIONS_FLAG})
++set_target_properties(google_cloud_cpp_common PROPERTIES
++ VERSION ${GOOGLE_CLOUD_CPP_VERSION_MAJOR}.${GOOGLE_CLOUD_CPP_VERSION_MINOR}.${GOOGLE_CLOUD_CPP_VERSION_PATCH}
++ SOVERSION ${GOOGLE_CLOUD_CPP_VERSION_MAJOR})
+
+ include(CreateBazelConfig)
+ create_bazel_config(google_cloud_cpp_common)
+@@ -150,7 +153,7 @@ endforeach ()
+
+ # Export the CMake targets to make it easy to create configuration files.
+ install(EXPORT google_cloud_cpp_common-targets
+- DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/google_cloud_cpp_common")
++ DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/cmake/Modules")
+
+ # Install the libraries and headers in the locations determined by
+ # GNUInstallDirs
+@@ -186,12 +189,9 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/google_cloud_cpp_common.pc"
+ configure_file("config.cmake.in" "google_cloud_cpp_common-config.cmake" @ONLY)
+ configure_file("${PROJECT_SOURCE_DIR}/google/cloud/config-version.cmake.in"
+ "google_cloud_cpp_common-config-version.cmake" @ONLY)
+-install(
+- FILES
+- "${CMAKE_CURRENT_BINARY_DIR}/google_cloud_cpp_common-config.cmake"
+- "${CMAKE_CURRENT_BINARY_DIR}/google_cloud_cpp_common-config-version.cmake"
+- DESTINATION
+- "${CMAKE_INSTALL_LIBDIR}/cmake/google_cloud_cpp_common")
++install(FILES "${CMAKE_CURRENT_BINARY_DIR}/google_cloud_cpp_common-config.cmake"
++ "${CMAKE_CURRENT_BINARY_DIR}/google_cloud_cpp_common-config-version.cmake"
++ DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/cmake/Modules")
+
+ add_subdirectory(bigtable)
+ add_subdirectory(firestore)
+diff --git a/google/cloud/bigtable/CMakeLists.txt b/google/cloud/bigtable/CMakeLists.txt
+index 8aaff05c..9bd3effd 100644
+--- a/google/cloud/bigtable/CMakeLists.txt
++++ b/google/cloud/bigtable/CMakeLists.txt
+@@ -102,6 +102,9 @@ target_include_directories(bigtable_protos
+ $<INSTALL_INTERFACE:include>)
+ target_compile_options(bigtable_protos
+ PUBLIC ${GOOGLE_CLOUD_CPP_EXCEPTIONS_FLAG})
++set_target_properties(bigtable_protos PROPERTIES
++ VERSION ${BIGTABLE_CLIENT_VERSION_MAJOR}.${BIGTABLE_CLIENT_VERSION_MINOR}.${BIGTABLE_CLIENT_VERSION_PATCH}
++ SOVERSION ${BIGTABLE_CLIENT_VERSION_MAJOR})
+ add_library(bigtable::protos ALIAS bigtable_protos)
+
+ # Enable unit tests
+@@ -212,6 +215,9 @@ target_include_directories(bigtable_client
+ $<INSTALL_INTERFACE:include>)
+ target_compile_options(bigtable_client
+ PUBLIC ${GOOGLE_CLOUD_CPP_EXCEPTIONS_FLAG})
++set_target_properties(bigtable_client PROPERTIES
++ VERSION ${BIGTABLE_CLIENT_VERSION_MAJOR}.${BIGTABLE_CLIENT_VERSION_MINOR}.${BIGTABLE_CLIENT_VERSION_PATCH}
++ SOVERSION ${BIGTABLE_CLIENT_VERSION_MAJOR})
+ add_library(bigtable::client ALIAS bigtable_client)
+
+ include(CreateBazelConfig)
+@@ -369,7 +375,7 @@ if (NOT ${GOOGLE_CLOUD_CPP_GRPC_PROVIDER} STREQUAL "module")
+
+ # Export the CMake targets to make it easy to create configuration files.
+ install(EXPORT bigtable-targets
+- DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/bigtable_client")
++ DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/cmake/Modules")
+ endif ()
+
+ install(TARGETS bigtable_client
+@@ -407,5 +413,4 @@ configure_file("${PROJECT_SOURCE_DIR}/google/cloud/config-version.cmake.in"
+ "bigtable_client-config-version.cmake" @ONLY)
+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/bigtable_client-config.cmake"
+ "${CMAKE_CURRENT_BINARY_DIR}/bigtable_client-config-version.cmake"
+- DESTINATION
+- "${CMAKE_INSTALL_LIBDIR}/cmake/bigtable_client")
++ DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/cmake/Modules")
+diff --git a/google/cloud/firestore/CMakeLists.txt b/google/cloud/firestore/CMakeLists.txt
+index 88c5ad6d..63d8add1 100644
+--- a/google/cloud/firestore/CMakeLists.txt
++++ b/google/cloud/firestore/CMakeLists.txt
+@@ -62,6 +62,9 @@ target_include_directories(firestore_client
+ $<INSTALL_INTERFACE:include>)
+ target_compile_options(firestore_client
+ PUBLIC ${GOOGLE_CLOUD_CPP_EXCEPTIONS_FLAG})
++set_target_properties(firestore_client PROPERTIES
++ VERSION ${FIRESTORE_CLIENT_VERSION_MAJOR}.${FIRESTORE_CLIENT_VERSION_MINOR}.${FIRESTORE_CLIENT_VERSION_PATCH}
++ SOVERSION ${FIRESTORE_CLIENT_VERSION_MAJOR})
+ add_library(firestore::client ALIAS firestore_client)
+
+ include(CreateBazelConfig)
+@@ -104,7 +107,8 @@ install(TARGETS
+
+ # The exports can only be installed if all the dependencies are installed. CMake
+ # needs to know where the submodules will be installed from,
+-install(EXPORT firestore-targets DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/cmake)
++install(EXPORT firestore-targets
++ DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/cmake/Modules")
+
+ install(TARGETS firestore_client
+ EXPORT firestore-targets
+@@ -138,8 +142,6 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/firestore_client.pc" DESTINATION
+ configure_file("config.cmake.in" "firestore_client-config.cmake" @ONLY)
+ configure_file("${PROJECT_SOURCE_DIR}/google/cloud/config-version.cmake.in"
+ "firestore_client-config-version.cmake" @ONLY)
+-install(
+- FILES "${CMAKE_CURRENT_BINARY_DIR}/firestore_client-config.cmake"
+- "${CMAKE_CURRENT_BINARY_DIR}/firestore_client-config-version.cmake"
+- DESTINATION
+- ${CMAKE_INSTALL_DATAROOTDIR}/cmake)
++install(FILES "${CMAKE_CURRENT_BINARY_DIR}/firestore_client-config.cmake"
++ "${CMAKE_CURRENT_BINARY_DIR}/firestore_client-config-version.cmake"
++ DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/cmake/Modules")
+diff --git a/google/cloud/storage/CMakeLists.txt b/google/cloud/storage/CMakeLists.txt
+index c8b641a0..c91bb17c 100644
+--- a/google/cloud/storage/CMakeLists.txt
++++ b/google/cloud/storage/CMakeLists.txt
+@@ -216,6 +216,9 @@ target_include_directories(storage_client
+ $<INSTALL_INTERFACE:include>)
+ target_compile_options(storage_client
+ PUBLIC ${GOOGLE_CLOUD_CPP_EXCEPTIONS_FLAG})
++set_target_properties(storage_client PROPERTIES
++ VERSION ${STORAGE_CLIENT_VERSION_MAJOR}.${STORAGE_CLIENT_VERSION_MINOR}.${STORAGE_CLIENT_VERSION_PATCH}
++ SOVERSION ${STORAGE_CLIENT_VERSION_MAJOR})
+
+ add_library(storage_client_testing
+ testing/canonical_errors.h
+@@ -326,20 +329,20 @@ install(TARGETS storage_common_options nlohmann_json
+
+ # Export the CMake targets to make it easy to create configuration files.
+ install(EXPORT storage-targets
+- DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/storage_client")
++ DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/cmake/Modules")
+
+ install(TARGETS storage_client
+ EXPORT storage-targets
+ RUNTIME DESTINATION bin
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+-install(DIRECTORY . DESTINATION include/storage/client
++install(DIRECTORY . DESTINATION include/google/cloud/storage/client
+ FILES_MATCHING
+ PATTERN "*.h"
+ PATTERN "testing/*"
+ EXCLUDE)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/version_info.h DESTINATION
+- include/storage/client)
++ include/google/cloud/storage/client)
+
+ # Setup global variables used in the following *.in files.
+ set(GOOGLE_CLOUD_CPP_CONFIG_VERSION_MAJOR ${STORAGE_CLIENT_VERSION_MAJOR})
+@@ -362,5 +365,4 @@ configure_file("${PROJECT_SOURCE_DIR}/google/cloud/config-version.cmake.in"
+ "storage_client-config-version.cmake" @ONLY)
+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/storage_client-config.cmake"
+ "${CMAKE_CURRENT_BINARY_DIR}/storage_client-config-version.cmake"
+- DESTINATION
+- "${CMAKE_INSTALL_LIBDIR}/cmake/storage_client")
++ DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/cmake/Modules")
+--
+2.16.4
+
diff --git a/net-libs/google-cloud-cpp/google-cloud-cpp-0.2.0.ebuild b/net-libs/google-cloud-cpp/google-cloud-cpp-0.2.0.ebuild
new file mode 100644
index 00000000000..fc309dfdbc6
--- /dev/null
+++ b/net-libs/google-cloud-cpp/google-cloud-cpp-0.2.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+JSON_VER="3.1.2"
+GOOGLEAPIS_COMMIT="79ab27f3b70ebc221e265d2e8ab30a8cc2d21fa2"
+
+DESCRIPTION="Google Cloud Client Library for C++"
+HOMEPAGE="https://cloud.google.com/"
+SRC_URI="https://github.com/GoogleCloudPlatform/google-cloud-cpp/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ https://github.com/nlohmann/json/releases/download/v${JSON_VER}/json.hpp -> nlohmann-json-${JSON_VER}-json.hpp
+ https://github.com/googleapis/googleapis/archive/${GOOGLEAPIS_COMMIT}.tar.gz -> googleapis-${GOOGLEAPIS_COMMIT}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="dev-libs/protobuf
+ net-misc/curl
+ net-libs/grpc"
+RDEPEND="${DEPEND}"
+
+DOCS=( README.md )
+PATCHES=(
+ "${FILESDIR}/0001-cmake-Fix-GOOGLE_CLOUD_CPP_GRPC_PROVIDER-pkg-config.patch"
+ "${FILESDIR}/0002-cmake-fix-library-issues.patch"
+)
+
+src_prepare() {
+ rm -rf "${S}/third_party/googleapis/" || die
+ mv "${WORKDIR}/googleapis-${GOOGLEAPIS_COMMIT}/" "${S}/third_party/googleapis/" || die
+
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DGOOGLE_CLOUD_CPP_GMOCK_PROVIDER=package
+ -DGOOGLE_CLOUD_CPP_GRPC_PROVIDER=pkg-config
+ -DBUILD_SHARED_LIBS=ON
+ )
+
+ cmake-utils_src_configure
+
+ mkdir -p "${BUILD_DIR}/external/nlohmann_json/src/" || die
+ cp "${DISTDIR}/nlohmann-json-${JSON_VER}-json.hpp" "${BUILD_DIR}/external/nlohmann_json/src/json.hpp" || die
+}
+
+src_test() {
+ # test fails
+ local myctestargs=(
+ -E internal_parse_rfc3339_test
+ )
+
+ cmake-utils_src_test
+}
diff --git a/net-libs/google-cloud-cpp/metadata.xml b/net-libs/google-cloud-cpp/metadata.xml
new file mode 100644
index 00000000000..19a918bcc96
--- /dev/null
+++ b/net-libs/google-cloud-cpp/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>perfinion@gentoo.org</email>
+ <name>Jason Zaman</name>
+ </maintainer>
+ <longdescription lang="en">
+ Google Cloud Client Library for C++
+ </longdescription>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/google-cloud-cpp/files/, net-libs/google-cloud-cpp/
@ 2018-09-27 16:48 Jason Zaman
0 siblings, 0 replies; 4+ messages in thread
From: Jason Zaman @ 2018-09-27 16:48 UTC (permalink / raw
To: gentoo-commits
commit: 62f7ec58ddd8db23c982f4782f5733ee94b7dcd0
Author: Jason Zaman <perfinion <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 27 16:47:25 2018 +0000
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Thu Sep 27 16:47:42 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62f7ec58
net-libs/google-cloud-cpp: revbump with patches that are now upstream
Package-Manager: Portage-2.3.49, Repoman-2.3.10
.../files/0001-Make-the-install-target-work.patch | 12 ++
...GOOGLE_CLOUD_CPP_GRPC_PROVIDER-pkg-config.patch | 18 +--
.../files/0002-cmake-fix-library-issues.patch | 180 ---------------------
.../files/0002-cmake-set-library-soversions.patch | 130 +++++++++++++++
...2.0.ebuild => google-cloud-cpp-0.2.0-r1.ebuild} | 3 +-
5 files changed, 153 insertions(+), 190 deletions(-)
diff --git a/net-libs/google-cloud-cpp/files/0001-Make-the-install-target-work.patch b/net-libs/google-cloud-cpp/files/0001-Make-the-install-target-work.patch
new file mode 100644
index 00000000000..f84cb4be3c2
--- /dev/null
+++ b/net-libs/google-cloud-cpp/files/0001-Make-the-install-target-work.patch
@@ -0,0 +1,12 @@
+diff -ur google-cloud-cpp-0.2.0.orig/google/cloud/storage/CMakeLists.txt google-cloud-cpp-0.2.0/google/cloud/storage/CMakeLists.txt
+--- google-cloud-cpp-0.2.0.orig/google/cloud/storage/CMakeLists.txt 2018-09-28 00:39:41.170482472 +0800
++++ google-cloud-cpp-0.2.0/google/cloud/storage/CMakeLists.txt 2018-09-28 00:42:09.679979597 +0800
+@@ -321,7 +321,7 @@
+ PATTERN "testing/*"
+ EXCLUDE)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/version_info.h DESTINATION
+- include/storage/client)
++ include/google/cloud/storage)
+
+ # Setup global variables used in the following *.in files.
+ set(GOOGLE_CLOUD_CPP_CONFIG_VERSION_MAJOR ${STORAGE_CLIENT_VERSION_MAJOR})
diff --git a/net-libs/google-cloud-cpp/files/0001-cmake-Fix-GOOGLE_CLOUD_CPP_GRPC_PROVIDER-pkg-config.patch b/net-libs/google-cloud-cpp/files/0001-cmake-Fix-GOOGLE_CLOUD_CPP_GRPC_PROVIDER-pkg-config.patch
index d479a82b1e3..a1b9a166ea3 100644
--- a/net-libs/google-cloud-cpp/files/0001-cmake-Fix-GOOGLE_CLOUD_CPP_GRPC_PROVIDER-pkg-config.patch
+++ b/net-libs/google-cloud-cpp/files/0001-cmake-Fix-GOOGLE_CLOUD_CPP_GRPC_PROVIDER-pkg-config.patch
@@ -1,31 +1,31 @@
-From eb0155e90498a5d7341490b9ed123f7638bffe44 Mon Sep 17 00:00:00 2001
+From ef34b197dd23833c0dde9ea20f62681dbafa7a9b Mon Sep 17 00:00:00 2001
From: Jason Zaman <jason@perfinion.com>
Date: Fri, 7 Sep 2018 21:19:11 +0800
Subject: [PATCH 1/2] cmake: Fix GOOGLE_CLOUD_CPP_GRPC_PROVIDER=pkg-config
The grpc_cpp_plugin executable needs to be marked imported otherwise
-cmake will try (and fail) to build it.
-Also the location variable was typo'd.
+cmake will try (and fail) to build it. Also the location variable was
+typo'd.
Signed-off-by: Jason Zaman <jason@perfinion.com>
---
- cmake/IncludeGrpc.cmake | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ cmake/IncludeGrpc.cmake | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/cmake/IncludeGrpc.cmake b/cmake/IncludeGrpc.cmake
-index 14273cbb..929f984d 100644
+index 36dcfe5c..c18f5cbc 100644
--- a/cmake/IncludeGrpc.cmake
+++ b/cmake/IncludeGrpc.cmake
-@@ -231,9 +231,9 @@ elseif("${GOOGLE_CLOUD_CPP_GRPC_PROVIDER}" STREQUAL "pkg-config")
+@@ -225,9 +225,8 @@ elseif("${GOOGLE_CLOUD_CPP_GRPC_PROVIDER}" STREQUAL "pkg-config")
${PROTOBUF_SRC_ROOT_FOLDER}/vsprojects/${_PROTOBUF_ARCH_DIR}Release
${PROTOBUF_SRC_ROOT_FOLDER}/vsprojects/${_PROTOBUF_ARCH_DIR}Debug)
mark_as_advanced(PROTOC_GRPCPP_PLUGIN_EXECUTABLE)
- add_executable(grpc_cpp_plugin ${PROTOC_GRPC_PLUGIN_EXECUTABLE})
+ add_executable(grpc_cpp_plugin IMPORTED)
set_property(TARGET grpc_cpp_plugin
- PROPERTY IMPORTED_LOCATION
+- PROPERTY IMPORTED_LOCATION
- ${PROTOC_GRPCPP_CPP_PLUGIN_EXECUTABLE})
-+ ${PROTOC_GRPCPP_PLUGIN_EXECUTABLE})
++ PROPERTY IMPORTED_LOCATION ${PROTOC_GRPCPP_PLUGIN_EXECUTABLE})
endif ()
--
diff --git a/net-libs/google-cloud-cpp/files/0002-cmake-fix-library-issues.patch b/net-libs/google-cloud-cpp/files/0002-cmake-fix-library-issues.patch
deleted file mode 100644
index 23a6d24d54d..00000000000
--- a/net-libs/google-cloud-cpp/files/0002-cmake-fix-library-issues.patch
+++ /dev/null
@@ -1,180 +0,0 @@
-From 9978d05d4418bf813b8a457a2e49d0fc8fc8b26b Mon Sep 17 00:00:00 2001
-From: Jason Zaman <jason@perfinion.com>
-Date: Fri, 7 Sep 2018 22:35:24 +0800
-Subject: [PATCH 2/2] cmake: fix library issues
-
-Set library soversions so CMake sets the symlinks and soversions
-properly.
-Install the cmake files in the correct dir.
-
-Signed-off-by: Jason Zaman <jason@perfinion.com>
----
- google/cloud/CMakeLists.txt | 14 +++++++-------
- google/cloud/bigtable/CMakeLists.txt | 11 ++++++++---
- google/cloud/firestore/CMakeLists.txt | 14 ++++++++------
- google/cloud/storage/CMakeLists.txt | 12 +++++++-----
- 4 files changed, 30 insertions(+), 21 deletions(-)
-
-diff --git a/google/cloud/CMakeLists.txt b/google/cloud/CMakeLists.txt
-index 4d777261..4e26290c 100644
---- a/google/cloud/CMakeLists.txt
-+++ b/google/cloud/CMakeLists.txt
-@@ -99,6 +99,9 @@ target_include_directories(google_cloud_cpp_common
- $<INSTALL_INTERFACE:include>)
- target_compile_options(google_cloud_cpp_common
- PUBLIC ${GOOGLE_CLOUD_CPP_EXCEPTIONS_FLAG})
-+set_target_properties(google_cloud_cpp_common PROPERTIES
-+ VERSION ${GOOGLE_CLOUD_CPP_VERSION_MAJOR}.${GOOGLE_CLOUD_CPP_VERSION_MINOR}.${GOOGLE_CLOUD_CPP_VERSION_PATCH}
-+ SOVERSION ${GOOGLE_CLOUD_CPP_VERSION_MAJOR})
-
- include(CreateBazelConfig)
- create_bazel_config(google_cloud_cpp_common)
-@@ -150,7 +153,7 @@ endforeach ()
-
- # Export the CMake targets to make it easy to create configuration files.
- install(EXPORT google_cloud_cpp_common-targets
-- DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/google_cloud_cpp_common")
-+ DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/cmake/Modules")
-
- # Install the libraries and headers in the locations determined by
- # GNUInstallDirs
-@@ -186,12 +189,9 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/google_cloud_cpp_common.pc"
- configure_file("config.cmake.in" "google_cloud_cpp_common-config.cmake" @ONLY)
- configure_file("${PROJECT_SOURCE_DIR}/google/cloud/config-version.cmake.in"
- "google_cloud_cpp_common-config-version.cmake" @ONLY)
--install(
-- FILES
-- "${CMAKE_CURRENT_BINARY_DIR}/google_cloud_cpp_common-config.cmake"
-- "${CMAKE_CURRENT_BINARY_DIR}/google_cloud_cpp_common-config-version.cmake"
-- DESTINATION
-- "${CMAKE_INSTALL_LIBDIR}/cmake/google_cloud_cpp_common")
-+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/google_cloud_cpp_common-config.cmake"
-+ "${CMAKE_CURRENT_BINARY_DIR}/google_cloud_cpp_common-config-version.cmake"
-+ DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/cmake/Modules")
-
- add_subdirectory(bigtable)
- add_subdirectory(firestore)
-diff --git a/google/cloud/bigtable/CMakeLists.txt b/google/cloud/bigtable/CMakeLists.txt
-index 8aaff05c..9bd3effd 100644
---- a/google/cloud/bigtable/CMakeLists.txt
-+++ b/google/cloud/bigtable/CMakeLists.txt
-@@ -102,6 +102,9 @@ target_include_directories(bigtable_protos
- $<INSTALL_INTERFACE:include>)
- target_compile_options(bigtable_protos
- PUBLIC ${GOOGLE_CLOUD_CPP_EXCEPTIONS_FLAG})
-+set_target_properties(bigtable_protos PROPERTIES
-+ VERSION ${BIGTABLE_CLIENT_VERSION_MAJOR}.${BIGTABLE_CLIENT_VERSION_MINOR}.${BIGTABLE_CLIENT_VERSION_PATCH}
-+ SOVERSION ${BIGTABLE_CLIENT_VERSION_MAJOR})
- add_library(bigtable::protos ALIAS bigtable_protos)
-
- # Enable unit tests
-@@ -212,6 +215,9 @@ target_include_directories(bigtable_client
- $<INSTALL_INTERFACE:include>)
- target_compile_options(bigtable_client
- PUBLIC ${GOOGLE_CLOUD_CPP_EXCEPTIONS_FLAG})
-+set_target_properties(bigtable_client PROPERTIES
-+ VERSION ${BIGTABLE_CLIENT_VERSION_MAJOR}.${BIGTABLE_CLIENT_VERSION_MINOR}.${BIGTABLE_CLIENT_VERSION_PATCH}
-+ SOVERSION ${BIGTABLE_CLIENT_VERSION_MAJOR})
- add_library(bigtable::client ALIAS bigtable_client)
-
- include(CreateBazelConfig)
-@@ -369,7 +375,7 @@ if (NOT ${GOOGLE_CLOUD_CPP_GRPC_PROVIDER} STREQUAL "module")
-
- # Export the CMake targets to make it easy to create configuration files.
- install(EXPORT bigtable-targets
-- DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/bigtable_client")
-+ DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/cmake/Modules")
- endif ()
-
- install(TARGETS bigtable_client
-@@ -407,5 +413,4 @@ configure_file("${PROJECT_SOURCE_DIR}/google/cloud/config-version.cmake.in"
- "bigtable_client-config-version.cmake" @ONLY)
- install(FILES "${CMAKE_CURRENT_BINARY_DIR}/bigtable_client-config.cmake"
- "${CMAKE_CURRENT_BINARY_DIR}/bigtable_client-config-version.cmake"
-- DESTINATION
-- "${CMAKE_INSTALL_LIBDIR}/cmake/bigtable_client")
-+ DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/cmake/Modules")
-diff --git a/google/cloud/firestore/CMakeLists.txt b/google/cloud/firestore/CMakeLists.txt
-index 88c5ad6d..63d8add1 100644
---- a/google/cloud/firestore/CMakeLists.txt
-+++ b/google/cloud/firestore/CMakeLists.txt
-@@ -62,6 +62,9 @@ target_include_directories(firestore_client
- $<INSTALL_INTERFACE:include>)
- target_compile_options(firestore_client
- PUBLIC ${GOOGLE_CLOUD_CPP_EXCEPTIONS_FLAG})
-+set_target_properties(firestore_client PROPERTIES
-+ VERSION ${FIRESTORE_CLIENT_VERSION_MAJOR}.${FIRESTORE_CLIENT_VERSION_MINOR}.${FIRESTORE_CLIENT_VERSION_PATCH}
-+ SOVERSION ${FIRESTORE_CLIENT_VERSION_MAJOR})
- add_library(firestore::client ALIAS firestore_client)
-
- include(CreateBazelConfig)
-@@ -104,7 +107,8 @@ install(TARGETS
-
- # The exports can only be installed if all the dependencies are installed. CMake
- # needs to know where the submodules will be installed from,
--install(EXPORT firestore-targets DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/cmake)
-+install(EXPORT firestore-targets
-+ DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/cmake/Modules")
-
- install(TARGETS firestore_client
- EXPORT firestore-targets
-@@ -138,8 +142,6 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/firestore_client.pc" DESTINATION
- configure_file("config.cmake.in" "firestore_client-config.cmake" @ONLY)
- configure_file("${PROJECT_SOURCE_DIR}/google/cloud/config-version.cmake.in"
- "firestore_client-config-version.cmake" @ONLY)
--install(
-- FILES "${CMAKE_CURRENT_BINARY_DIR}/firestore_client-config.cmake"
-- "${CMAKE_CURRENT_BINARY_DIR}/firestore_client-config-version.cmake"
-- DESTINATION
-- ${CMAKE_INSTALL_DATAROOTDIR}/cmake)
-+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/firestore_client-config.cmake"
-+ "${CMAKE_CURRENT_BINARY_DIR}/firestore_client-config-version.cmake"
-+ DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/cmake/Modules")
-diff --git a/google/cloud/storage/CMakeLists.txt b/google/cloud/storage/CMakeLists.txt
-index c8b641a0..c91bb17c 100644
---- a/google/cloud/storage/CMakeLists.txt
-+++ b/google/cloud/storage/CMakeLists.txt
-@@ -216,6 +216,9 @@ target_include_directories(storage_client
- $<INSTALL_INTERFACE:include>)
- target_compile_options(storage_client
- PUBLIC ${GOOGLE_CLOUD_CPP_EXCEPTIONS_FLAG})
-+set_target_properties(storage_client PROPERTIES
-+ VERSION ${STORAGE_CLIENT_VERSION_MAJOR}.${STORAGE_CLIENT_VERSION_MINOR}.${STORAGE_CLIENT_VERSION_PATCH}
-+ SOVERSION ${STORAGE_CLIENT_VERSION_MAJOR})
-
- add_library(storage_client_testing
- testing/canonical_errors.h
-@@ -326,20 +329,20 @@ install(TARGETS storage_common_options nlohmann_json
-
- # Export the CMake targets to make it easy to create configuration files.
- install(EXPORT storage-targets
-- DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/storage_client")
-+ DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/cmake/Modules")
-
- install(TARGETS storage_client
- EXPORT storage-targets
- RUNTIME DESTINATION bin
- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
--install(DIRECTORY . DESTINATION include/storage/client
-+install(DIRECTORY . DESTINATION include/google/cloud/storage/client
- FILES_MATCHING
- PATTERN "*.h"
- PATTERN "testing/*"
- EXCLUDE)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/version_info.h DESTINATION
-- include/storage/client)
-+ include/google/cloud/storage/client)
-
- # Setup global variables used in the following *.in files.
- set(GOOGLE_CLOUD_CPP_CONFIG_VERSION_MAJOR ${STORAGE_CLIENT_VERSION_MAJOR})
-@@ -362,5 +365,4 @@ configure_file("${PROJECT_SOURCE_DIR}/google/cloud/config-version.cmake.in"
- "storage_client-config-version.cmake" @ONLY)
- install(FILES "${CMAKE_CURRENT_BINARY_DIR}/storage_client-config.cmake"
- "${CMAKE_CURRENT_BINARY_DIR}/storage_client-config-version.cmake"
-- DESTINATION
-- "${CMAKE_INSTALL_LIBDIR}/cmake/storage_client")
-+ DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/cmake/Modules")
---
-2.16.4
-
diff --git a/net-libs/google-cloud-cpp/files/0002-cmake-set-library-soversions.patch b/net-libs/google-cloud-cpp/files/0002-cmake-set-library-soversions.patch
new file mode 100644
index 00000000000..74a57711ed6
--- /dev/null
+++ b/net-libs/google-cloud-cpp/files/0002-cmake-set-library-soversions.patch
@@ -0,0 +1,130 @@
+From b1d6f58033be92661f91b221b878e333eb02fd7f Mon Sep 17 00:00:00 2001
+From: Jason Zaman <jason@perfinion.com>
+Date: Fri, 7 Sep 2018 22:35:24 +0800
+Subject: [PATCH 2/2] cmake: set library soversions
+
+Set library soversions so CMake sets the symlinks and soversions
+properly. Install the cmake files in the correct dir.
+
+Signed-off-by: Jason Zaman <jason@perfinion.com>
+---
+ google/cloud/CMakeLists.txt | 7 +++++++
+ google/cloud/bigtable/CMakeLists.txt | 14 ++++++++++++++
+ google/cloud/firestore/CMakeLists.txt | 12 ++++++++++--
+ google/cloud/storage/CMakeLists.txt | 9 ++++++++-
+ 4 files changed, 39 insertions(+), 3 deletions(-)
+
+diff --git a/google/cloud/CMakeLists.txt b/google/cloud/CMakeLists.txt
+index 3f3f8742..442f4e17 100644
+--- a/google/cloud/CMakeLists.txt
++++ b/google/cloud/CMakeLists.txt
+@@ -98,6 +98,13 @@ target_include_directories(google_cloud_cpp_common
+ $<INSTALL_INTERFACE:include>)
+ target_compile_options(google_cloud_cpp_common
+ PUBLIC ${GOOGLE_CLOUD_CPP_EXCEPTIONS_FLAG})
++set_target_properties(
++ google_cloud_cpp_common
++ PROPERTIES
++ VERSION
++ ${GOOGLE_CLOUD_CPP_VERSION_MAJOR}.${GOOGLE_CLOUD_CPP_VERSION_MINOR}.${GOOGLE_CLOUD_CPP_VERSION_PATCH}
++ SOVERSION
++ ${GOOGLE_CLOUD_CPP_VERSION_MAJOR})
+
+ include(CreateBazelConfig)
+ create_bazel_config(google_cloud_cpp_common)
+diff --git a/google/cloud/bigtable/CMakeLists.txt b/google/cloud/bigtable/CMakeLists.txt
+index 9ed778eb..fd9c8797 100644
+--- a/google/cloud/bigtable/CMakeLists.txt
++++ b/google/cloud/bigtable/CMakeLists.txt
+@@ -102,6 +102,13 @@ target_include_directories(bigtable_protos
+ $<INSTALL_INTERFACE:include>)
+ target_compile_options(bigtable_protos
+ PUBLIC ${GOOGLE_CLOUD_CPP_EXCEPTIONS_FLAG})
++set_target_properties(
++ bigtable_protos
++ PROPERTIES
++ VERSION
++ ${BIGTABLE_CLIENT_VERSION_MAJOR}.${BIGTABLE_CLIENT_VERSION_MINOR}.${BIGTABLE_CLIENT_VERSION_PATCH}
++ SOVERSION
++ ${BIGTABLE_CLIENT_VERSION_MAJOR})
+ add_library(bigtable::protos ALIAS bigtable_protos)
+
+ # Enable unit tests
+@@ -206,6 +213,13 @@ target_include_directories(bigtable_client
+ $<INSTALL_INTERFACE:include>)
+ target_compile_options(bigtable_client
+ PUBLIC ${GOOGLE_CLOUD_CPP_EXCEPTIONS_FLAG})
++set_target_properties(
++ bigtable_client
++ PROPERTIES
++ VERSION
++ ${BIGTABLE_CLIENT_VERSION_MAJOR}.${BIGTABLE_CLIENT_VERSION_MINOR}.${BIGTABLE_CLIENT_VERSION_PATCH}
++ SOVERSION
++ ${BIGTABLE_CLIENT_VERSION_MAJOR})
+ add_library(bigtable::client ALIAS bigtable_client)
+
+ include(CreateBazelConfig)
+diff --git a/google/cloud/firestore/CMakeLists.txt b/google/cloud/firestore/CMakeLists.txt
+index 88c5ad6d..c69e48fd 100644
+--- a/google/cloud/firestore/CMakeLists.txt
++++ b/google/cloud/firestore/CMakeLists.txt
+@@ -62,6 +62,13 @@ target_include_directories(firestore_client
+ $<INSTALL_INTERFACE:include>)
+ target_compile_options(firestore_client
+ PUBLIC ${GOOGLE_CLOUD_CPP_EXCEPTIONS_FLAG})
++set_target_properties(
++ firestore_client
++ PROPERTIES
++ VERSION
++ ${FIRESTORE_CLIENT_VERSION_MAJOR}.${FIRESTORE_CLIENT_VERSION_MINOR}.${FIRESTORE_CLIENT_VERSION_PATCH}
++ SOVERSION
++ ${FIRESTORE_CLIENT_VERSION_MAJOR})
+ add_library(firestore::client ALIAS firestore_client)
+
+ include(CreateBazelConfig)
+@@ -104,7 +111,8 @@ install(TARGETS
+
+ # The exports can only be installed if all the dependencies are installed. CMake
+ # needs to know where the submodules will be installed from,
+-install(EXPORT firestore-targets DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/cmake)
++install(EXPORT firestore-targets
++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/firestore_client")
+
+ install(TARGETS firestore_client
+ EXPORT firestore-targets
+@@ -142,4 +150,4 @@ install(
+ FILES "${CMAKE_CURRENT_BINARY_DIR}/firestore_client-config.cmake"
+ "${CMAKE_CURRENT_BINARY_DIR}/firestore_client-config-version.cmake"
+ DESTINATION
+- ${CMAKE_INSTALL_DATAROOTDIR}/cmake)
++ "${CMAKE_INSTALL_LIBDIR}/cmake/firestore_client")
+diff --git a/google/cloud/storage/CMakeLists.txt b/google/cloud/storage/CMakeLists.txt
+index cef3954b..912391cc 100644
+--- a/google/cloud/storage/CMakeLists.txt
++++ b/google/cloud/storage/CMakeLists.txt
+@@ -205,6 +205,13 @@ target_include_directories(storage_client
+ $<INSTALL_INTERFACE:include>)
+ target_compile_options(storage_client
+ PUBLIC ${GOOGLE_CLOUD_CPP_EXCEPTIONS_FLAG})
++set_target_properties(
++ storage_client
++ PROPERTIES
++ VERSION
++ ${STORAGE_CLIENT_VERSION_MAJOR}.${STORAGE_CLIENT_VERSION_MINOR}.${STORAGE_CLIENT_VERSION_PATCH}
++ SOVERSION
++ ${STORAGE_CLIENT_VERSION_MAJOR})
+
+ add_library(storage_client_testing
+ testing/canonical_errors.h
+@@ -315,7 +322,7 @@ install(TARGETS storage_client
+ RUNTIME DESTINATION bin
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+-install(DIRECTORY . DESTINATION include/storage/client
++install(DIRECTORY . DESTINATION include/google/cloud/storage/client
+ FILES_MATCHING
+ PATTERN "*.h"
+ PATTERN "testing/*"
+--
+2.16.4
+
diff --git a/net-libs/google-cloud-cpp/google-cloud-cpp-0.2.0.ebuild b/net-libs/google-cloud-cpp/google-cloud-cpp-0.2.0-r1.ebuild
similarity index 93%
rename from net-libs/google-cloud-cpp/google-cloud-cpp-0.2.0.ebuild
rename to net-libs/google-cloud-cpp/google-cloud-cpp-0.2.0-r1.ebuild
index 0cc60cd4db4..c1e409f155e 100644
--- a/net-libs/google-cloud-cpp/google-cloud-cpp-0.2.0.ebuild
+++ b/net-libs/google-cloud-cpp/google-cloud-cpp-0.2.0-r1.ebuild
@@ -27,8 +27,9 @@ DEPEND="${RDEPEND}
DOCS=( README.md )
PATCHES=(
+ "${FILESDIR}/0001-Make-the-install-target-work.patch"
"${FILESDIR}/0001-cmake-Fix-GOOGLE_CLOUD_CPP_GRPC_PROVIDER-pkg-config.patch"
- "${FILESDIR}/0002-cmake-fix-library-issues.patch"
+ "${FILESDIR}/0002-cmake-set-library-soversions.patch"
)
src_prepare() {
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/google-cloud-cpp/files/, net-libs/google-cloud-cpp/
@ 2019-06-04 16:34 Jason Zaman
0 siblings, 0 replies; 4+ messages in thread
From: Jason Zaman @ 2019-06-04 16:34 UTC (permalink / raw
To: gentoo-commits
commit: 40be63abc737a76dd5b43d73f36785db3da1c37a
Author: Jason Zaman <perfinion <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 2 18:55:36 2019 +0000
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Tue Jun 4 16:32:42 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40be63ab
net-libs/google-cloud-cpp: bump 0.9.0
Signed-off-by: Jason Zaman <perfinion <AT> gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
net-libs/google-cloud-cpp/Manifest | 1 +
...ogle-cloud-cpp-0.9.0-offline_nlohmannjson.patch | 15 ++++++
.../google-cloud-cpp/google-cloud-cpp-0.9.0.ebuild | 60 ++++++++++++++++++++++
3 files changed, 76 insertions(+)
diff --git a/net-libs/google-cloud-cpp/Manifest b/net-libs/google-cloud-cpp/Manifest
index 98fcedfa01c..bab75bc1ed8 100644
--- a/net-libs/google-cloud-cpp/Manifest
+++ b/net-libs/google-cloud-cpp/Manifest
@@ -1,5 +1,6 @@
DIST google-cloud-cpp-0.2.0.tar.gz 687020 BLAKE2B 45c09c7cb5b9cc93c87e6d1faedf04f29ae81196dda95660abeadeaaf522376b4e50fd42489476c081e8de7336202d3883ab276c0e2334f1ad1b0e4e1f90fdb8 SHA512 ded3b564ef264a8bff4d81b08f2a97462e063127bf75a006bc7b18d18cfaee2f3cbe5957fe2c56cec06da5a7765854444fad8cd5045579c416c5f3de8462382e
DIST google-cloud-cpp-0.5.0.tar.gz 1050893 BLAKE2B 6e96e2ca3f518f3c417d9d395001a42182aaeacdbbcfedc636387dbccedf5e570367bc66e5b3fecbe53d5b61e51b53709b83da90718826ac643fb2c43c1723c6 SHA512 48c5f4828bc85ae2c4bfe52b5bb51ff5da6a4cd6759f819aefaf9c23d7fffeb0a10390274f0e83f030f66f59a364c05583240e426143073187f104345e0b05d5
+DIST google-cloud-cpp-0.9.0.tar.gz 2209532 BLAKE2B 33b297d4836cf171833a4481b567d22f44aacdb0afd5422ec7da7f3c47fc1284a4a7723e306508c7dc7cc595166f040abe00a92eed58a07dfed77b94f99e9889 SHA512 b62051b9396efe8af8063d28ac958524b762a90c053f82030834bd38f018f0755487f6b39ceb5a0082d7cbf8784854c4effd81de27633086857330dc9bda182b
DIST googleapis-6a3277c0656219174ff7c345f31fb20a90b30b97.tar.gz 746503 BLAKE2B c0cba88c19c658ba7e9e65b80557903f8ded280d25438120b32f8c29a714b58a527c9218f0f73b53646949ecc073d873fee712b370b95523bdea5c28747eeb25 SHA512 92795397dfb9a6aa931be7b191ee91f9f2678a7175dea6babf19a50f61923373d288832cf10edf1ff252ca5148fe649c1bf95535e7c21513129495afae4c0ff7
DIST googleapis-79ab27f3b70ebc221e265d2e8ab30a8cc2d21fa2.tar.gz 874997 BLAKE2B c837323124d26364c83dba72d4f73f3147ad117468b271e8d9502991c1f9a7b20d4f5405351147b65e99c57d207a2b8c1471228d2060ad238ade5159be1b009e SHA512 774e56fc30a4daf2e88d8d3b6747c1ac369d016e9d52527565b88d93252a22597339c17e612304f8823867da4b6df4b58a42dc9d4d480fc59962ee5314a85ab8
DIST nlohmann-json-3.1.2-json.hpp 595822 BLAKE2B 510278344a510a516606f84aea53c682a64a7d1f4703e41503a1688e7c62ab1df8f197a697bd1149e958d21ab986d1b42cb78db6261b07239d9587756813acf5 SHA512 05df0ad3338f0bca885c0aa9da523922b99016986a9b01426b13888c0febd83bf1f6f063886f6c75f8a656ef79abac6292fe442dc05b1897d546ba5b70be48a5
diff --git a/net-libs/google-cloud-cpp/files/google-cloud-cpp-0.9.0-offline_nlohmannjson.patch b/net-libs/google-cloud-cpp/files/google-cloud-cpp-0.9.0-offline_nlohmannjson.patch
new file mode 100644
index 00000000000..b528647311e
--- /dev/null
+++ b/net-libs/google-cloud-cpp/files/google-cloud-cpp-0.9.0-offline_nlohmannjson.patch
@@ -0,0 +1,15 @@
+diff --git a/cmake/DownloadNlohmannJson.cmake b/cmake/DownloadNlohmannJson.cmake
+index 1db953bed..4bbbe35fa 100644
+--- a/cmake/DownloadNlohmannJson.cmake
++++ b/cmake/DownloadNlohmannJson.cmake
+@@ -37,6 +37,10 @@ function (_download_json_hpp)
+ execute_process(COMMAND "${CMAKE_COMMAND}" -E sleep
+ "${sleep_seconds}")
+ endif ()
++ if (EXISTS "${DEST}/json.hpp")
++ set(download_error_code 0)
++ break()
++ endif ()
+ file(DOWNLOAD "${JSON_URL}" "${DEST}/json.hpp" STATUS download_status)
+ list(GET download_status 0 download_error_code)
+ if (download_error_code EQUAL 0)
diff --git a/net-libs/google-cloud-cpp/google-cloud-cpp-0.9.0.ebuild b/net-libs/google-cloud-cpp/google-cloud-cpp-0.9.0.ebuild
new file mode 100644
index 00000000000..0575f7a04ab
--- /dev/null
+++ b/net-libs/google-cloud-cpp/google-cloud-cpp-0.9.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+JSON_VER="3.4.0"
+GOOGLEAPIS_COMMIT="6a3277c0656219174ff7c345f31fb20a90b30b97"
+
+DESCRIPTION="Google Cloud Client Library for C++"
+HOMEPAGE="https://cloud.google.com/"
+SRC_URI="https://github.com/GoogleCloudPlatform/google-cloud-cpp/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ https://github.com/nlohmann/json/releases/download/v${JSON_VER}/json.hpp -> nlohmann-json-${JSON_VER}-json.hpp
+ https://github.com/googleapis/googleapis/archive/${GOOGLEAPIS_COMMIT}.tar.gz -> googleapis-${GOOGLEAPIS_COMMIT}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT="test"
+RDEPEND="dev-libs/protobuf:=
+ dev-libs/crc32c
+ net-misc/curl
+ net-libs/grpc:="
+DEPEND="${RDEPEND}
+ dev-cpp/gtest"
+
+DOCS=( README.md )
+PATCHES=(
+ "${FILESDIR}/google-cloud-cpp-0.5.0-openssl.patch"
+ "${FILESDIR}/google-cloud-cpp-0.9.0-offline_nlohmannjson.patch"
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DGOOGLE_CLOUD_CPP_DEPENDENCY_PROVIDER=package
+ -DBUILD_SHARED_LIBS=ON
+ -DBUILD_TESTING=OFF
+ )
+
+ cmake-utils_src_configure
+
+ mkdir -p "${BUILD_DIR}/external/nlohmann_json/src/" || die
+ cp "${DISTDIR}/nlohmann-json-${JSON_VER}-json.hpp" "${BUILD_DIR}/external/nlohmann_json/src/json.hpp" || die
+
+ mkdir -p "${BUILD_DIR}/external/googleapis/src/" || die
+ cp "${DISTDIR}/googleapis-${GOOGLEAPIS_COMMIT}.tar.gz" \
+ "${BUILD_DIR}/external/googleapis/src/${GOOGLEAPIS_COMMIT}.tar.gz" || die
+}
+
+src_test() {
+ # test fails
+ local myctestargs=(
+ -E internal_parse_rfc3339_test
+ )
+
+ cmake-utils_src_test
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-libs/google-cloud-cpp/files/, net-libs/google-cloud-cpp/
@ 2024-08-11 22:15 Jason Zaman
0 siblings, 0 replies; 4+ messages in thread
From: Jason Zaman @ 2024-08-11 22:15 UTC (permalink / raw
To: gentoo-commits
commit: 5625b743cbb5688bba2b2d3adc8056a30f33bf25
Author: Filip Kobierski <fkobi <AT> pm <DOT> me>
AuthorDate: Wed Jul 31 13:01:30 2024 +0000
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Sun Aug 11 22:15:16 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5625b743
net-libs/google-cloud-cpp: drop old
Signed-off-by: Filip Kobierski <fkobi <AT> pm.me>
Signed-off-by: Jason Zaman <perfinion <AT> gentoo.org>
net-libs/google-cloud-cpp/Manifest | 5 --
...ogle-cloud-cpp-0.9.0-offline_nlohmannjson.patch | 15 ------
.../google-cloud-cpp-0.10.0-r2.ebuild | 61 ---------------------
.../google-cloud-cpp-1.36.0.ebuild | 62 ----------------------
4 files changed, 143 deletions(-)
diff --git a/net-libs/google-cloud-cpp/Manifest b/net-libs/google-cloud-cpp/Manifest
index ad1605349f85..d4da5f6c7ee5 100644
--- a/net-libs/google-cloud-cpp/Manifest
+++ b/net-libs/google-cloud-cpp/Manifest
@@ -1,7 +1,2 @@
-DIST google-cloud-cpp-0.10.0.tar.gz 2189161 BLAKE2B 1e599478db3f280cddc4232c7e6005c7b5a48b1f22aecc8a99dc60f461dad349d343b40e6545680e7b211ea40a07c9b069052c2a6e36cb7279e400cdebfa95a3 SHA512 9a1774dcc39d1626c8a9cf8630fe3b3110df7e21e452c7b137e1911d10b304997571aadff5fc0216715729db4a29621066a5236a0b2cb027bba4ce3c56492fb3
-DIST google-cloud-cpp-1.36.0.tar.gz 4522003 BLAKE2B f436935b3a95fa911fb04429ee20b0712eeaf58f8ebfdd1b75f848e19ffa88d17b1be1d917f5693f1996ce6eaff6bd6053958c2b20cf29370164bccf2794c76c SHA512 a9885f9e0726de64eaee0376f3d1ed3a00c32919f2b9a911479206f2965a62eea5ff292b459f61eae97d5d2fe336c410c615296fcb0c7506faf45c57bd6f8871
DIST google-cloud-cpp-2.19.0.tar.gz 12289079 BLAKE2B 915acacdc8e757e95244c715b74618e34ae3a22ea39bd0ae3e628dcd07f0dc99a2baaa11f4f69b9d2134ffc10af9e9437cf8862eff19a720ff415e0b1b15e6b8 SHA512 a392da19ac353409ecbf30e390803b2e34670552fd54466a08ee554a77c893d447289b30d5841c7f79b2a23244a269d8ecac8f7fbd8a34dda45ce2d8b1d46817
DIST googleapis-0e3b813b0d0da539eacbe86b8716feeed00943c5.tar.gz 7914422 BLAKE2B 05dfb0523a4208c84d51e99bb3edd531b1d4069971fb6810ab2c31b7bc1b14824be9a4c5d0e176ad741d1b902242702be7f125595d22dd5a6d75d0a9e8790ed8 SHA512 56a9fd1ff464f33d80dcce1bfc927e4332fe2e986f731b3f8ceb583265a2b23a659273dc6777a100d563ed972672353f8fd0292f894c42b4142bb5d7882f8ef6
-DIST googleapis-28c6bb97cac6f16c69879be4e655674a74b886ef.tar.gz 5448352 BLAKE2B 0421ba9506e931d0bd7b01011832a91235f04ae825489021204da17d543671994e68dfecd97eeb8ee90f42726450d375955e1458e7dfba8551854c036bdc6069 SHA512 59f4d78c268280323314b8d471d4877cacc4238bfac3a769aa86cedd22d79ebeb50f2aaa8a60f9264976d12ef629a2a3d1a0da1c0d6723ec08f517ef0fae9450
-DIST googleapis-6a3277c0656219174ff7c345f31fb20a90b30b97.tar.gz 746503 BLAKE2B c0cba88c19c658ba7e9e65b80557903f8ded280d25438120b32f8c29a714b58a527c9218f0f73b53646949ecc073d873fee712b370b95523bdea5c28747eeb25 SHA512 92795397dfb9a6aa931be7b191ee91f9f2678a7175dea6babf19a50f61923373d288832cf10edf1ff252ca5148fe649c1bf95535e7c21513129495afae4c0ff7
-DIST nlohmann-json-3.4.0-json.hpp 705920 BLAKE2B 9a22a6420f818038d8c4b352fb92ff0f0041b76232ef8665686399d184cfc62caffb60b4ccf1d8d33ae428839a70fece959f94795d71803623405d041efc9a13 SHA512 a1bdb4b434ee34cbc360e0203f500b25e15d7e1a6d25ea6e3bd3b56a5e7ec47d8c0bbe074930b7a07d6ceaf2112eefa24da9c1f0595aaf12c88697048238166d
diff --git a/net-libs/google-cloud-cpp/files/google-cloud-cpp-0.9.0-offline_nlohmannjson.patch b/net-libs/google-cloud-cpp/files/google-cloud-cpp-0.9.0-offline_nlohmannjson.patch
deleted file mode 100644
index b528647311eb..000000000000
--- a/net-libs/google-cloud-cpp/files/google-cloud-cpp-0.9.0-offline_nlohmannjson.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/cmake/DownloadNlohmannJson.cmake b/cmake/DownloadNlohmannJson.cmake
-index 1db953bed..4bbbe35fa 100644
---- a/cmake/DownloadNlohmannJson.cmake
-+++ b/cmake/DownloadNlohmannJson.cmake
-@@ -37,6 +37,10 @@ function (_download_json_hpp)
- execute_process(COMMAND "${CMAKE_COMMAND}" -E sleep
- "${sleep_seconds}")
- endif ()
-+ if (EXISTS "${DEST}/json.hpp")
-+ set(download_error_code 0)
-+ break()
-+ endif ()
- file(DOWNLOAD "${JSON_URL}" "${DEST}/json.hpp" STATUS download_status)
- list(GET download_status 0 download_error_code)
- if (download_error_code EQUAL 0)
diff --git a/net-libs/google-cloud-cpp/google-cloud-cpp-0.10.0-r2.ebuild b/net-libs/google-cloud-cpp/google-cloud-cpp-0.10.0-r2.ebuild
deleted file mode 100644
index b441242910a4..000000000000
--- a/net-libs/google-cloud-cpp/google-cloud-cpp-0.10.0-r2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_MAKEFILE_GENERATOR=emake
-inherit cmake
-
-JSON_VER="3.4.0"
-GOOGLEAPIS_COMMIT="6a3277c0656219174ff7c345f31fb20a90b30b97"
-
-DESCRIPTION="Google Cloud Client Library for C++"
-HOMEPAGE="https://cloud.google.com/"
-SRC_URI="https://github.com/GoogleCloudPlatform/google-cloud-cpp/archive/v${PV}.tar.gz -> ${P}.tar.gz
- https://github.com/nlohmann/json/releases/download/v${JSON_VER}/json.hpp -> nlohmann-json-${JSON_VER}-json.hpp
- https://github.com/googleapis/googleapis/archive/${GOOGLEAPIS_COMMIT}.tar.gz -> googleapis-${GOOGLEAPIS_COMMIT}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT="test"
-RDEPEND="dev-libs/protobuf:=
- dev-libs/crc32c
- dev-libs/openssl:=
- net-misc/curl
- net-libs/grpc:="
-DEPEND="${RDEPEND}
- dev-cpp/gtest"
-
-DOCS=( README.md )
-PATCHES=(
- "${FILESDIR}/google-cloud-cpp-0.9.0-offline_nlohmannjson.patch"
-)
-
-src_configure() {
- local mycmakeargs=(
- -DGOOGLE_CLOUD_CPP_DEPENDENCY_PROVIDER=package
- -DBUILD_TESTING=OFF
- -DCMAKE_CXX_STANDARD=17
- )
-
- cmake_src_configure
-
- mkdir -p "${BUILD_DIR}/external/nlohmann_json/src/" || die
- cp "${DISTDIR}/nlohmann-json-${JSON_VER}-json.hpp" "${BUILD_DIR}/external/nlohmann_json/src/json.hpp" || die
-
- mkdir -p "${BUILD_DIR}/external/googleapis/src/" || die
- cp "${DISTDIR}/googleapis-${GOOGLEAPIS_COMMIT}.tar.gz" \
- "${BUILD_DIR}/external/googleapis/src/${GOOGLEAPIS_COMMIT}.tar.gz" || die
-}
-
-src_test() {
- # test fails
- local myctestargs=(
- -E internal_parse_rfc3339_test
- )
-
- cmake_src_test
-}
diff --git a/net-libs/google-cloud-cpp/google-cloud-cpp-1.36.0.ebuild b/net-libs/google-cloud-cpp/google-cloud-cpp-1.36.0.ebuild
deleted file mode 100644
index d0954a056cf3..000000000000
--- a/net-libs/google-cloud-cpp/google-cloud-cpp-1.36.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-# From cmake/GoogleapisConfig.cmake
-GOOGLEAPIS_COMMIT="28c6bb97cac6f16c69879be4e655674a74b886ef"
-
-DESCRIPTION="Google Cloud Client Library for C++"
-HOMEPAGE="https://cloud.google.com/"
-SRC_URI="https://github.com/GoogleCloudPlatform/google-cloud-cpp/archive/v${PV}.tar.gz -> ${P}.tar.gz
- https://github.com/googleapis/googleapis/archive/${GOOGLEAPIS_COMMIT}.tar.gz -> googleapis-${GOOGLEAPIS_COMMIT}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-# Tests need a GCP account
-RESTRICT="test"
-RDEPEND="dev-cpp/abseil-cpp:=
- dev-cpp/nlohmann_json
- dev-libs/protobuf:=
- dev-libs/crc32c
- dev-libs/openssl:=
- dev-libs/re2:=
- net-misc/curl
- net-libs/grpc:=
- sys-libs/zlib"
-DEPEND="${RDEPEND}
- dev-cpp/gtest
- test? (
- dev-cpp/benchmark
- )"
-
-DOCS=( README.md )
-
-src_configure() {
- local mycmakeargs=(
- -DGOOGLE_CLOUD_CPP_ENABLE_WERROR=OFF
- -DGOOGLE_CLOUD_CPP_ENABLE_EXAMPLES=OFF
- -DBUILD_TESTING=$(usex test)
- -DCMAKE_CXX_STANDARD=17
- )
-
- cmake_src_configure
-
- mkdir -p "${BUILD_DIR}/external/googleapis/src/" || die
- cp "${DISTDIR}/googleapis-${GOOGLEAPIS_COMMIT}.tar.gz" \
- "${BUILD_DIR}/external/googleapis/src/${GOOGLEAPIS_COMMIT}.tar.gz" || die
-}
-
-src_test() {
- # test fails
- local myctestargs=(
- -E internal_parse_rfc3339_test
- )
-
- cmake_src_test
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-08-11 22:15 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-09-27 16:48 [gentoo-commits] repo/gentoo:master commit in: net-libs/google-cloud-cpp/files/, net-libs/google-cloud-cpp/ Jason Zaman
-- strict thread matches above, loose matches on Subject: below --
2024-08-11 22:15 Jason Zaman
2019-06-04 16:34 Jason Zaman
2018-09-07 18:03 Jason Zaman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox