diff options
| author |   Jason Zaman <perfinion@gentoo.org> | 2016-01-04 14:03:02 +0400 |
|---|---|---|
| committer | Jason Zaman <perfinion@gentoo.org> | 2016-01-04 14:04:35 +0400 |
| commit | 255bbef4ec73371480d70ddcf331e1a1c9db1574 (patch) | |
| tree | 1d0d6fca26d8507d353c773a26da5abb6dff6871 | |
| parent | sys-kernel/git-sources: Automated version bump to 4.4_rc8 (diff) | |
| download | gentoo-255bbef4ec73371480d70ddcf331e1a1c9db1574.tar.gz gentoo-255bbef4ec73371480d70ddcf331e1a1c9db1574.tar.bz2 gentoo-255bbef4ec73371480d70ddcf331e1a1c9db1574.zip | |
app-admin/collectd: update patch to unbundle libltdl
Package-Manager: portage-2.2.26
| -rw-r--r-- | app-admin/collectd/collectd-5.5.0.ebuild | 7 | ||||
| -rw-r--r-- | app-admin/collectd/files/collectd-5.5.0-lt.patch | 35 |
2 files changed, 39 insertions, 3 deletions
diff --git a/app-admin/collectd/collectd-5.5.0.ebuild b/app-admin/collectd/collectd-5.5.0.ebuild index 012278f2d738..64af3dd795ef 100644 --- a/app-admin/collectd/collectd-5.5.0.ebuild +++ b/app-admin/collectd/collectd-5.5.0.ebuild @@ -126,8 +126,9 @@ REQUIRED_USE=" collectd_plugins_python? ( ${PYTHON_REQUIRED_USE} )" PATCHES=( - "${FILESDIR}/${PN}-5.4.1"-{libocci,lt}.patch - "${FILESDIR}/${PN}-4.10.3"-werror.patch + "${FILESDIR}/${PN}-5.4.1-libocci.patch" + "${FILESDIR}/${PN}-5.5.0-lt.patch" + "${FILESDIR}/${PN}-4.10.3-werror.patch" ) # @FUNCTION: collectd_plugin_kernel_linux @@ -220,7 +221,7 @@ pkg_setup() { } src_prepare() { - default + epatch ${PATCHES[@]} epatch_user # There's some strange prefix handling in the default config file, resulting in diff --git a/app-admin/collectd/files/collectd-5.5.0-lt.patch b/app-admin/collectd/files/collectd-5.5.0-lt.patch new file mode 100644 index 000000000000..b14736bf2667 --- /dev/null +++ b/app-admin/collectd/files/collectd-5.5.0-lt.patch @@ -0,0 +1,35 @@ +diff --git Makefile.am Makefile.am +index 5267123..a7e0d0c 100644 +--- Makefile.am ++++ Makefile.am +@@ -1,6 +1,4 @@ +-ACLOCAL_AMFLAGS = -I libltdl/m4 +- +-SUBDIRS = libltdl src bindings . ++SUBDIRS = src bindings . + + INCLUDES = $(LTDLINCL) + +--- configure.ac.old 2016-01-04 13:55:39.286846436 +0400 ++++ configure.ac 2016-01-04 13:56:07.905362298 +0400 +@@ -2,12 +2,10 @@ + AC_INIT([collectd],[m4_esyscmd(./version-gen.sh)]) + AC_CONFIG_SRCDIR(src/) + AC_CONFIG_HEADERS(src/config.h) +-AC_CONFIG_AUX_DIR([libltdl/config]) + + m4_ifdef([LT_PACKAGE_VERSION], + # libtool >= 2.2 + [ +- LT_CONFIG_LTDL_DIR([libltdl]) + LT_INIT([dlopen]) + LTDL_INIT([convenience]) + AC_DEFINE(LIBTOOL_VERSION, 2, [Define to used libtool version.]) +@@ -19,7 +17,6 @@ + AC_SUBST(LTDLINCL) + AC_SUBST(LIBLTDL) + AC_LIBTOOL_DLOPEN +- AC_CONFIG_SUBDIRS(libltdl) + AC_DEFINE(LIBTOOL_VERSION, 1, [Define to used libtool version.]) + ] + ) |