From 3644457f9cfe21c2901f8ba5cf1c74f2b69eb959 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 9 Nov 2011 13:30:46 +0100 Subject: fix compile --- package/collectd/Makefile | 12 ++--- package/collectd/patches/patch-configure | 56 ---------------------- package/collectd/patches/patch-ltmain_sh | 11 ----- package/collectd/patches/patch-src_Makefile_in | 13 +++++ .../patch-src_libcollectdclient_Makefile_in | 12 ----- 5 files changed, 19 insertions(+), 85 deletions(-) delete mode 100644 package/collectd/patches/patch-configure delete mode 100644 package/collectd/patches/patch-ltmain_sh create mode 100644 package/collectd/patches/patch-src_Makefile_in delete mode 100644 package/collectd/patches/patch-src_libcollectdclient_Makefile_in (limited to 'package/collectd') diff --git a/package/collectd/Makefile b/package/collectd/Makefile index 33b5b4519..942e88942 100644 --- a/package/collectd/Makefile +++ b/package/collectd/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= collectd -PKG_VERSION:= 4.10.0 +PKG_VERSION:= 5.0.1 PKG_RELEASE:= 1 -PKG_MD5SUM:= c473cf8e9f22f5a9f7ef4c5be1b0c436 +PKG_MD5SUM:= a405d6cca021748fea43b60348b72b0c PKG_DESCR:= System statistics collection daemon PKG_SECTION:= misc PKG_DEPENDS:= libpthread @@ -101,14 +101,14 @@ CONFIGURE_ARGS+= --disable-apache \ --with-nan-emulation TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) -XAKE_FLAGS+= LIBS='-lm' +XAKE_FLAGS+= LIBS='-lm -lltdl' post-install: ${INSTALL_DIR} ${IDIR_COLLECTD}/usr/lib/collectd \ - ${IDIR_COLLECTD}/usr/sbin/ ${IDIR_COLLECTD}/etc - ${INSTALL_BIN} ${WRKINST}/usr/sbin/collectd ${IDIR_COLLECTD}/usr/sbin/ + ${IDIR_COLLECTD}/usr/sbin ${IDIR_COLLECTD}/etc + ${INSTALL_BIN} ${WRKINST}/usr/sbin/collectd ${IDIR_COLLECTD}/usr/sbin ${CP} ${WRKINST}/usr/lib/collectd/*.so \ - ${IDIR_COLLECTD}/usr/lib/collectd/ + ${IDIR_COLLECTD}/usr/lib/collectd ${INSTALL_DATA} ./files/collectd.conf \ ${IDIR_COLLECTD}/etc diff --git a/package/collectd/patches/patch-configure b/package/collectd/patches/patch-configure deleted file mode 100644 index 24d0c04b5..000000000 --- a/package/collectd/patches/patch-configure +++ /dev/null @@ -1,56 +0,0 @@ ---- collectd-4.10.0.orig/configure 2010-05-01 11:16:01.000000000 +0200 -+++ collectd-4.10.0/configure 2010-06-14 15:51:32.263465769 +0200 -@@ -16636,53 +16636,6 @@ $as_echo "#define HAVE_GEN_GETMNTENT 1" - - fi - --# Check for htonll --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if have htonll defined" >&5 --$as_echo_n "checking if have htonll defined... " >&6; } -- -- have_htonll="no" -- if test "$cross_compiling" = yes; then : -- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --as_fn_error "cannot run test program while cross compiling --See \`config.log' for more details." "$LINENO" 5; } --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -- -- --#include --#include --#if HAVE_INTTYPES_H --# include --#endif -- --int --main () --{ -- -- return htonll(0); -- -- ; -- return 0; --} -- --_ACEOF --if ac_fn_c_try_run "$LINENO"; then : -- -- have_htonll="yes" -- --$as_echo "#define HAVE_HTONLL 1" >>confdefs.h -- -- --fi --rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -- conftest.$ac_objext conftest.beam conftest.$ac_ext --fi -- -- --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_htonll" >&5 --$as_echo "$have_htonll" >&6; } - - # Check for structures - ac_fn_c_check_member "$LINENO" "struct if_data" "ifi_ibytes" "ac_cv_member_struct_if_data_ifi_ibytes" " diff --git a/package/collectd/patches/patch-ltmain_sh b/package/collectd/patches/patch-ltmain_sh deleted file mode 100644 index d53645853..000000000 --- a/package/collectd/patches/patch-ltmain_sh +++ /dev/null @@ -1,11 +0,0 @@ ---- collectd-4.10.0.orig/ltmain.sh 2010-05-01 11:15:57.000000000 +0200 -+++ collectd-4.10.0/ltmain.sh 2011-01-14 20:29:06.000000000 +0100 -@@ -4765,7 +4765,7 @@ func_mode_link () - # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC - # @file GCC response files - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) -+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - func_append compile_command " $arg" diff --git a/package/collectd/patches/patch-src_Makefile_in b/package/collectd/patches/patch-src_Makefile_in new file mode 100644 index 000000000..d1580516a --- /dev/null +++ b/package/collectd/patches/patch-src_Makefile_in @@ -0,0 +1,13 @@ +--- collectd-5.0.1.orig/src/Makefile.in 2011-10-14 22:54:14.000000000 +0200 ++++ collectd-5.0.1/src/Makefile.in 2011-10-22 18:57:51.000000000 +0200 +@@ -56,8 +56,8 @@ bin_PROGRAMS = collectd-nagios$(EXEEXT) + # too. -octo + @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_15 = 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 diff --git a/package/collectd/patches/patch-src_libcollectdclient_Makefile_in b/package/collectd/patches/patch-src_libcollectdclient_Makefile_in deleted file mode 100644 index a51a010ea..000000000 --- a/package/collectd/patches/patch-src_libcollectdclient_Makefile_in +++ /dev/null @@ -1,12 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- collectd-4.10.0.orig/src/libcollectdclient/Makefile.in 2010-05-01 11:16:00.000000000 +0200 -+++ collectd-4.10.0/src/libcollectdclient/Makefile.in 2010-06-14 15:49:28.563473998 +0200 -@@ -327,7 +327,7 @@ top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - AUTOMAKE_OPTIONS = foreign no-dependencies --@COMPILER_IS_GCC_TRUE@AM_CFLAGS = -Wall -Werror -+@COMPILER_IS_GCC_TRUE@AM_CFLAGS = -Wall - pkginclude_HEADERS = client.h lcc_features.h - lib_LTLIBRARIES = libcollectdclient.la - nodist_pkgconfig_DATA = libcollectdclient.pc -- cgit v1.2.3