From 895b1dc8123390fcd11e5ebeff94fb44a79d0bf3 Mon Sep 17 00:00:00 2001 From: jow Date: Sat, 18 Dec 2010 12:50:07 +0000 Subject: [PATCH] [packages] collectd: partly revert r24630 git-svn-id: svn://svn.openwrt.org/openwrt/packages@24662 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../patches/002-fix-ltdl-linking.patch | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 utils/collectd/patches/002-fix-ltdl-linking.patch diff --git a/utils/collectd/patches/002-fix-ltdl-linking.patch b/utils/collectd/patches/002-fix-ltdl-linking.patch new file mode 100644 index 000000000..359ed910a --- /dev/null +++ b/utils/collectd/patches/002-fix-ltdl-linking.patch @@ -0,0 +1,22 @@ +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -85,7 +85,7 @@ endif + + if BUILD_WITH_OWN_LIBOCONFIG + collectd_LDADD += $(LIBLTDL) liboconfig/liboconfig.la +-collectd_DEPENDENCIES += $(LIBLTDL) liboconfig/liboconfig.la ++collectd_DEPENDENCIES += liboconfig/liboconfig.la + else + collectd_LDADD += -loconfig + endif +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -57,7 +57,7 @@ bin_PROGRAMS = collectd-nagios$(EXEEXT) + @BUILD_WITH_LIBSTATGRAB_TRUE@am__append_13 = $(BUILD_WITH_LIBSTATGRAB_CFLAGS) + @BUILD_WITH_LIBSTATGRAB_TRUE@am__append_14 = $(BUILD_WITH_LIBSTATGRAB_LDFLAGS) + @BUILD_WITH_OWN_LIBOCONFIG_TRUE@am__append_15 = $(LIBLTDL) liboconfig/liboconfig.la +-@BUILD_WITH_OWN_LIBOCONFIG_TRUE@am__append_16 = $(LIBLTDL) liboconfig/liboconfig.la ++@BUILD_WITH_OWN_LIBOCONFIG_TRUE@am__append_16 = liboconfig/liboconfig.la + @BUILD_WITH_OWN_LIBOCONFIG_FALSE@am__append_17 = -loconfig + @BUILD_WITH_LIBSOCKET_TRUE@am__append_18 = -lsocket + @BUILD_AIX_TRUE@am__append_19 = -lm