From: "Andreas HAttel (dilfridge)" <dilfridge@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in app-admin/collectd/files: collectd-4.10.1-noowniptc.patch
Date: Tue, 12 Oct 2010 17:59:52 +0000 (UTC) [thread overview]
Message-ID: <20101012175952.588B32004B@flycatcher.gentoo.org> (raw)
dilfridge 10/10/12 17:59:52
Added: collectd-4.10.1-noowniptc.patch
Log:
Real fix for bug 340109: use libiptc only if needed and fully disable bundled copy
(Portage version: 2.1.9.14/cvs/Linux x86_64)
Revision Changes Path
1.1 app-admin/collectd/files/collectd-4.10.1-noowniptc.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/collectd/files/collectd-4.10.1-noowniptc.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/collectd/files/collectd-4.10.1-noowniptc.patch?rev=1.1&content-type=text/plain
Index: collectd-4.10.1-noowniptc.patch
===================================================================
diff -r -u collectd-4.10.1.orig/src/Makefile.am collectd-4.10.1/src/Makefile.am
--- collectd-4.10.1.orig/src/Makefile.am 2010-07-09 12:01:59.000000000 +0200
+++ collectd-4.10.1/src/Makefile.am 2010-10-11 00:10:59.000000000 +0200
@@ -1,7 +1,4 @@
SUBDIRS = libcollectdclient
-if BUILD_WITH_OWN_LIBIPTC
-SUBDIRS += owniptc
-endif
if BUILD_WITH_OWN_LIBOCONFIG
SUBDIRS += liboconfig
endif
@@ -415,12 +412,9 @@
iptables_la_SOURCES = iptables.c
iptables_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBIPTC_CPPFLAGS)
iptables_la_LDFLAGS = -module -avoid-version $(BUILD_WITH_LIBIPTC_LDFLAGS)
-if BUILD_WITH_OWN_LIBIPTC
-iptables_la_LIBADD = owniptc/libiptc.la
-iptables_la_DEPENDENCIES = owniptc/libiptc.la
-else
+
iptables_la_LIBADD = -liptc
-endif
+
collectd_LDADD += "-dlopen" iptables.la
collectd_DEPENDENCIES += iptables.la
endif
reply other threads:[~2010-10-12 17:59 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20101012175952.588B32004B@flycatcher.gentoo.org \
--to=dilfridge@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox