From: Jo-Philipp Wich Date: Fri, 17 Dec 2010 01:42:54 +0000 (+0000) Subject: collectd: solve "cannot relink convenience library", it was a wrongly applied fixup X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=c7e335156e98d14d15ec953552b46f121b7db0f2;p=openwrt%2Fsvn-archive%2Fpackages.git 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 65ec44212..5e80f6dd4 100644 --- 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 index 359ed910a..000000000 --- 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