diff options
Diffstat (limited to 'net-mgmt/collectd5/files/patch-src__Makefile.am')
| -rw-r--r-- | net-mgmt/collectd5/files/patch-src__Makefile.am | 40 |
1 files changed, 16 insertions, 24 deletions
diff --git a/net-mgmt/collectd5/files/patch-src__Makefile.am b/net-mgmt/collectd5/files/patch-src__Makefile.am index 9a149722626e..3cd035d57c28 100644 --- a/net-mgmt/collectd5/files/patch-src__Makefile.am +++ b/net-mgmt/collectd5/files/patch-src__Makefile.am @@ -1,14 +1,6 @@ ---- src/Makefile.am.orig 2016-01-22 09:51:17 UTC +--- src/Makefile.am.orig 2016-09-11 08:10:25 UTC +++ src/Makefile.am -@@ -7,14 +7,14 @@ SUBDIRS += daemon - PLUGIN_LDFLAGS = -module -avoid-version -export-symbols-regex '\<module_register\>' - - if COMPILER_IS_GCC --AM_CFLAGS = -Wall -Werror -+AM_CFLAGS = -Wall - endif - - AM_CPPFLAGS = -I$(srcdir)/daemon +@@ -10,7 +10,7 @@ AM_CPPFLAGS = -I$(srcdir)/daemon AM_CPPFLAGS += -DPREFIX='"${prefix}"' AM_CPPFLAGS += -DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"' AM_CPPFLAGS += -DLOCALSTATEDIR='"${localstatedir}"' @@ -17,7 +9,7 @@ if BUILD_FEATURE_DAEMON AM_CPPFLAGS += -DPIDFILE='"${localstatedir}/run/${PACKAGE_NAME}.pid"' endif -@@ -218,7 +218,7 @@ cpu_la_CFLAGS = $(AM_CFLAGS) +@@ -274,7 +274,7 @@ cpu_la_CFLAGS = $(AM_CFLAGS) cpu_la_LDFLAGS = $(PLUGIN_LDFLAGS) cpu_la_LIBADD = if BUILD_WITH_LIBKSTAT @@ -26,7 +18,7 @@ endif if BUILD_WITH_LIBDEVINFO cpu_la_LIBADD += -ldevinfo -@@ -301,7 +301,7 @@ disk_la_CFLAGS = $(AM_CFLAGS) +@@ -358,7 +358,7 @@ disk_la_CFLAGS = $(AM_CFLAGS) disk_la_LDFLAGS = $(PLUGIN_LDFLAGS) disk_la_LIBADD = if BUILD_WITH_LIBKSTAT @@ -35,7 +27,7 @@ endif if BUILD_WITH_LIBDEVINFO disk_la_LIBADD += -ldevinfo -@@ -319,6 +319,9 @@ endif +@@ -381,6 +381,9 @@ endif if BUILD_WITH_PERFSTAT disk_la_LIBADD += -lperfstat endif @@ -45,7 +37,7 @@ endif if BUILD_PLUGIN_DNS -@@ -405,7 +408,7 @@ interface_la_CFLAGS += $(BUILD_WITH_LIBS +@@ -481,7 +484,7 @@ interface_la_CFLAGS += $(BUILD_WITH_LIBS interface_la_LIBADD += $(BUILD_WITH_LIBSTATGRAB_LDFLAGS) else if BUILD_WITH_LIBKSTAT @@ -54,7 +46,7 @@ endif if BUILD_WITH_LIBDEVINFO interface_la_LIBADD += -ldevinfo -@@ -584,7 +587,7 @@ memory_la_CFLAGS = $(AM_CFLAGS) +@@ -669,7 +672,7 @@ memory_la_CFLAGS = $(AM_CFLAGS) memory_la_LDFLAGS = $(PLUGIN_LDFLAGS) memory_la_LIBADD = if BUILD_WITH_LIBKSTAT @@ -63,7 +55,7 @@ endif if BUILD_WITH_LIBDEVINFO memory_la_LIBADD += -ldevinfo -@@ -951,7 +954,7 @@ swap_la_CFLAGS = $(AM_CFLAGS) +@@ -1034,7 +1037,7 @@ swap_la_CFLAGS = $(AM_CFLAGS) swap_la_LDFLAGS = $(PLUGIN_LDFLAGS) swap_la_LIBADD = if BUILD_WITH_LIBKSTAT @@ -72,7 +64,7 @@ endif if BUILD_WITH_LIBDEVINFO swap_la_LIBADD += -ldevinfo -@@ -997,7 +1000,7 @@ if BUILD_PLUGIN_TAPE +@@ -1080,7 +1083,7 @@ if BUILD_PLUGIN_TAPE pkglib_LTLIBRARIES += tape.la tape_la_SOURCES = tape.c tape_la_LDFLAGS = $(PLUGIN_LDFLAGS) @@ -81,7 +73,7 @@ endif if BUILD_PLUGIN_TARGET_NOTIFICATION -@@ -1102,7 +1105,7 @@ uptime_la_CFLAGS = $(AM_CFLAGS) +@@ -1184,7 +1187,7 @@ uptime_la_CFLAGS = $(AM_CFLAGS) uptime_la_LDFLAGS = $(PLUGIN_LDFLAGS) uptime_la_LIBADD = if BUILD_WITH_LIBKSTAT @@ -90,16 +82,16 @@ endif if BUILD_WITH_PERFSTAT uptime_la_LIBADD += -lperfstat -@@ -1260,7 +1263,7 @@ if BUILD_LINUX - # zfs_arc requires no library on linux - else - # solaris +@@ -1340,7 +1343,7 @@ if BUILD_FREEBSD + zfs_arc_la_LIBADD = -lm + endif + if BUILD_SOLARIS -zfs_arc_la_LIBADD = -lkstat +zfs_arc_la_LIBADD = $(BUILD_WITH_LIBKSTAT_LIBS) endif endif - endif -@@ -1354,12 +1357,7 @@ endif + +@@ -1433,12 +1436,7 @@ endif install-exec-hook: $(mkinstalldirs) $(DESTDIR)$(sysconfdir) |