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 f340c4f891..605c93ac9a 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 +1,3 @@ -DIST glog-0.3.1-1.tar.gz 491798 RMD160 dcbb4a7ba28afb4126e1b9791dda2a784a3bda68 SHA1 14e3f6d6f2ecceac1ee6a66a1d28ddbc32a2b4ab SHA256 0a5ce945aaa5c64cb3889bf4844a0459263c06a77ad549042230dfea316787cb +DIST glog-0.3.3.tar.gz 509676 BLAKE2B 21d8893ff535c0e8c1de27214f535aaea99727128d80f421da096969c19504da6a296054db2931232b4fd372446f96189464e4000f44c5720152085aa9976978 SHA512 95418ff0857415a0fbc15caeb22a13f3b6736618adcc3c30e054626f1397bc58399c45f68784c70b1f5dc594ebc6ea66e386896beab5c20be72dd53b25f5a4ac +DIST glog-0.3.4.tar.gz 522508 BLAKE2B 4a188d5998005b29afc52f2ea548f33e06a68da993bb74960e5aedb214ec52ef9e9fc39efb1a34f38f217b92df7db064ff01d58df36c3e4ad789becc97335ec2 SHA512 139525b546a9eccacc9bebf7cc3053ba52229e9488485ad45344c3d3134ca819d3b571250c0e3a6d84097009c8be89b0f4fa16ef5ec838ffcc237ae11c3a034c +DIST glog-0.3.5.tar.gz 532275 BLAKE2B a455f3ff8fc7cf2861a4351a0305db9455bb79977e57c49b6269b3fa2c147cd9627bfaf4c7aaa04fe4a49158d79abeb5b985813fe8c473d6005e915335c0d693 SHA512 a54a3b8b4b7660d7558ba5168c659bc3c8323c30908a4f6a4bbc6f9cd899350f3243aabc720daebfdeb799b276b51ba1eaa1a0f83149c4e1a038d552ada1ed72 diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/glog/files/glog-0.3.2-avoid-inline-asm.patch b/sdk_container/src/third_party/portage-stable/dev-cpp/glog/files/glog-0.3.2-avoid-inline-asm.patch new file mode 100644 index 0000000000..b6fa9cdb73 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-cpp/glog/files/glog-0.3.2-avoid-inline-asm.patch @@ -0,0 +1,56 @@ +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/sdk_container/src/third_party/portage-stable/dev-cpp/glog/files/glog-0.3.4-fix-build-system.patch b/sdk_container/src/third_party/portage-stable/dev-cpp/glog/files/glog-0.3.4-fix-build-system.patch new file mode 100644 index 0000000000..cd38111bc8 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-cpp/glog/files/glog-0.3.4-fix-build-system.patch @@ -0,0 +1,142 @@ +--- 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/sdk_container/src/third_party/portage-stable/dev-cpp/glog/files/glog-0.3.4-fix-gcc5-demangling.patch b/sdk_container/src/third_party/portage-stable/dev-cpp/glog/files/glog-0.3.4-fix-gcc5-demangling.patch new file mode 100644 index 0000000000..fd1518c685 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-cpp/glog/files/glog-0.3.4-fix-gcc5-demangling.patch @@ -0,0 +1,56 @@ +From b1639e3014996fbc7635870e013559c54e7e3b2f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?David=20Mart=C3=ADnez=20Moreno?= +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; + } + ++// ::= B ++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; ++} ++ + // ::= + // ::= + // ::= diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/glog/glog-0.3.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-cpp/glog/glog-0.3.1.ebuild deleted file mode 100644 index 53e98e8060..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-cpp/glog/glog-0.3.1.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-cpp/glog/glog-0.3.1.ebuild,v 1.1 2011/11/11 20:56:47 vapier Exp $ - -EAPI="4" -inherit eutils - -DESCRIPTION="Google's C++ logging library" -HOMEPAGE="http://code.google.com/p/google-glog/" -SRC_URI="http://google-glog.googlecode.com/files/${P}-1.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 arm x86" -IUSE="gflags static-libs test" - -RDEPEND="gflags? ( dev-cpp/gflags )" -DEPEND="${RDEPEND} - test? ( - dev-cpp/gmock - dev-cpp/gtest - )" - -usex() { use "$1" && echo "${2-yes}$4" || echo "${3-no}$5" ; } #382963 - -src_configure() { - export ac_cv_lib_gflags_main=$(usex gflags) - use test || export ac_cv_prog_GTEST_CONFIG=no - econf $(use_enable static-libs static) -} diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/glog/glog-0.3.3-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-cpp/glog/glog-0.3.3-r1.ebuild new file mode 100644 index 0000000000..3b6207ec20 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-cpp/glog/glog-0.3.3-r1.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="4" +inherit eutils multilib-minimal + +DESCRIPTION="Google's C++ logging library" +HOMEPAGE="https://github.com/google/glog" +SRC_URI="https://google-glog.googlecode.com/files/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux" +IUSE="gflags static-libs unwind test" + +RDEPEND="gflags? ( >=dev-cpp/gflags-2.0-r1[${MULTILIB_USEDEP}] ) + unwind? ( sys-libs/libunwind )" +DEPEND="${RDEPEND} + test? ( + >=dev-cpp/gmock-1.7.0-r1[${MULTILIB_USEDEP}] + >=dev-cpp/gtest-1.6.0-r2[${MULTILIB_USEDEP}] + )" + +src_prepare() { + epatch "${FILESDIR}"/${PN}-0.3.2-avoid-inline-asm.patch + # Fix the --dodcdir flag: + # https://code.google.com/p/google-glog/issues/detail?id=193 + sed -i \ + -e '/^docdir =/s:=.*:= @docdir@:' \ + Makefile.in || die +} + +multilib_src_configure() { + use test || export ac_cv_prog_GTEST_CONFIG=no + ECONF_SOURCE=${S} \ + ac_cv_lib_gflags_main=$(usex gflags) \ + ac_cv_lib_unwind_backtrace=$(usex unwind) \ + econf \ + --docdir="\$(datarootdir)/doc/${PF}" \ + --htmldir='$(docdir)/html' \ + $(use_enable static-libs static) +} + +_emake() { + # The tests always get built ... disable them when unused. + emake $(usex test '' noinst_PROGRAMS=) "$@" +} + +multilib_src_compile() { + _emake +} + +multilib_src_install() { + _emake install DESTDIR="${D}" +} + +multilib_src_install_all() { + # Punt docs we don't care about (NEWS is 0 bytes). + rm "${ED}"/usr/share/doc/${PF}/{COPYING,NEWS,README.windows} || die + + # --htmldir doesn't work (yet): + # https://code.google.com/p/google-glog/issues/detail?id=144 + dohtml "${ED}"/usr/share/doc/${PF}/* + rm "${ED}"/usr/share/doc/${PF}/*.{html,css} + + use static-libs || find "${ED}" -name '*.la' -delete +} diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/glog/glog-0.3.4-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-cpp/glog/glog-0.3.4-r1.ebuild new file mode 100644 index 0000000000..522feb232f --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-cpp/glog/glog-0.3.4-r1.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2017 Gentoo Foundation +# 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="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="gflags static-libs test unwind" + +RDEPEND=" + gflags? ( >=dev-cpp/gflags-2.0-r1[${MULTILIB_USEDEP}] ) + unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )" +DEPEND="${RDEPEND} + test? ( + >=dev-cpp/gmock-1.7.0-r1[${MULTILIB_USEDEP}] + >=dev-cpp/gtest-1.6.0-r2[${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 unwind) +} + +multilib_src_install_all() { + einstalldocs + + # package provides .pc files + find "${D}" -name '*.la' -delete || die +} diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/glog/glog-0.3.4.ebuild b/sdk_container/src/third_party/portage-stable/dev-cpp/glog/glog-0.3.4.ebuild new file mode 100644 index 0000000000..a6e1d7719c --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-cpp/glog/glog-0.3.4.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="5" + +inherit eutils 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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="gflags static-libs unwind test" + +RDEPEND="gflags? ( >=dev-cpp/gflags-2.0-r1[${MULTILIB_USEDEP}] ) + unwind? ( sys-libs/libunwind )" +DEPEND="${RDEPEND} + test? ( + >=dev-cpp/gmock-1.7.0-r1[${MULTILIB_USEDEP}] + >=dev-cpp/gtest-1.6.0-r2[${MULTILIB_USEDEP}] + )" + +src_prepare() { + epatch "${FILESDIR}"/${PN}-0.3.2-avoid-inline-asm.patch + # Fix the --dodcdir flag: + # https://code.google.com/p/google-glog/issues/detail?id=193 + sed -i \ + -e '/^docdir =/s:=.*:= @docdir@:' \ + Makefile.in || die +} + +multilib_src_configure() { + use test || export ac_cv_prog_GTEST_CONFIG=no + ECONF_SOURCE=${S} \ + ac_cv_lib_gflags_main=$(usex gflags) \ + ac_cv_lib_unwind_backtrace=$(usex unwind) \ + econf \ + --docdir="\$(datarootdir)/doc/${PF}" \ + --htmldir='$(docdir)/html' \ + $(use_enable static-libs static) +} + +_emake() { + # The tests always get built ... disable them when unused. + emake $(usex test '' noinst_PROGRAMS=) "$@" +} + +multilib_src_compile() { + _emake +} + +multilib_src_install() { + _emake install DESTDIR="${D}" +} + +multilib_src_install_all() { + # Punt docs we don't care about (NEWS is 0 bytes). + rm "${ED}"/usr/share/doc/${PF}/{COPYING,NEWS,README.windows} || die + + # --htmldir doesn't work (yet): + # https://code.google.com/p/google-glog/issues/detail?id=144 + dohtml "${ED}"/usr/share/doc/${PF}/* + rm "${ED}"/usr/share/doc/${PF}/*.{html,css} + + use static-libs || find "${ED}" -name '*.la' -delete +} diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/glog/glog-0.3.5.ebuild b/sdk_container/src/third_party/portage-stable/dev-cpp/glog/glog-0.3.5.ebuild new file mode 100644 index 0000000000..1f4064c663 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-cpp/glog/glog-0.3.5.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2018 Gentoo Foundation +# 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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="gflags static-libs test unwind" + +RDEPEND=" + gflags? ( >=dev-cpp/gflags-2.0-r1[${MULTILIB_USEDEP}] ) + unwind? ( 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 unwind) +} + +multilib_src_install_all() { + einstalldocs + + # package provides .pc files + find "${D}" -name '*.la' -delete || die +} diff --git a/sdk_container/src/third_party/portage-stable/dev-cpp/glog/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-cpp/glog/metadata.xml new file mode 100644 index 0000000000..a1375d627e --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-cpp/glog/metadata.xml @@ -0,0 +1,16 @@ + + + + + cpp@gentoo.org + Gentoo C++ Project + + + Use dev-cpp/gflags for flag parsing + Use sys-libs/libunwind for stack unwinding instead of glibc/gcc (may be more reliable on x86_64) + + + google-glog + google/glog + + diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-cpp/glog-0.3.1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-cpp/glog-0.3.1 deleted file mode 100644 index b943671166..0000000000 --- a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-cpp/glog-0.3.1 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=configure -DEPEND=gflags? ( dev-cpp/gflags ) test? ( dev-cpp/gmock dev-cpp/gtest ) -DESCRIPTION=Google's C++ logging library -EAPI=4 -HOMEPAGE=http://code.google.com/p/google-glog/ -IUSE=gflags static-libs test -KEYWORDS=amd64 arm x86 -LICENSE=BSD -RDEPEND=gflags? ( dev-cpp/gflags ) -SLOT=0 -SRC_URI=http://google-glog.googlecode.com/files/glog-0.3.1-1.tar.gz -_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 ltprune 2770eed66a9b8ef944714cd0e968182e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 185a06792159ca143528e7010368e8af -_md5_=a41bed8eb176a35f2e8f9d4dfd2e8571 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-cpp/glog-0.3.3-r1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-cpp/glog-0.3.3-r1 new file mode 100644 index 0000000000..b805eb3d75 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-cpp/glog-0.3.3-r1 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install prepare test +DEPEND=gflags? ( >=dev-cpp/gflags-2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unwind? ( sys-libs/libunwind ) test? ( >=dev-cpp/gmock-1.7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/gtest-1.6.0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) +DESCRIPTION=Google's C++ logging library +EAPI=4 +HOMEPAGE=https://github.com/google/glog +IUSE=gflags static-libs unwind test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 +KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux +LICENSE=BSD +RDEPEND=gflags? ( >=dev-cpp/gflags-2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unwind? ( sys-libs/libunwind ) +SLOT=0 +SRC_URI=https://google-glog.googlecode.com/files/glog-0.3.3.tar.gz +_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 toolchain-funcs 185a06792159ca143528e7010368e8af +_md5_=fd5e96139a5ee5351dc368056afaa119 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-cpp/glog-0.3.4 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-cpp/glog-0.3.4 new file mode 100644 index 0000000000..27ad1c9670 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-cpp/glog-0.3.4 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install prepare test +DEPEND=gflags? ( >=dev-cpp/gflags-2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unwind? ( sys-libs/libunwind ) test? ( >=dev-cpp/gmock-1.7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/gtest-1.6.0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) +DESCRIPTION=Google's C++ logging library +EAPI=5 +HOMEPAGE=https://github.com/google/glog +IUSE=gflags static-libs unwind test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux +LICENSE=BSD +RDEPEND=gflags? ( >=dev-cpp/gflags-2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unwind? ( sys-libs/libunwind ) +SLOT=0 +SRC_URI=https://github.com/google/glog/archive/v0.3.4.tar.gz -> glog-0.3.4.tar.gz +_eclasses_=epatch 8233751dc5105a6ae8fcd86ce2bb0247 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 227b041a120d309fdefbebb3b8c1dfa9 ltprune 2770eed66a9b8ef944714cd0e968182e multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 toolchain-funcs 185a06792159ca143528e7010368e8af +_md5_=6cea223c1eba964eba3566812b3b8bb6 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-cpp/glog-0.3.4-r1 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-cpp/glog-0.3.4-r1 new file mode 100644 index 0000000000..9ba3fd9541 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-cpp/glog-0.3.4-r1 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install prepare test +DEPEND=gflags? ( >=dev-cpp/gflags-2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( >=dev-cpp/gmock-1.7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-cpp/gtest-1.6.0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 +DESCRIPTION=Google's C++ logging library +EAPI=6 +HOMEPAGE=https://github.com/google/glog +IUSE=gflags static-libs test unwind abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 +KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux +LICENSE=BSD +RDEPEND=gflags? ( >=dev-cpp/gflags-2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) +SLOT=0 +SRC_URI=https://github.com/google/glog/archive/v0.3.4.tar.gz -> glog-0.3.4.tar.gz +_eclasses_=autotools dc412f38566b91012efd58b9c203e6c3 libtool 0081a71a261724730ec4c248494f044d multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 toolchain-funcs 185a06792159ca143528e7010368e8af +_md5_=5aa38bf760c4c62c6935eea19b801ed0 diff --git a/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-cpp/glog-0.3.5 b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-cpp/glog-0.3.5 new file mode 100644 index 0000000000..86b0e69958 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/metadata/md5-cache/dev-cpp/glog-0.3.5 @@ -0,0 +1,13 @@ +DEFINED_PHASES=compile configure install prepare test +DEPEND=gflags? ( >=dev-cpp/gflags-2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) test? ( >=dev-cpp/gtest-1.8.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=app-portage/elt-patches-20170422 !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 +DESCRIPTION=Google's C++ logging library +EAPI=6 +HOMEPAGE=https://github.com/google/glog +IUSE=gflags static-libs test unwind abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 +KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux +LICENSE=BSD +RDEPEND=gflags? ( >=dev-cpp/gflags-2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) +SLOT=0 +SRC_URI=https://github.com/google/glog/archive/v0.3.5.tar.gz -> glog-0.3.5.tar.gz +_eclasses_=autotools dc412f38566b91012efd58b9c203e6c3 libtool 0081a71a261724730ec4c248494f044d multibuild 72647e255187a1fadc81097b3657e5c3 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build eed53a6313267c9fbcd35fc384bd0087 multilib-minimal 9139c3a57e077cb8e0d0f73ceb080b89 toolchain-funcs 185a06792159ca143528e7010368e8af +_md5_=2a747e94b685492a6be8e531922c5f6a