2012-11-27 07:38:28 +00:00
|
|
|
Fedora-specific makefile patch.
|
|
|
|
|
|
2012-12-06 08:25:21 +00:00
|
|
|
--- iputils-s20121125/Makefile.orig 2012-12-05 15:30:04.000000000 +0100
|
|
|
|
|
+++ iputils-s20121125/Makefile 2012-12-05 15:31:50.349577490 +0100
|
|
|
|
|
@@ -32,7 +32,7 @@
|
2012-11-06 13:24:54 +00:00
|
|
|
# -------------------------------------
|
2004-09-09 06:24:00 +00:00
|
|
|
# What a pity, all new gccs are buggy and -Werror does not work. Sigh.
|
2012-11-22 07:01:47 +00:00
|
|
|
# CCOPT=-fno-strict-aliasing -Wstrict-prototypes -Wall -Werror -g
|
|
|
|
|
-CCOPT=-fno-strict-aliasing -Wstrict-prototypes -Wall -g
|
|
|
|
|
+CCOPT=-fno-strict-aliasing -Wstrict-prototypes -Wall -g -Werror
|
|
|
|
|
CCOPTOPT=-O3
|
2012-11-06 13:24:54 +00:00
|
|
|
GLIBCFIX=-D_GNU_SOURCE
|
|
|
|
|
DEFINES=
|
2012-12-06 08:25:21 +00:00
|
|
|
@@ -77,7 +77,7 @@
|
2004-09-09 06:24:00 +00:00
|
|
|
IPV6_TARGETS=tracepath6 traceroute6 ping6
|
2012-11-06 13:24:54 +00:00
|
|
|
TARGETS=$(IPV4_TARGETS) $(IPV6_TARGETS)
|
|
|
|
|
|
|
|
|
|
-CFLAGS=$(CCOPTOPT) $(CCOPT) $(GLIBCFIX) $(DEFINES)
|
2012-11-22 07:01:47 +00:00
|
|
|
+CFLAGS+=$(RPM_OPT_FLAGS) $(CCOPTOPT) $(CCOPT) $(GLIBCFIX) $(DEFINES)
|
2012-11-06 13:24:54 +00:00
|
|
|
LDLIBS=$(LDLIB) $(ADDLIB)
|
|
|
|
|
|
|
|
|
|
LASTTAG:=`git describe HEAD | sed -e 's/-.*//'`
|
2012-12-06 08:25:21 +00:00
|
|
|
@@ -146,6 +146,7 @@
|
|
|
|
|
|
|
|
|
|
# -------------------------------------
|
|
|
|
|
# ninfod
|
|
|
|
|
+ninfod: CFLAGS:=$(filter-out -Werror,$(CFLAGS))
|
|
|
|
|
ninfod:
|
|
|
|
|
@set -e; \
|
|
|
|
|
if [ ! -f ninfod/Makefile ]; then \
|
