diff options
author | V3n3RiX <venerix@koprulu.sector> | 2024-06-10 00:08:04 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2024-06-10 00:08:04 +0100 |
commit | 0aad4cd3e3fe3db90904ffc51b35e4ff160b53c5 (patch) | |
tree | a522875f946841ad0790b8170c9201bb145e09bc /dev-cpp/glog | |
parent | 4fe228ee9aa3b9b825d54ace549a5517e153e8bd (diff) |
gentoo auto-resync : 10:06:2024 - 00:08:04
Diffstat (limited to 'dev-cpp/glog')
-rw-r--r-- | dev-cpp/glog/Manifest | 5 | ||||
-rw-r--r-- | dev-cpp/glog/files/glog-0.4.0-errnos.patch | 99 | ||||
-rw-r--r-- | dev-cpp/glog/files/glog-0.4.0-fix-test-on-ports.patch | 19 | ||||
-rw-r--r-- | dev-cpp/glog/files/glog-0.4.0-fix-x32-build.patch | 35 | ||||
-rw-r--r-- | dev-cpp/glog/glog-0.4.0.ebuild | 46 |
5 files changed, 0 insertions, 204 deletions
diff --git a/dev-cpp/glog/Manifest b/dev-cpp/glog/Manifest index 7b06b5f1b8ad..fb6942c0a512 100644 --- a/dev-cpp/glog/Manifest +++ b/dev-cpp/glog/Manifest @@ -1,12 +1,7 @@ -AUX glog-0.4.0-errnos.patch 4580 BLAKE2B 9a7f86fb2dbcab68948914dcef74e1e08750462e58f56b3f337ad845e1ff4bcdf831e7e231e274bce7db9a4228c307b6bb3baa85ce6cb3eee8625414da6273c9 SHA512 8be72be6d6c27bdbe74dbb95cc2534dcfcd7adc1d85fc5f7022a2b7599ae6b148431623140141ed9863d54febaa414673d18b8fbc8c5aea7f0e43b0f92a54432 -AUX glog-0.4.0-fix-test-on-ports.patch 804 BLAKE2B a06a45c977ab55f086e707ad2ea113d93dedb2710fc1cf12fafc700702eb8be5812b73ea4b941355ec948d4659963e1bc7829df12a4da9ba7b80caa3d6ca20e7 SHA512 dd787c363a08810abec89f64b5aa0f77206a0963af1a0fcf5b91549528df875e83cf736cfc2d9eff63007c2d25d0ba71092368272bb5588525cf9af6300ea9a0 -AUX glog-0.4.0-fix-x32-build.patch 913 BLAKE2B fc7d4e452580b8ca073439782204da8d04fd36dfc6f06e19426d980127b505a68fc8044b62b04fee5a9b218167a2e119307ea4ec1915807ee6a3ebf89aea83a9 SHA512 2c0bd65824e0ed9923c328554a6dad25d9a02b776e465044a8197416a14da5d986ea9b9394e2da2e6981a1d4149ad67d22b753566177da8c13c0e481432f4e54 AUX glog-0.5.0-IsGoogleLoggingInitialized_public.patch 3039 BLAKE2B 3df4edd58d1aa8380a722baab1b09d6d93d3750bd87d45e7496f81e3115ade12d925f4a4804f467d9a114a753ddbd78651f56b2b78076f026b8f85e7bbcd7d24 SHA512 362f1bc727e38bf17c68df90d33aa229b9ffd60618e80ed26d8127f2d80fee4792ea7179039ad8bd109c87cbfcc40fe2d9e6104397b63ee5221f8cc5b4b599d9 AUX glog-0.5.0-vmodule_levels_changeability.patch 5980 BLAKE2B e6d57f0570e7ef849a52cf1cba91f1b39e7a8e08e994585dee7948effe54c9a53fcbf50468891d1122b1fbbd9763bf5b51a2a37c34035fc7380d90076cd3b8bc SHA512 53ff691227f8c9386ddc1b223001021ab31fbf8ccc2fe06a0372952e66ebe4903e99ccb4139c65efd06b1ccd9a5c73592466195de263b69f3c45ce89ea9517f8 -DIST glog-0.4.0.tar.gz 200955 BLAKE2B 083da6117af3e85697724942bfcb5a7831d447666945b06b149d8d324231b10923887bd8c507e8027136d12bffd30a657cb225df8c449f234381e3876f132953 SHA512 b585f1819ade2075f6b61dc5aaca5c3f9d25601dba2bd08b6c49b96ac5f79db23c6b7f2042df003f7130497dd7241fcaa8b107d1f97385cb66ce52d3c554b176 DIST glog-0.5.0.tar.gz 183346 BLAKE2B 9109a9a4bd3c74ba5d4c1d9ed44ffe0e16d5d3b9b12bf9dd5d31c6e728292ea50f39b4e1b96d55fbb35653a448af4dc8a978e266a2b0f34261c5108099e90845 SHA512 445e4338f3d81cd0b065f2da9c6ce343c243263ca144cea424ef97531a4e9e09c06ffd6942ac01c5213a8003c75cfbbede3c4028d12f0134f23ff29314769c1a DIST glog-0.6.0.tar.gz 193267 BLAKE2B b42112cdfd54280ce7a9592c3af6b6e10dcb854fe9dbe0db7445c60801d1c12a240c4b3709b45e41aedeb8876d2e08fc3368296e088be6a66126858888cc274e SHA512 fd2c42583d0dd72c790a8cf888f328a64447c5fb9d99b2e2a3833d70c102cb0eb9ae874632c2732424cc86216c8a076a3e24b23a793eaddb5da8a1dc52ba9226 -EBUILD glog-0.4.0.ebuild 1139 BLAKE2B 4aad89f7c76c7744037cc2a72db92bd321a9c686022accacf55efb1f37b76a594b245f6d018f0f48cc246b3f281f7d280cf8829ae89dacfbe2eb224a311e553d SHA512 d80010ebb2d0a530b98bcc1af9a4b6f0c9c2ff94be9e9172e068ab0e6d5a2a501e72b6aa3df8c7307356cc92ac4062a5b2467948c916a0b109a57fcf1aff987d EBUILD glog-0.5.0.ebuild 1506 BLAKE2B 869ed3d3b2be384250d53bcac744354dea33296667822d40227d317d9bd99135dc3edfb0b9632e66663569561af83ac665c17427ed3755e74ef2d865f4679078 SHA512 f9fa6fe43960ff1b61a3d2c50a28c6890bfa9427ba20cfa5760f2c0ecf9fefd6efd76bc52b5fe1de41a1bf58efae3239a3f0fa6759e3a5025e56124da1f40684 EBUILD glog-0.6.0.ebuild 1222 BLAKE2B 6a88a5648b71743b8b7124adfd94dc468ed6ebe44066455d3862b28306ca3dcf5ec182308f56375a7f54eb085fcdb211d89d23135cf45fd3d84e6661c51de0a9 SHA512 5cfbeb151f8ede3006423564c5091770c5583004c2c8c918c65f150f5c971a4d168d3eb6ce0e6634124090895ec3ff4f52fb843dccaabe21bb332c31738985d9 MISC metadata.xml 738 BLAKE2B 6c95cd538d9c896f256172d0f8c9281016a177fb6e8f507bbe07b6ca3d4cea4ef18eaa10a991f80c8937b58c388181dec81bf9b25a8ab0b6568e3c4c2731dc82 SHA512 f93c8a05ecfc96f29602d3a976431e6148df576c458769916db6c181ae0753826d64482ef7b9029c6c68bfbae0861cc42f39aff774890960f394775dca7e62c3 diff --git a/dev-cpp/glog/files/glog-0.4.0-errnos.patch b/dev-cpp/glog/files/glog-0.4.0-errnos.patch deleted file mode 100644 index c55716db1ba2..000000000000 --- a/dev-cpp/glog/files/glog-0.4.0-errnos.patch +++ /dev/null @@ -1,99 +0,0 @@ -Index: b/src/googletest.h -=================================================================== ---- a/src/googletest.h -+++ b/src/googletest.h -@@ -437,6 +437,18 @@ static inline void StringReplace(string* - } - } - -+static inline void IntReplace(string* str, -+ const string& oldsub, -+ int newsub) { -+ size_t pos = str->find(oldsub); -+ if (pos != string::npos) { -+ std::ostringstream ss; -+ ss << newsub; -+ const std::string x = ss.str(); -+ str->replace(pos, oldsub.size(), x.c_str()); -+ } -+} -+ - static inline string Munge(const string& filename) { - FILE* fp = fopen(filename.c_str(), "rb"); - CHECK(fp != NULL) << filename << ": couldn't open"; -@@ -452,9 +464,13 @@ static inline string Munge(const string& - - StringReplace(&line, "__SUCCESS__", StrError(0)); - StringReplace(&line, "__ENOENT__", StrError(ENOENT)); -+ IntReplace(&line, "__ENOENT_NUM__", ENOENT); - StringReplace(&line, "__EINTR__", StrError(EINTR)); -+ IntReplace(&line, "__EINTR_NUM__", EINTR); - StringReplace(&line, "__ENXIO__", StrError(ENXIO)); -+ IntReplace(&line, "__ENXIO_NUM__", ENXIO); - StringReplace(&line, "__ENOEXEC__", StrError(ENOEXEC)); -+ IntReplace(&line, "__ENOEXEC_NUM__", ENOEXEC); - result += line + "\n"; - } - fclose(fp); -Index: b/src/logging_unittest.cc -=================================================================== ---- a/src/logging_unittest.cc -+++ b/src/logging_unittest.cc -@@ -238,6 +238,17 @@ int main(int argc, char **argv) { - return 0; - } - -+static int errnoForIteration(int i) { -+ switch (i) { -+ case 0: return 0; -+ case 2: return ENOENT; -+ case 4: return EINTR; -+ case 6: return ENXIO; -+ case 8: return ENOEXEC; -+ } -+ return -1; -+} -+ - void TestLogging(bool check_counts) { - int64 base_num_infos = LogMessage::num_messages(GLOG_INFO); - int64 base_num_warning = LogMessage::num_messages(GLOG_WARNING); -@@ -246,7 +257,7 @@ void TestLogging(bool check_counts) { - LOG(INFO) << string("foo ") << "bar " << 10 << ' ' << 3.4; - for ( int i = 0; i < 10; ++i ) { - int old_errno = errno; -- errno = i; -+ errno = errnoForIteration(i); - PLOG_EVERY_N(ERROR, 2) << "Plog every 2, iteration " << COUNTER; - errno = old_errno; - -Index: b/src/logging_unittest.err -=================================================================== ---- a/src/logging_unittest.err -+++ b/src/logging_unittest.err -@@ -51,21 +51,21 @@ WDATE TIME__ THREADID logging_unittest.c - IDATE TIME__ THREADID logging_unittest.cc:LINE] Log if every 1, iteration 1 - EDATE TIME__ THREADID logging_unittest.cc:LINE] Log if less than 3 every 2, iteration 1 - IDATE TIME__ THREADID logging_unittest.cc:LINE] Log if every 1, iteration 2 --EDATE TIME__ THREADID logging_unittest.cc:LINE] Plog every 2, iteration 3: __ENOENT__ [2] -+EDATE TIME__ THREADID logging_unittest.cc:LINE] Plog every 2, iteration 3: __ENOENT__ [__ENOENT_NUM__] - IDATE TIME__ THREADID logging_unittest.cc:LINE] Log if every 1, iteration 3 - EDATE TIME__ THREADID logging_unittest.cc:LINE] Log if less than 3 every 2, iteration 3 - EDATE TIME__ THREADID logging_unittest.cc:LINE] Log every 3, iteration 4 - IDATE TIME__ THREADID logging_unittest.cc:LINE] Log if every 1, iteration 4 --EDATE TIME__ THREADID logging_unittest.cc:LINE] Plog every 2, iteration 5: __EINTR__ [4] -+EDATE TIME__ THREADID logging_unittest.cc:LINE] Plog every 2, iteration 5: __EINTR__ [__EINTR_NUM__] - EDATE TIME__ THREADID logging_unittest.cc:LINE] Log every 4, iteration 5 - IDATE TIME__ THREADID logging_unittest.cc:LINE] Log if every 1, iteration 5 - WDATE TIME__ THREADID logging_unittest.cc:LINE] Log if every 5, iteration 6 - IDATE TIME__ THREADID logging_unittest.cc:LINE] Log if every 1, iteration 6 --EDATE TIME__ THREADID logging_unittest.cc:LINE] Plog every 2, iteration 7: __ENXIO__ [6] -+EDATE TIME__ THREADID logging_unittest.cc:LINE] Plog every 2, iteration 7: __ENXIO__ [__ENXIO_NUM__] - EDATE TIME__ THREADID logging_unittest.cc:LINE] Log every 3, iteration 7 - IDATE TIME__ THREADID logging_unittest.cc:LINE] Log if every 1, iteration 7 - IDATE TIME__ THREADID logging_unittest.cc:LINE] Log if every 1, iteration 8 --EDATE TIME__ THREADID logging_unittest.cc:LINE] Plog every 2, iteration 9: __ENOEXEC__ [8] -+EDATE TIME__ THREADID logging_unittest.cc:LINE] Plog every 2, iteration 9: __ENOEXEC__ [__ENOEXEC_NUM__] - EDATE TIME__ THREADID logging_unittest.cc:LINE] Log every 4, iteration 9 - IDATE TIME__ THREADID logging_unittest.cc:LINE] Log if every 1, iteration 9 - EDATE TIME__ THREADID logging_unittest.cc:LINE] Log every 3, iteration 10 - diff --git a/dev-cpp/glog/files/glog-0.4.0-fix-test-on-ports.patch b/dev-cpp/glog/files/glog-0.4.0-fix-test-on-ports.patch deleted file mode 100644 index 392ae8ca7819..000000000000 --- a/dev-cpp/glog/files/glog-0.4.0-fix-test-on-ports.patch +++ /dev/null @@ -1,19 +0,0 @@ -Index: google-glog-0.3.2/src/signalhandler_unittest.sh -=================================================================== ---- google-glog-0.3.2.orig/src/signalhandler_unittest.sh 2013-03-13 13:49:37.820188111 -0400 -+++ google-glog-0.3.2/src/signalhandler_unittest.sh 2013-03-13 14:07:11.980204520 -0400 -@@ -65,10 +65,10 @@ - exit 0 - fi - --# The PC cannot be obtained in signal handlers on PowerPC correctly. --# We just skip the test for PowerPC. --if [ x`uname -p` = x"powerpc" ]; then -- echo "PASS (We don't test the signal handler on PowerPC.)" -+# This test only works correctly on i386 and amd64. -+# We just skip the test when not on those platforms. -+if [ x`uname -m` != x"x86_64" -a x`uname -m` != x"i686" ]; then -+ echo "PASS (We only test the signal handler on i386 or amd64.)" - exit 0 - fi - diff --git a/dev-cpp/glog/files/glog-0.4.0-fix-x32-build.patch b/dev-cpp/glog/files/glog-0.4.0-fix-x32-build.patch deleted file mode 100644 index e53318ac66ff..000000000000 --- a/dev-cpp/glog/files/glog-0.4.0-fix-x32-build.patch +++ /dev/null @@ -1,35 +0,0 @@ -Description: fix FTBFS on x32 -Author: Guillaume Morin <guillaume@morinfr.org> -Forwarded: no -Last-Update: 2019-08-05 - ---- - ---- google-glog-0.3.4.orig/src/symbolize_unittest.cc -+++ google-glog-0.3.4/src/symbolize_unittest.cc -@@ -313,8 +313,12 @@ extern "C" { - inline void* always_inline inline_func() { - void *pc = NULL; - #ifdef TEST_X86_32_AND_64 -+#if __x86_64__ || (__x86_64__ && __ILP32__) -+ __asm__ __volatile__("call 1f; 1: popq %q0" : "=r"(pc)); -+#else - __asm__ __volatile__("call 1f; 1: pop %0" : "=r"(pc)); - #endif -+#endif - return pc; - } - -@@ -322,8 +326,12 @@ void* ATTRIBUTE_NOINLINE non_inline_func - void* ATTRIBUTE_NOINLINE non_inline_func() { - void *pc = NULL; - #ifdef TEST_X86_32_AND_64 -+#if __x86_64__ || (__x86_64__ && __ILP32__) -+ __asm__ __volatile__("call 1f; 1: popq %q0" : "=r"(pc)); -+#else - __asm__ __volatile__("call 1f; 1: pop %0" : "=r"(pc)); - #endif -+#endif - return pc; - } - diff --git a/dev-cpp/glog/glog-0.4.0.ebuild b/dev-cpp/glog/glog-0.4.0.ebuild deleted file mode 100644 index 9b10f2e2fc95..000000000000 --- a/dev-cpp/glog/glog-0.4.0.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 2011-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit autotools multilib-minimal - -DESCRIPTION="Google's C++ logging library" -HOMEPAGE="https://github.com/google/glog" -SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -# -sparc as libunwind is not ported on sparc -KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 -sparc x86 ~amd64-linux ~x86-linux" -IUSE="gflags static-libs test" -RESTRICT="test" - -RDEPEND="sys-libs/libunwind[${MULTILIB_USEDEP}] - gflags? ( dev-cpp/gflags[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND} - test? ( >=dev-cpp/gtest-1.8.0[${MULTILIB_USEDEP}] )" - -PATCHES=( - "${FILESDIR}"/${PN}-0.4.0-fix-x32-build.patch - "${FILESDIR}"/${PN}-0.4.0-errnos.patch - "${FILESDIR}"/${PN}-0.4.0-fix-test-on-ports.patch -) - -src_prepare() { - default - eautoreconf -} - -multilib_src_configure() { - ECONF_SOURCE="${S}" econf \ - $(use_enable static-libs static) \ - ac_cv_lib_gflags_main="$(usex gflags)" -} - -multilib_src_install_all() { - einstalldocs - - # package provides .pc files - find "${D}" -name '*.la' -delete || die -} |