diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
commit | 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 (patch) | |
tree | 7681bbd4e8b05407772df40a4bf04cbbc8afc3fa /dev-libs/log4cpp | |
parent | 30a9caf154332f12ca60756e1b75d2f0e3e1822d (diff) |
gentoo resync : 14.07.2018
Diffstat (limited to 'dev-libs/log4cpp')
-rw-r--r-- | dev-libs/log4cpp/Manifest | 8 | ||||
-rw-r--r-- | dev-libs/log4cpp/files/1.0-asneeded.patch | 122 | ||||
-rw-r--r-- | dev-libs/log4cpp/files/1.0-doc_install_path.patch | 37 | ||||
-rw-r--r-- | dev-libs/log4cpp/files/1.0-gcc43.patch | 26 | ||||
-rw-r--r-- | dev-libs/log4cpp/files/log4cpp-1.1-automake-1.13.patch | 12 | ||||
-rw-r--r-- | dev-libs/log4cpp/files/log4cpp-1.1-cmath-fix.patch | 10 | ||||
-rw-r--r-- | dev-libs/log4cpp/log4cpp-1.1.ebuild | 59 | ||||
-rw-r--r-- | dev-libs/log4cpp/metadata.xml | 11 |
8 files changed, 285 insertions, 0 deletions
diff --git a/dev-libs/log4cpp/Manifest b/dev-libs/log4cpp/Manifest new file mode 100644 index 000000000000..fbbd3ea9c984 --- /dev/null +++ b/dev-libs/log4cpp/Manifest @@ -0,0 +1,8 @@ +AUX 1.0-asneeded.patch 4260 BLAKE2B 1ca62ef0541f632474d8be23cf23caacc8fe153c70dd58c51af173a8e4b8c0a7a743b425ade6bcab422974e0f41f11308569d94316d44587328079f0fef15299 SHA512 36031e48cdbc6a94b18a399fab3257b433ef5ea873b3fbe57e373f87f491945aba5c99cce901fa4203cba04aa5f420872a957dc066f53afe5315a41c233b450d +AUX 1.0-doc_install_path.patch 1010 BLAKE2B 1f8f1b488e2ee87ad29738d175e2a2cb205c174553bdd5f7f6d6095fb371e8a255e2fefe023ada1fbcbdd8fd60953c5d944bf74566975fa0b0a1cc6fff1a2d1c SHA512 1f72992eaef44bfb214132736590514b57bb4321d3fc28412b19e5f9f6a7a67fc63a00e91af9cd85f6b921de36b835ce238b40590850f1a7f19011dab595b73d +AUX 1.0-gcc43.patch 1166 BLAKE2B 2669ceaed022d24e5090a6b96e856ab9612c5818b216949c78732d887e0749818da1d94ae7f9e85d53ec2631e73b3baff2c2cab98ef926d38e0fa6bb0b2c083d SHA512 61ffeddb968a4cc138db1ec854460ad86d864cabc48e4801da8e6e886783d34b112115441090039307d2f7305caee1c0275ad988176adf339170f981fba41262 +AUX log4cpp-1.1-automake-1.13.patch 242 BLAKE2B 17ac8a6529025edf8f46109906ec2bb2087f56ced626f4f3ddf47c000714b85ba558af1680ae3ab29f5aca8799185e25bed7a7c563d6950f1f3159e58f60eba8 SHA512 22abe490efd1a6b500265744abb2f58345fd9f6df881f1d932d7a95e6076397009c0bbd190eb803c0a4800035c0e435493164393674d19c611825235cb59fcc5 +AUX log4cpp-1.1-cmath-fix.patch 206 BLAKE2B 7caa58dcb66cc184b1f88a99ea6c6c0d21233c9bbd9b7da6727f735f73c98849c0cc95a3e90913847805ecbc1bd84ee56436d3fed6736259251e1c94363f436f SHA512 926e10166d162863c6c1774ce3a6e523a27ae999df68f9423c2ee94042152078d931eda77b07c323890850918832396a3603c3a9226310af90cd3946a7de7ffe +DIST log4cpp-1.1.tar.gz 547676 BLAKE2B 3fee8e575b404215d308a0d6c72feef612dcfb9c881c97500937d1a94d1c435108a24ae1ad20f19cedb1613735c22a37354226699fe6cafbf6d23dcd12668271 SHA512 e1a723641c75a0b7f9ad2338134b327cd9a0a1bd67ff76bca726389ad76e8ba0ee5a95abe6f29e05a77980255dc08b0aa5c906395b0a0ad094994c9e450e3ecb +EBUILD log4cpp-1.1.ebuild 1180 BLAKE2B d2479b287b38fc15721b40067055239de919631624c61f969ae4b7cf42ae493d95e3480ec850eae0f1add7bae2aa421c00faefe4486dc2f16ec29915e7b50e5e SHA512 759252ba0fe75e6654980f45ec40474dcc5105b302545bf299f4918b39570d19e2fe6b57c0f125c7a1a18d1fcee9ffbb8c1bb0fa8e69418b002bd57e17136382 +MISC metadata.xml 326 BLAKE2B 5a3581c83f878d7a0f3c9426a9b66b711087cf6d4234e7e9337108c148ae808100cfb54864d7c7db6ea951109bd8c178dd42f676e14c804e5620e1797e2213ad SHA512 007af73e5317d5cb942a532e2535e1b6a55d3a39300706eff6ac9d9215e017a3334dde7c2608289ccbbfc020bb7cea1ba75c4670d5770d4d63128cae902c81cf diff --git a/dev-libs/log4cpp/files/1.0-asneeded.patch b/dev-libs/log4cpp/files/1.0-asneeded.patch new file mode 100644 index 000000000000..7e88c545a374 --- /dev/null +++ b/dev-libs/log4cpp/files/1.0-asneeded.patch @@ -0,0 +1,122 @@ +http://bugs.gentoo.org/247067 + +--- a/m4/ACX_PTHREAD.m4 ++++ b/m4/ACX_PTHREAD.m4 +@@ -266,6 +266,117 @@ + else + PTHREAD_CC=$CC + fi ++ ++ # The next part tries to detect GCC inconsistency with -shared on some ++ # architectures and systems. The problem is that in certain ++ # configurations, when -shared is specified, GCC "forgets" to ++ # internally use various flags which are still necessary. ++ ++ # ++ # Prepare the flags ++ # ++ save_LDFLAGS="$LDFLAGS" ++ save_CFLAGS="$CFLAGS" ++ save_LIBS="$LIBS" ++ save_CC="$CC" ++ ++ # Try with the flags determined by the earlier checks. ++ # ++ # -Wl,-z,defs forces link-time symbol resolution, so that the ++ # linking checks with -shared actually have any value ++ # ++ # FIXME: -fPIC is required for -shared on many architectures, ++ # so we specify it here, but the right way would probably be to ++ # properly detect whether it is actually required. ++ CFLAGS="-shared -fPIC -Wl,-z,defs $CFLAGS $PTHREAD_CFLAGS" ++ LIBS="$PTHREAD_LIBS $LIBS" ++ CC="$PTHREAD_CC" ++ ++ # In order not to create several levels of indentation, we test ++ # the value of "$done" until we find the cure or run out of ideas. ++ done="no" ++ ++ # First, make sure the CFLAGS we added are actually accepted by our ++ # compiler. If not (and OS X's ld, for instance, does not accept -z), ++ # then we can't do this test. ++ if test x"$done" = xno; then ++ AC_MSG_CHECKING([whether to check for GCC pthread/shared inconsistencies]) ++ AC_TRY_LINK(,, , [done=yes]) ++ ++ if test "x$done" = xyes ; then ++ AC_MSG_RESULT([no]) ++ else ++ AC_MSG_RESULT([yes]) ++ fi ++ fi ++ ++ if test x"$done" = xyes; then ++ done="no" ++ AC_MSG_CHECKING([whether -pthread is sufficient with -shared]) ++ AC_TRY_LINK([#include <pthread.h>], ++ [pthread_t th; pthread_join(th, 0); ++ pthread_attr_init(0); pthread_cleanup_push(0, 0); ++ pthread_create(0,0,0,0); pthread_cleanup_pop(0); ], ++ [done=yes]) ++ ++ if test "x$done" = xyes; then ++ AC_MSG_RESULT([yes]) ++ else ++ AC_MSG_RESULT([no]) ++ fi ++ fi ++ ++ # ++ # Linux gcc on some architectures such as mips/mipsel forgets ++ # about -lpthread ++ # ++ if test x"$done" = xno; then ++ AC_MSG_CHECKING([whether -lpthread fixes that]) ++ LIBS="-lpthread $PTHREAD_LIBS $save_LIBS" ++ AC_TRY_LINK([#include <pthread.h>], ++ [pthread_t th; pthread_join(th, 0); ++ pthread_attr_init(0); pthread_cleanup_push(0, 0); ++ pthread_create(0,0,0,0); pthread_cleanup_pop(0); ], ++ [done=yes]) ++ ++ if test "x$done" = xyes; then ++ AC_MSG_RESULT([yes]) ++ PTHREAD_LIBS="-lpthread $PTHREAD_LIBS" ++ else ++ AC_MSG_RESULT([no]) ++ fi ++ fi ++ # ++ # FreeBSD 4.10 gcc forgets to use -lc_r instead of -lc ++ # ++ if test x"$done" = xno; then ++ AC_MSG_CHECKING([whether -lc_r fixes that]) ++ LIBS="-lc_r $PTHREAD_LIBS $save_LIBS" ++ AC_TRY_LINK([#include <pthread.h>], ++ [pthread_t th; pthread_join(th, 0); ++ pthread_attr_init(0); pthread_cleanup_push(0, 0); ++ pthread_create(0,0,0,0); pthread_cleanup_pop(0); ], ++ [done=yes]) ++ ++ if test "x$done" = xyes; then ++ AC_MSG_RESULT([yes]) ++ PTHREAD_LIBS="-lc_r $PTHREAD_LIBS" ++ else ++ AC_MSG_RESULT([no]) ++ fi ++ fi ++ if test x"$done" = xno; then ++ # OK, we have run out of ideas ++ AC_MSG_WARN([Impossible to determine how to use pthreads with shared libraries]) ++ ++ # so it's not safe to assume that we may use pthreads ++ acx_pthread_ok=no ++ fi ++ ++ CFLAGS="$save_CFLAGS" ++ LIBS="$save_LIBS" ++ CC="$save_CC" ++ + else + PTHREAD_CC="$CC" + fi diff --git a/dev-libs/log4cpp/files/1.0-doc_install_path.patch b/dev-libs/log4cpp/files/1.0-doc_install_path.patch new file mode 100644 index 000000000000..abe88dfd123b --- /dev/null +++ b/dev-libs/log4cpp/files/1.0-doc_install_path.patch @@ -0,0 +1,37 @@ +--- a/doc/Makefile.am ++++ b/doc/Makefile.am +@@ -1,7 +1,6 @@ + SUBDIRS = html + + man3dir = $(mandir)/man3 +-docdir = $(prefix)/doc/@PACKAGE_TARNAME@-@PACKAGE_VERSION@ + + EXTRA_DIST = \ + mainPage.txt +@@ -22,18 +22,18 @@ + + + install-data-local: +- $(mkinstalldirs) $(man3dir) ++ $(mkinstalldirs) $(DESTDIR)/$(man3dir) + @for i in ./man/man3/log4cpp.3 ./man/man3/log4cpp_*.3; do \ + inst=`basename $$i | sed 's/_/::/g'`; \ + echo "$(INSTALL_DATA) $$i$(man3dir)/$$inst"; \ +- $(INSTALL_DATA) $$i $(man3dir)/$$inst; \ ++ $(INSTALL_DATA) $$i $(DESTDIR)/$(man3dir)/$$inst; \ + done +- $(mkinstalldirs) $(docdir) +- cp -r html/. $(docdir) +- $(RM) -r -f $(docdir)/CVS \ +- $(docdir)/Makefile.am \ +- $(docdir)/Makefile.in \ +- $(docdir)/Makefile ++ $(mkinstalldirs) $(DESTDIR)/$(docdir) ++ cp -r html/. $(DESTDIR)/$(docdir) ++ $(RM) -r -f $(DESTDIR)/$(docdir)/CVS \ ++ $(DESTDIR)/$(docdir)/Makefile.am \ ++ $(DESTDIR)/$(docdir)/Makefile.in \ ++ $(DESTDIR)/$(docdir)/Makefile + + uninstall-local: + $(RM) $(man3dir)/log4cpp.3 diff --git a/dev-libs/log4cpp/files/1.0-gcc43.patch b/dev-libs/log4cpp/files/1.0-gcc43.patch new file mode 100644 index 000000000000..a60f986e9c0d --- /dev/null +++ b/dev-libs/log4cpp/files/1.0-gcc43.patch @@ -0,0 +1,26 @@ +Index: log4cpp-1.0/src/BasicLayout.cpp +=================================================================== +--- log4cpp-1.0.orig/src/BasicLayout.cpp 2008-03-14 16:06:57.000000000 -0400 ++++ log4cpp-1.0/src/BasicLayout.cpp 2008-03-14 16:07:11.000000000 -0400 +@@ -15,6 +15,8 @@ + #include <sstream> + #endif + ++#include <memory> ++ + namespace log4cpp { + + BasicLayout::BasicLayout() { +Index: log4cpp-1.0/src/PatternLayout.cpp +=================================================================== +--- log4cpp-1.0.orig/src/PatternLayout.cpp 2008-03-14 16:07:33.000000000 -0400 ++++ log4cpp-1.0/src/PatternLayout.cpp 2008-03-14 16:07:49.000000000 -0400 +@@ -370,7 +370,7 @@ + literal = ""; + } + if ((minWidth != 0) || (maxWidth != 0)) { +- component = new FormatModifierComponent(component, std::abs(minWidth), maxWidth, minWidth < 0); ++ component = new FormatModifierComponent(component, std::abs((float)minWidth), maxWidth, minWidth < 0); + minWidth = maxWidth = 0; + } + _components.push_back(component); diff --git a/dev-libs/log4cpp/files/log4cpp-1.1-automake-1.13.patch b/dev-libs/log4cpp/files/log4cpp-1.1-automake-1.13.patch new file mode 100644 index 000000000000..3e7cb560a509 --- /dev/null +++ b/dev-libs/log4cpp/files/log4cpp-1.1-automake-1.13.patch @@ -0,0 +1,12 @@ +--- a/configure.in ++++ b/configure.in +@@ -17,7 +17,8 @@ + + #AC_CONFIG_SRCDIR(configure.in) + AC_CONFIG_AUX_DIR(config) +-AM_CONFIG_HEADER(include/config.h) ++AC_CONFIG_HEADERS([include/config.h]) ++AC_CONFIG_MACRO_DIR([m4]) + + AM_INIT_AUTOMAKE + diff --git a/dev-libs/log4cpp/files/log4cpp-1.1-cmath-fix.patch b/dev-libs/log4cpp/files/log4cpp-1.1-cmath-fix.patch new file mode 100644 index 000000000000..0180580717ab --- /dev/null +++ b/dev-libs/log4cpp/files/log4cpp-1.1-cmath-fix.patch @@ -0,0 +1,10 @@ +--- a/src/PatternLayout.cpp ++++ b/src/PatternLayout.cpp +@@ -24,6 +24,7 @@ + #include <iomanip> + #include <ctime> + #include <cstdlib> ++#include <cmath> + #include "Localtime.hh" + + #ifdef LOG4CPP_HAVE_INT64_T diff --git a/dev-libs/log4cpp/log4cpp-1.1.ebuild b/dev-libs/log4cpp/log4cpp-1.1.ebuild new file mode 100644 index 000000000000..c2371180dd30 --- /dev/null +++ b/dev-libs/log4cpp/log4cpp-1.1.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools multilib-minimal + +DESCRIPTION="C++ classes for flexible logging to files, syslog and other destinations" +HOMEPAGE="http://log4cpp.sourceforge.net/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0/5" +KEYWORDS="amd64 ~arm ppc s390 x86" +IUSE="doc static-libs test" + +DEPEND="doc? ( app-doc/doxygen )" +RDEPEND="" + +PATCHES=( + "${FILESDIR}"/1.0-doc_install_path.patch + "${FILESDIR}"/1.0-gcc43.patch + "${FILESDIR}"/1.0-asneeded.patch + "${FILESDIR}"/${P}-cmath-fix.patch + "${FILESDIR}"/${P}-automake-1.13.patch +) + +S="${WORKDIR}/${PN}" + +MULTILIB_CHOST_TOOLS=( + /usr/bin/log4cpp-config +) + +src_prepare() { + default + + mv configure.{in,ac} || die + + # Build tests conditionally + if ! use test; then + sed -i -e '/^SUBDIRS/s/ tests//' Makefile.am || die + fi + + eautoreconf +} + +multilib_src_configure() { + ECONF_SOURCE=${S} econf \ + --without-idsa \ + $(use_enable doc doxygen) \ + $(use_enable static-libs static) +} + +multilib_src_install_all() { + einstalldocs + + # package installs .pc files + find "${D}" -name '*.la' -delete || die +} diff --git a/dev-libs/log4cpp/metadata.xml b/dev-libs/log4cpp/metadata.xml new file mode 100644 index 000000000000..b58010a3de5a --- /dev/null +++ b/dev-libs/log4cpp/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>cpp@gentoo.org</email> + <name>Gentoo C++ Project</name> + </maintainer> + <upstream> + <remote-id type="sourceforge">log4cpp</remote-id> + </upstream> +</pkgmetadata> |