collectd: solve "cannot relink convenience library", it was a wrongly applied fixup

SVN-Revision: 24630

diff --git a/utils/collectd/Makefile b/utils/collectd/Makefile
index 65ec4421249a446b095589dcd33c85795099f4c1..5e80f6dd4f135fa27f0964734257d4ace5c97aed 100644 (file)
--- a/utils/collectd/Makefile
+++ b/utils/collectd/Makefile
@@ -16,7 +16,6 @@ PKG_SOURCE_URL:=http://collectd.org/files/
 PKG_MD5SUM:=85d9d8d0a1327782661e3c89800aa70e
 
 PKG_FIXUP:=libtool
-PKG_LIBTOOL_PATHS:=. libltdl
 PKG_REMOVE_FILES:=aclocal.m4 libltdl/aclocal.m4
 
 PKG_INSTALL:=1

diff --git a/utils/collectd/patches/002-fix-ltdl-linking.patch b/utils/collectd/patches/002-fix-ltdl-linking.patch
deleted file mode 100644 (file)
index 359ed91..0000000
--- a/utils/collectd/patches/002-fix-ltdl-linking.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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