commit: 9a267c4d595e9b84222342389ee00bf75a675b3c Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> AuthorDate: Fri Aug 25 11:47:59 2023 +0000 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> CommitDate: Fri Aug 25 12:54:03 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a267c4d
dev-util/ignition-cmake: Fix find protobuf Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org> dev-util/ignition-cmake/files/protobuf.patch | 54 ++++++++++++++++++++++ .../ignition-cmake/ignition-cmake-2.17.0.ebuild | 3 +- 2 files changed, 56 insertions(+), 1 deletion(-) diff --git a/dev-util/ignition-cmake/files/protobuf.patch b/dev-util/ignition-cmake/files/protobuf.patch new file mode 100644 index 000000000000..1bb2fe6480bb --- /dev/null +++ b/dev-util/ignition-cmake/files/protobuf.patch @@ -0,0 +1,54 @@ +Index: ignition-cmake-2.17.0/cmake/FindIgnProtobuf.cmake +=================================================================== +--- ignition-cmake-2.17.0.orig/cmake/FindIgnProtobuf.cmake ++++ ignition-cmake-2.17.0/cmake/FindIgnProtobuf.cmake +@@ -26,12 +26,12 @@ + include(IgnPkgConfig) + ign_pkg_config_entry(IgnProtobuf "protobuf >= ${IgnProtobuf_FIND_VERSION}") + +-find_package(Protobuf ${IgnProtobuf_FIND_VERSION} QUIET CONFIG) ++find_package(protobuf ${IgnProtobuf_FIND_VERSION} QUIET CONFIG) + +-if(NOT ${Protobuf_FOUND}) ++if(NOT ${protobuf_FOUND}) + # If a config-file was not found, then fall back on the system-installed + # find-module that comes with CMake. +- find_package(Protobuf ${IgnProtobuf_FIND_VERSION}) ++ find_package(protobuf ${IgnProtobuf_FIND_VERSION}) + endif() + + set(IgnProtobuf_missing_components "") +@@ -49,21 +49,21 @@ foreach(component ${IgnProtobuf_FIND_COM + + if((${component} STREQUAL "libprotobuf") OR (${component} STREQUAL "all")) + if((NOT PROTOBUF_LIBRARY) AND (NOT TARGET protobuf::libprotobuf)) +- set(Protobuf_FOUND false) ++ set(protobuf_FOUND false) + ign_string_append(IgnProtobuf_missing_components "libprotobuf" DELIM " ") + endif() + endif() + + if((${component} STREQUAL "libprotoc") OR (${component} STREQUAL "all")) + if((NOT PROTOBUF_PROTOC_LIBRARY) AND (NOT TARGET protobuf::libprotoc)) +- set(Protobuf_FOUND false) ++ set(protobuf_FOUND false) + ign_string_append(IgnProtobuf_missing_components "libprotoc" DELIM " ") + endif() + endif() + + if((${component} STREQUAL "protoc") OR (${component} STREQUAL "all")) + if((NOT PROTOBUF_PROTOC_EXECUTABLE) AND (NOT TARGET protobuf::protoc)) +- set(Protobuf_FOUND false) ++ set(protobuf_FOUND false) + ign_string_append(IgnProtobuf_missing_components "protoc" DELIM " ") + endif() + endif() +@@ -74,7 +74,7 @@ if(IgnProtobuf_missing_components AND NO + message(STATUS "Missing required protobuf components: ${IgnProtobuf_missing_components}") + endif() + +-if(${Protobuf_FOUND}) ++if(${protobuf_FOUND}) + # If we have found Protobuf, then set the IgnProtobuf_FOUND flag to true so + # that ign_find_package(~) knows that we were successful. + set(IgnProtobuf_FOUND true) diff --git a/dev-util/ignition-cmake/ignition-cmake-2.17.0.ebuild b/dev-util/ignition-cmake/ignition-cmake-2.17.0.ebuild index 52d3b6de808d..b19b57da6d01 100644 --- a/dev-util/ignition-cmake/ignition-cmake-2.17.0.ebuild +++ b/dev-util/ignition-cmake/ignition-cmake-2.17.0.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit cmake @@ -14,6 +14,7 @@ SLOT="2" KEYWORDS="~amd64" IUSE="test" RESTRICT="!test? ( test )" +PATCHES=( "${FILESDIR}/protobuf.patch" ) src_configure() { local mycmakeargs=(