diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-18 18:10:19 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-18 18:10:19 +0100 |
| commit | 46b2bb3001ce838ba2483a08418587d8a027f3a9 (patch) | |
| tree | b2b618839b5afcc859fcb90556e6f199d9a9a10c /package/collectd | |
| parent | 88d3e6d6c572143bd95a589a44e30bfefd616b88 (diff) | |
| parent | 902ee7e7b23751ca7a8264d36a837aa4aae12032 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/collectd')
| -rw-r--r-- | package/collectd/Makefile | 18 | ||||
| -rw-r--r-- | package/collectd/patches/patch-ltmain_sh | 11 |
2 files changed, 20 insertions, 9 deletions
diff --git a/package/collectd/Makefile b/package/collectd/Makefile index 52e6e6ab5..277e061cf 100644 --- a/package/collectd/Makefile +++ b/package/collectd/Makefile @@ -13,26 +13,26 @@ PKG_DEPENDS:= libpthread PKG_URL:= http://collectd.org/ PKG_SITES:= http://collectd.org/files/ -PKG_FLAVOURS:= CPU LOAD MEMORY PING -PKGFD_CPU:= collect CPU statistics -PKGFD_LOAD:= collect system load statistics -PKGFD_MEMORY:= collect memory usage statistics -PKGFD_PING:= enable ping statistic plugin +PKG_FLAVOURS_COLLECD:= WITH_CPU WITH_LOAD WITH_MEMORY WITH_PING +PKGFD_WITH_CPU:= collect CPU statistics +PKGFD_WITH_LOAD:= collect system load statistics +PKGFD_WITH_MEMORY:= collect memory usage statistics +PKGFD_WITH_PING:= enable ping statistic plugin include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,COLLECTD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -ifneq (${ADK_PACKAGE_COLLECTD_CPU},y) +ifneq (${ADK_PACKAGE_COLLECTD_WITH_CPU},y) DISABLE_CPU:=--disable-cpu endif -ifneq (${ADK_PACKAGE_COLLECTD_LOAD},y) +ifneq (${ADK_PACKAGE_COLLECTD_WITH_LOAD},y) DISABLE_LOAD:=--disable-load endif -ifneq (${ADK_PACKAGE_COLLECTD_MEMORY},y) +ifneq (${ADK_PACKAGE_COLLECTD_WITH_MEMORY},y) DISABLE_MEMORY:=--disable-memory endif -ifneq (${ADK_PACKAGE_COLLECTD_PING},y) +ifneq (${ADK_PACKAGE_COLLECTD_WITH_PING},y) DISABLE_PING:=--disable-ping endif diff --git a/package/collectd/patches/patch-ltmain_sh b/package/collectd/patches/patch-ltmain_sh new file mode 100644 index 000000000..d53645853 --- /dev/null +++ b/package/collectd/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- 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" |