diff options
| author | Rosen Penev <rosenp@gmail.com> | 2020-08-19 03:13:48 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-19 03:13:48 -0700 |
| commit | e42ef22042758847b364b7cf3b2797c88887c31d (patch) | |
| tree | 9cdcc374b80199c0354ff053bac99dc8552b58d6 /utils | |
| parent | d70d2bda97fccdb26d14f76da0e5ac0230e07987 (diff) | |
| parent | 8f3998852067b484fb63f929fe36e90093e04e1e (diff) | |
Merge pull request #13162 from neheb/sysst
sysstat: update to 12.4.0
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/sysstat/Makefile | 7 | ||||
| -rw-r--r-- | utils/sysstat/patches/010-ldflags.patch | 47 |
2 files changed, 51 insertions, 3 deletions
diff --git a/utils/sysstat/Makefile b/utils/sysstat/Makefile index f1d673f50..f09dd984c 100644 --- a/utils/sysstat/Makefile +++ b/utils/sysstat/Makefile @@ -8,18 +8,19 @@ include $(TOPDIR)/rules.mk PKG_NAME:=sysstat -PKG_VERSION:=12.2.2 -PKG_RELEASE:=1 +PKG_VERSION:=12.4.0 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://pagesperso-orange.fr/sebastien.godard/ -PKG_HASH:=78388b64acec81378b962e66b40e57acd4b18ff17a849bc9308f95d290248c9c +PKG_HASH:=78556c339795ecd07eb10ee09e3f5d52901d3a29f874ae92b45efd0de7b62d16 PKG_MAINTAINER:=Marko Ratkaj <marko.ratkaj@sartura.hr> PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE_FILES:=COPYING PKG_CPE_ID:=cpe:/a:sysstat_project:sysstat +PKG_FIXUP:=autoreconf PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=1 diff --git a/utils/sysstat/patches/010-ldflags.patch b/utils/sysstat/patches/010-ldflags.patch new file mode 100644 index 000000000..a37401f95 --- /dev/null +++ b/utils/sysstat/patches/010-ldflags.patch @@ -0,0 +1,47 @@ +--- a/Makefile.in ++++ b/Makefile.in +@@ -80,7 +80,7 @@ SYSCONFIG_FILE = @SYSCONFIG_FILE@ + # Compiler flags + CFLAGS = @CFLAGS@ -Wall -Wstrict-prototypes -pipe -O2 + DFLAGS = @DFLAGS@ +-LFLAGS = @STRIP@ ++LDFLAGS += @STRIP@ + DFLAGS += -DSA_DIR=\"$(SA_DIR)\" -DSADC_PATH=\"$(SADC_PATH)\" + DFLAGS += $(DFSENSORS) + DFLAGS += $(DFPCP) +@@ -117,7 +117,7 @@ ifeq ($(SYSPARAM),y) + DFLAGS += -DHAVE_SYS_PARAM_H + endif + NLS = @NLS@ +-LFLAGS += @LFINTL@ ++LDFLAGS += @LFINTL@ + ifeq ($(NLS),y) + REQUIRE_NLS = -DUSE_NLS -DPACKAGE=\"$(PACKAGE)\" -DLOCALEDIR=\"$(NLS_DIR)\" + endif +@@ -195,7 +195,7 @@ NLSPOT= $(NLSPO:.po=.pot) + $(CC) -o $@ -c $(CFLAGS) $(DFLAGS) $< + + % : %.o +- $(CC) -o $@ $(CFLAGS) $^ $(LFLAGS) ++ $(CC) -o $@ $(CFLAGS) $^ $(LDFLAGS) + + all: sadc sar sadf iostat tapestat mpstat pidstat cifsiostat locales + +@@ -283,7 +283,7 @@ librdsensors.a: rd_sensors.o + + sadc.o: sadc.c sa.h version.h common.h rd_stats.h rd_sensors.h + +-sadc: LFLAGS += $(LFSENSORS) ++sadc: LDFLAGS += $(LFSENSORS) + + sadc: sadc.o act_sadc.o sa_wrap.o sa_common_sadc.o common_sadc.o systest.o librdstats.a librdsensors.a + +@@ -293,7 +293,7 @@ sar: sar.o act_sar.o format_sar.o sa_common.o pr_stats.o librdstats_light.a libs + + sadf.o: sadf.c sadf.h version.h sa.h common.h rd_stats.h rd_sensors.h + +-sadf: LFLAGS += $(LFPCP) ++sadf: LDFLAGS += $(LFPCP) + + sadf: sadf.o act_sadf.o format_sadf.o sadf_misc.o pcp_def_metrics.o sa_conv.o rndr_stats.o xml_stats.o json_stats.o svg_stats.o raw_stats.o pcp_stats.o sa_common.o librdstats_light.a libsyscom.a + |