From d2146675d761596e208452d588a3858ffb196800 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 16 Jun 2025 07:07:45 +0000 Subject: [PATCH] dev-cpp/glog: Sync with Gentoo It's from Gentoo commit 89bae30fab90f218bd7a1d56e825819e4576a4c4. --- .../portage-stable/dev-cpp/glog/Manifest | 1 + .../glog/files/glog-0.6.0-cmake-4.patch | 18 ++++++ .../dev-cpp/glog/glog-0.6.0-r1.ebuild | 64 +++++++++++++++++++ .../dev-cpp/glog/glog-0.7.1.ebuild | 60 +++++++++++++++++ 4 files changed, 143 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/dev-cpp/glog/files/glog-0.6.0-cmake-4.patch create mode 100644 sdk_container/src/third_party/portage-stable/dev-cpp/glog/glog-0.6.0-r1.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/dev-cpp/glog/glog-0.7.1.ebuild diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/glog/Manifest b/sdk_container/src/third_party/portage-stable/dev-cpp/glog/Manifest index 27d44dcf6c..62d3e0cef1 100644 --- a/sdk_container/src/third_party/portage-stable/dev-cpp/glog/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-cpp/glog/Manifest @@ -1,2 +1,3 @@ DIST glog-0.5.0.tar.gz 183346 BLAKE2B 9109a9a4bd3c74ba5d4c1d9ed44ffe0e16d5d3b9b12bf9dd5d31c6e728292ea50f39b4e1b96d55fbb35653a448af4dc8a978e266a2b0f34261c5108099e90845 SHA512 445e4338f3d81cd0b065f2da9c6ce343c243263ca144cea424ef97531a4e9e09c06ffd6942ac01c5213a8003c75cfbbede3c4028d12f0134f23ff29314769c1a DIST glog-0.6.0.tar.gz 193267 BLAKE2B b42112cdfd54280ce7a9592c3af6b6e10dcb854fe9dbe0db7445c60801d1c12a240c4b3709b45e41aedeb8876d2e08fc3368296e088be6a66126858888cc274e SHA512 fd2c42583d0dd72c790a8cf888f328a64447c5fb9d99b2e2a3833d70c102cb0eb9ae874632c2732424cc86216c8a076a3e24b23a793eaddb5da8a1dc52ba9226 +DIST glog-0.7.1.tar.gz 182681 BLAKE2B d8bf2d4285e3be17a151d1f6f63dedbac9d5dd6667983d37e4b591be49751b6982abff7802dcd2c42651360d354c6c8ab1cc03c216ed1a3f7ba5cfb6a1a60dbf SHA512 2dabac87d44e4fe58beceb31b22be732b47df84c22f1af8c0e7d0f262de939889de1f16025c1256539f2833ef3393bc92034e983aa2886752bb8705801a68630 diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/glog/files/glog-0.6.0-cmake-4.patch b/sdk_container/src/third_party/portage-stable/dev-cpp/glog/files/glog-0.6.0-cmake-4.patch new file mode 100644 index 0000000000..0f17e373e2 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-cpp/glog/files/glog-0.6.0-cmake-4.patch @@ -0,0 +1,18 @@ +https://bugs.gentoo.org/954083 +https://github.com/google/glog/commit/3411d58669fe07e70335b252299432a00d1e7c6c + +From 3411d58669fe07e70335b252299432a00d1e7c6c Mon Sep 17 00:00:00 2001 +From: Sergiu Deitsch +Date: Thu, 5 Oct 2023 00:48:10 +0200 +Subject: [PATCH] cmake: eliminate deprecation warning + +--- a/cmake/GetCacheVariables.cmake ++++ b/cmake/GetCacheVariables.cmake +@@ -1,5 +1,5 @@ + cmake_policy (PUSH) +-cmake_policy (VERSION 3.3) ++cmake_policy (VERSION 3.16...3.27) + + include (CMakeParseArguments) + + diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/glog/glog-0.6.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-cpp/glog/glog-0.6.0-r1.ebuild new file mode 100644 index 0000000000..fca47051d4 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-cpp/glog/glog-0.6.0-r1.ebuild @@ -0,0 +1,64 @@ +# Copyright 2011-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake-multilib + +DESCRIPTION="Google Logging library" +HOMEPAGE="https://github.com/google/glog" + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://github.com/google/glog" + inherit git-r3 +else + SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +fi + +LICENSE="BSD" +SLOT="0/1" +IUSE="gflags +libunwind llvm-libunwind test" +RESTRICT="!test? ( test )" + +RDEPEND=" + gflags? ( dev-cpp/gflags:=[${MULTILIB_USEDEP}] ) + libunwind? ( + llvm-libunwind? ( llvm-runtimes/libunwind:=[${MULTILIB_USEDEP}] ) + !llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] ) + ) +" +DEPEND=" + ${RDEPEND} + test? ( >=dev-cpp/gtest-1.8.0[${MULTILIB_USEDEP}] ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-0.6.0-cmake-4.patch +) + +src_configure() { + local mycmakeargs=( + -DBUILD_TESTING=$(usex test ON OFF) + -DWITH_GFLAGS=$(usex gflags ON OFF) + -DWITH_GTEST=$(usex test ON OFF) + -DWITH_UNWIND=$(usex libunwind ON OFF) + ) + + cmake-multilib_src_configure +} + +src_test() { + # Tests have a history of being brittle: bug #863599 + CMAKE_SKIP_TESTS=( + logging + stacktrace + symbolize + log_severity_conversion + includes_vlog_is_on + includes_raw_logging + ) + + cmake-multilib_src_test -j1 +} diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/glog/glog-0.7.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-cpp/glog/glog-0.7.1.ebuild new file mode 100644 index 0000000000..478208ff70 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-cpp/glog/glog-0.7.1.ebuild @@ -0,0 +1,60 @@ +# Copyright 2011-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake-multilib + +DESCRIPTION="Google Logging library" +HOMEPAGE="https://github.com/google/glog" + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://github.com/google/glog" + inherit git-r3 +else + SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +fi + +LICENSE="BSD" +SLOT="0/2" +IUSE="gflags +libunwind llvm-libunwind test" +RESTRICT="!test? ( test )" + +RDEPEND=" + gflags? ( dev-cpp/gflags:=[${MULTILIB_USEDEP}] ) + libunwind? ( + llvm-libunwind? ( llvm-runtimes/libunwind:=[${MULTILIB_USEDEP}] ) + !llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] ) + ) +" +DEPEND=" + ${RDEPEND} + test? ( >=dev-cpp/gtest-1.8.0[${MULTILIB_USEDEP}] ) +" + +src_configure() { + local mycmakeargs=( + -DBUILD_TESTING=$(usex test ON OFF) + -DWITH_GFLAGS=$(usex gflags ON OFF) + -DWITH_GTEST=$(usex test ON OFF) + -DWITH_UNWIND=$(usex libunwind ON OFF) + ) + + cmake-multilib_src_configure +} + +src_test() { + # Tests have a history of being brittle: bug #863599 + CMAKE_SKIP_TESTS=( + logging + stacktrace + symbolize + log_severity_conversion + includes_vlog_is_on + includes_raw_logging + ) + + cmake-multilib_src_test -j1 +}