commit: 94fdecc1cacdbb331c88943e61b97957022864fd Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org> AuthorDate: Sat Jun 5 05:00:00 2021 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Sun Jun 6 17:04:42 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94fdecc1
dev-cpp/glog: Delete old version (0.3.4-r1). Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org> Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> dev-cpp/glog/Manifest | 1 - .../glog/files/glog-0.3.2-avoid-inline-asm.patch | 56 -------- .../glog/files/glog-0.3.4-fix-build-system.patch | 142 --------------------- .../files/glog-0.3.4-fix-gcc5-demangling.patch | 56 -------- dev-cpp/glog/glog-0.3.4-r1.ebuild | 48 ------- 5 files changed, 303 deletions(-) diff --git a/dev-cpp/glog/Manifest b/dev-cpp/glog/Manifest index 7c483d27446..b52819ecab8 100644 --- a/dev-cpp/glog/Manifest +++ b/dev-cpp/glog/Manifest @@ -1,3 +1,2 @@ -DIST glog-0.3.4.tar.gz 522508 BLAKE2B 4a188d5998005b29afc52f2ea548f33e06a68da993bb74960e5aedb214ec52ef9e9fc39efb1a34f38f217b92df7db064ff01d58df36c3e4ad789becc97335ec2 SHA512 139525b546a9eccacc9bebf7cc3053ba52229e9488485ad45344c3d3134ca819d3b571250c0e3a6d84097009c8be89b0f4fa16ef5ec838ffcc237ae11c3a034c DIST glog-0.4.0.tar.gz 200955 BLAKE2B 083da6117af3e85697724942bfcb5a7831d447666945b06b149d8d324231b10923887bd8c507e8027136d12bffd30a657cb225df8c449f234381e3876f132953 SHA512 b585f1819ade2075f6b61dc5aaca5c3f9d25601dba2bd08b6c49b96ac5f79db23c6b7f2042df003f7130497dd7241fcaa8b107d1f97385cb66ce52d3c554b176 DIST glog-0.5.0.tar.gz 183346 BLAKE2B 9109a9a4bd3c74ba5d4c1d9ed44ffe0e16d5d3b9b12bf9dd5d31c6e728292ea50f39b4e1b96d55fbb35653a448af4dc8a978e266a2b0f34261c5108099e90845 SHA512 445e4338f3d81cd0b065f2da9c6ce343c243263ca144cea424ef97531a4e9e09c06ffd6942ac01c5213a8003c75cfbbede3c4028d12f0134f23ff29314769c1a diff --git a/dev-cpp/glog/files/glog-0.3.2-avoid-inline-asm.patch b/dev-cpp/glog/files/glog-0.3.2-avoid-inline-asm.patch deleted file mode 100644 index b6fa9cdb737..00000000000 --- a/dev-cpp/glog/files/glog-0.3.2-avoid-inline-asm.patch +++ /dev/null @@ -1,56 +0,0 @@ -http://code.google.com/p/google-glog/issues/detail?id=130 - -make the code work with all gcc targets - ---- a/src/symbolize_unittest.cc -+++ b/src/symbolize_unittest.cc -@@ -60,9 +60,7 @@ using namespace GOOGLE_NAMESPACE; - # endif // __i386__ - # else - # endif // __GNUC__ >= 4 --# if defined(__i386__) || defined(__x86_64__) --# define TEST_X86_32_AND_64 1 --# endif // defined(__i386__) || defined(__x86_64__) -+# define TEST_WITH_LABEL_ADDRESSES - #endif - - // A wrapper function for Symbolize() to make the unit test simple. -@@ -289,22 +287,24 @@ TEST(Symbolize, SymbolizeWithDemanglingStackConsumption) { - extern "C" { - inline void* always_inline inline_func() { - register void *pc = NULL; --#ifdef TEST_X86_32_AND_64 -- __asm__ __volatile__("call 1f; 1: pop %0" : "=r"(pc)); -+#ifdef TEST_WITH_LABEL_ADDRESSES -+ pc = &&curr_pc; -+ curr_pc: - #endif - return pc; - } - - void* ATTRIBUTE_NOINLINE non_inline_func() { - register void *pc = NULL; --#ifdef TEST_X86_32_AND_64 -- __asm__ __volatile__("call 1f; 1: pop %0" : "=r"(pc)); -+#ifdef TEST_WITH_LABEL_ADDRESSES -+ pc = &&curr_pc; -+ curr_pc: - #endif - return pc; - } - - void ATTRIBUTE_NOINLINE TestWithPCInsideNonInlineFunction() { --#if defined(TEST_X86_32_AND_64) && defined(HAVE_ATTRIBUTE_NOINLINE) -+#if defined(TEST_WITH_LABEL_ADDRESSES) && defined(HAVE_ATTRIBUTE_NOINLINE) - void *pc = non_inline_func(); - const char *symbol = TrySymbolize(pc); - CHECK(symbol != NULL); -@@ -314,7 +314,7 @@ void ATTRIBUTE_NOINLINE TestWithPCInsideNonInlineFunction() { - } - - void ATTRIBUTE_NOINLINE TestWithPCInsideInlineFunction() { --#if defined(TEST_X86_32_AND_64) && defined(HAVE_ALWAYS_INLINE) -+#if defined(TEST_WITH_LABEL_ADDRESSES) && defined(HAVE_ALWAYS_INLINE) - void *pc = inline_func(); // Must be inlined. - const char *symbol = TrySymbolize(pc); - CHECK(symbol != NULL); diff --git a/dev-cpp/glog/files/glog-0.3.4-fix-build-system.patch b/dev-cpp/glog/files/glog-0.3.4-fix-build-system.patch deleted file mode 100644 index cd38111bc81..00000000000 --- a/dev-cpp/glog/files/glog-0.3.4-fix-build-system.patch +++ /dev/null @@ -1,142 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -11,7 +11,7 @@ - AC_CONFIG_SRCDIR(README) - AC_CONFIG_MACRO_DIR([m4]) - AM_INIT_AUTOMAKE --AM_CONFIG_HEADER(src/config.h) -+AC_CONFIG_HEADERS([src/config.h]) - - AC_LANG(C++) - -@@ -21,7 +21,7 @@ - AC_PROG_CXX - AM_CONDITIONAL(GCC, test "$GCC" = yes) # let the Makefile know if we're gcc - --AC_PROG_LIBTOOL -+LT_INIT - AC_SUBST(LIBTOOL_DEPS) - - # Check whether some low-level functions/files are available -@@ -128,32 +128,48 @@ - fi - - # Check if there is google-gflags library installed. --SAVE_CFLAGS="$CFLAGS" --SAVE_LIBS="$LIBS" --AC_ARG_WITH(gflags, AS_HELP_STRING[--with-gflags=GFLAGS_DIR], -- GFLAGS_CFLAGS="-I${with_gflags}/include" -- GFLAGS_LIBS="-L${with_gflags}/lib -lgflags" -- CFLAGS="$CFLAGS $GFLAGS_CFLAGS" -- LIBS="$LIBS $GFLAGS_LIBS" --) --AC_CHECK_LIB(gflags, main, ac_cv_have_libgflags=1, ac_cv_have_libgflags=0) --if test x"$ac_cv_have_libgflags" = x"1"; then -- AC_DEFINE(HAVE_LIB_GFLAGS, 1, [define if you have google gflags library]) -- if test x"$GFLAGS_LIBS" = x""; then -- GFLAGS_LIBS="-lgflags" -- fi --else -- GFLAGS_CFLAGS= -- GFLAGS_LIBS= --fi --CFLAGS="$SAVE_CFLAGS" --LIBS="$SAVE_LIBS" -+AC_ARG_ENABLE([gflags], -+ AS_HELP_STRING([--enable-gflags], [Enable google-gflags])) -+ -+ac_cv_have_libgflags=0 -+AS_IF([test "x$enable_gflags" != "xno"], [ -+ SAVE_CFLAGS="$CFLAGS" -+ SAVE_LIBS="$LIBS" -+ AC_ARG_WITH([gflags], AS_HELP_STRING([--with-gflags=GFLAGS_DIR]),[ -+ GFLAGS_CFLAGS="-I${with_gflags}/include" -+ GFLAGS_LIBS="-L${with_gflags}/lib -lgflags" -+ CFLAGS="$CFLAGS $GFLAGS_CFLAGS" -+ LIBS="$LIBS $GFLAGS_LIBS" -+ ]) -+ -+ AC_CHECK_LIB(gflags, main, ac_cv_have_libgflags=1, ac_cv_have_libgflags=0) -+ CFLAGS="$SAVE_CFLAGS" -+ LIBS="$SAVE_LIBS" -+]) -+ -+AS_IF([test "x$ac_cv_have_libgflags" = "x1"], [ -+ AC_DEFINE([HAVE_LIB_GFLAGS], [1], [define if you have google gflags library]) -+ AS_IF([test "x$GFLAGS_LIBS" = "x"], [ -+ GFLAGS_LIBS="-lgflags" -+ ]) -+], [ -+ GFLAGS_CFLAGS= -+ GFLAGS_LIBS= -+]) - - # TODO(hamaji): Use official m4 macros provided by testing libraries - # once the m4 macro of Google Mocking becomes ready. - # Check if there is Google Test library installed. --AC_CHECK_PROG(GTEST_CONFIG, gtest-config, "yes") --AC_CHECK_LIB(gtest, main, have_gtest_lib="yes") -+AC_ARG_ENABLE([gtest-config], -+ AS_HELP_STRING([--enable-gtest-config], [Enable looking for gtest-config])) -+ -+AS_IF([test "x$enable_gtest_config" != "xno"], [ -+ AC_CHECK_PROG(GTEST_CONFIG, gtest-config, "yes") -+ AC_CHECK_LIB(gtest, main, have_gtest_lib="yes") -+], [ -+ have_gtest_lib="no" -+]) -+ - if test x"$GTEST_CONFIG" = "xyes" -a x"$have_gtest_lib" = "xyes"; then - GTEST_CFLAGS=`gtest-config --cppflags --cxxflags` - GTEST_LIBS=`gtest-config --ldflags --libs` -@@ -178,17 +194,13 @@ - AM_CONDITIONAL(HAVE_GMOCK, test x"$GMOCK_CONFIG" = "xyes") - - # We want to link in libunwind if it exists --UNWIND_LIBS= --# Unfortunately, we need to check the header file in addition to the --# lib file to check if libunwind is available since libunwind-0.98 --# doesn't install all necessary header files. --if test x"$ac_cv_have_libunwind_h" = x"1"; then -- AC_CHECK_LIB(unwind, backtrace, UNWIND_LIBS=-lunwind) --fi --AC_SUBST(UNWIND_LIBS) --if test x"$UNWIND_LIBS" != x""; then -- AC_DEFINE(HAVE_LIB_UNWIND, 1, [define if you have libunwind]) --fi -+AC_ARG_ENABLE([unwind], -+ AS_HELP_STRING([--enable-unwind], [Enable libunwind])) -+ -+AS_IF([test "x$enable_unwind" != "xno"], [ -+ PKG_CHECK_MODULES([UNWIND], [libunwind > 0.98]) -+ AC_DEFINE([HAVE_LIB_UNWIND], [1], [define if you have libunwind]) -+]) - - # We'd like to use read/write locks in several places in the code. - # See if our pthreads support extends to that. Note: for linux, it ---- a/Makefile.am -+++ b/Makefile.am -@@ -40,12 +40,11 @@ - nodist_gloginclude_HEADERS = src/glog/logging.h src/glog/raw_logging.h src/glog/vlog_is_on.h src/glog/stl_logging.h - noinst_HEADERS = src/glog/logging.h.in src/glog/raw_logging.h.in src/glog/vlog_is_on.h.in src/glog/stl_logging.h.in - --docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION) - ## This is for HTML and other documentation you want to install. - ## Add your documentation files (in doc/) in addition to these - ## top-level boilerplate files. Also add a TODO file if you have one. --dist_doc_DATA = AUTHORS COPYING ChangeLog INSTALL NEWS README README.windows \ -- doc/designstyle.css doc/glog.html -+dist_doc_DATA = AUTHORS ChangeLog INSTALL NEWS README -+dist_html_DATA = doc/designstyle.css doc/glog.html - - ## The libraries (.so's) you want to install - lib_LTLIBRARIES = -@@ -215,7 +214,7 @@ - - ## This should always include $(TESTS), but may also include other - ## binaries that you compile but don't want automatically installed. --noinst_PROGRAMS = $(TESTS) $(TEST_BINARIES) -+check_PROGRAMS = $(TESTS) $(TEST_BINARIES) - - rpm: dist-gzip packages/rpm.sh packages/rpm/rpm.spec - @cd packages && ./rpm.sh ${PACKAGE} ${VERSION} diff --git a/dev-cpp/glog/files/glog-0.3.4-fix-gcc5-demangling.patch b/dev-cpp/glog/files/glog-0.3.4-fix-gcc5-demangling.patch deleted file mode 100644 index fd1518c6858..00000000000 --- a/dev-cpp/glog/files/glog-0.3.4-fix-gcc5-demangling.patch +++ /dev/null @@ -1,56 +0,0 @@ -From b1639e3014996fbc7635870e013559c54e7e3b2f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?David=20Mart=C3=ADnez=20Moreno?= <en...@debian.org> -Date: Thu, 13 Aug 2015 09:31:26 -0700 -Subject: [PATCH] Fix ABI demangling for the GCC 5.x case. - -When glog is compiled with gcc-5.2 in cxx11 ABI mode, it barfs about unmangled symbols. This patches it getting inspiration from binutils and demangle.cc itself, although it may be totally wrong or maybe have to use ParseAbiTag in more places. I haven't read the spec for the symbols, though. - -This patch makes the demangle unit test pass correctly. ---- - src/demangle.cc | 19 +++++++++++++++++++ - 1 file changed, 19 insertions(+) - -diff --git a/src/demangle.cc b/src/demangle.cc -index e858181..0f0c831 100644 ---- a/src/demangle.cc -+++ b/src/demangle.cc -@@ -439,6 +439,7 @@ static bool ParseExprPrimary(State *state); - static bool ParseLocalName(State *state); - static bool ParseDiscriminator(State *state); - static bool ParseSubstitution(State *state); -+static bool ParseAbiTag(State *state); - - // Implementation note: the following code is a straightforward - // translation of the Itanium C++ ABI defined in BNF with a couple of -@@ -567,6 +568,8 @@ static bool ParseNestedName(State *state) { - static bool ParsePrefix(State *state) { - bool has_something = false; - while (true) { -+ if (ParseAbiTag(state)) -+ continue; - MaybeAppendSeparator(state); - if (ParseTemplateParam(state) || - ParseSubstitution(state) || -@@ -585,6 +588,22 @@ static bool ParsePrefix(State *state) { - return true; - } - -+// <abi-tag> ::= B <source-name> -+static bool ParseAbiTag(State *state) { -+ State copy = *state; -+ -+ Append(state, "[", 1); -+ if (ParseOneCharToken(state, 'B') && -+ ParseSourceName(state)) -+ { -+ Append(state, "]", 1); -+ return true; -+ } -+ -+ *state = copy; -+ return false; -+} -+ - // <unqualified-name> ::= <operator-name> - // ::= <ctor-dtor-name> - // ::= <source-name> diff --git a/dev-cpp/glog/glog-0.3.4-r1.ebuild b/dev-cpp/glog/glog-0.3.4-r1.ebuild deleted file mode 100644 index d6fd3e0dc0d..00000000000 --- a/dev-cpp/glog/glog-0.3.4-r1.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -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" -KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 x86 ~amd64-linux ~x86-linux" -IUSE="gflags +libunwind static-libs test" -RESTRICT="test" - -RDEPEND=" - gflags? ( >=dev-cpp/gflags-2.0-r1[${MULTILIB_USEDEP}] ) - libunwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND} - test? ( >=dev-cpp/gtest-1.8.0[${MULTILIB_USEDEP}] )" - -PATCHES=( - "${FILESDIR}"/${PN}-0.3.2-avoid-inline-asm.patch - "${FILESDIR}"/${PN}-0.3.4-fix-build-system.patch - "${FILESDIR}"/${PN}-0.3.4-fix-gcc5-demangling.patch -) - -src_prepare() { - default - eautoreconf -} - -multilib_src_configure() { - ECONF_SOURCE="${S}" econf \ - $(use_enable gflags) \ - $(use_enable static-libs static) \ - $(use_enable test gtest-config) \ - $(use_enable libunwind unwind) -} - -multilib_src_install_all() { - einstalldocs - - # package provides .pc files - find "${D}" -name '*.la' -delete || die -}
