Merge pull request #14400 from FrederickGeek8/fix-14287
[feed/packages.git] / utils / sysstat / patches / 010-ldflags.patch
1 --- a/Makefile.in
2 +++ b/Makefile.in
3 @@ -80,7 +80,7 @@ SYSCONFIG_FILE = @SYSCONFIG_FILE@
4 # Compiler flags
5 CFLAGS = @CFLAGS@ -Wall -Wstrict-prototypes -pipe -O2
6 DFLAGS = @DFLAGS@
7 -LFLAGS = @STRIP@
8 +LDFLAGS += @STRIP@
9 DFLAGS += -DSA_DIR=\"$(SA_DIR)\" -DSADC_PATH=\"$(SADC_PATH)\"
10 DFLAGS += $(DFSENSORS)
11 DFLAGS += $(DFPCP)
12 @@ -117,7 +117,7 @@ ifeq ($(SYSPARAM),y)
13 DFLAGS += -DHAVE_SYS_PARAM_H
14 endif
15 NLS = @NLS@
16 -LFLAGS += @LFINTL@
17 +LDFLAGS += @LFINTL@
18 ifeq ($(NLS),y)
19 REQUIRE_NLS = -DUSE_NLS -DPACKAGE=\"$(PACKAGE)\" -DLOCALEDIR=\"$(NLS_DIR)\"
20 endif
21 @@ -195,7 +195,7 @@ NLSPOT= $(NLSPO:.po=.pot)
22 $(CC) -o $@ -c $(CFLAGS) $(DFLAGS) $<
23
24 % : %.o
25 - $(CC) -o $@ $(CFLAGS) $^ $(LFLAGS)
26 + $(CC) -o $@ $(CFLAGS) $^ $(LDFLAGS)
27
28 all: sadc sar sadf iostat tapestat mpstat pidstat cifsiostat locales
29
30 @@ -283,7 +283,7 @@ librdsensors.a: rd_sensors.o
31
32 sadc.o: sadc.c sa.h version.h common.h rd_stats.h rd_sensors.h
33
34 -sadc: LFLAGS += $(LFSENSORS)
35 +sadc: LDFLAGS += $(LFSENSORS)
36
37 sadc: sadc.o act_sadc.o sa_wrap.o sa_common_sadc.o common_sadc.o systest.o librdstats.a librdsensors.a
38
39 @@ -293,7 +293,7 @@ sar: sar.o act_sar.o format_sar.o sa_com
40
41 sadf.o: sadf.c sadf.h version.h sa.h common.h rd_stats.h rd_sensors.h
42
43 -sadf: LFLAGS += $(LFPCP)
44 +sadf: LDFLAGS += $(LFPCP)
45
46 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
47