summaryrefslogtreecommitdiffstats
path: root/utils
diff options
context:
space:
mode:
authorPeter Jones <pjones@redhat.com>2005-03-02 02:29:39 +0000
committerPeter Jones <pjones@redhat.com>2005-03-02 02:29:39 +0000
commita04619e231e733ae8918ac7fefddc063c2a8b1da (patch)
treed4e32a4a82086bf349d7033618bcf6ac333adce8 /utils
parent40fd19c8bd26cadb95528e54a534f0d68b2c8188 (diff)
downloadanaconda-a04619e231e733ae8918ac7fefddc063c2a8b1da.tar.gz
anaconda-a04619e231e733ae8918ac7fefddc063c2a8b1da.tar.xz
anaconda-a04619e231e733ae8918ac7fefddc063c2a8b1da.zip
Add -D_FORTIFY_SOURCE=2 everywhere. Let's see if it actually works...
Also, make genhdlist.o build with -Wno-return-type, because rpm's headers and gcc4 don't get along.
Diffstat (limited to 'utils')
-rw-r--r--utils/Makefile16
1 files changed, 12 insertions, 4 deletions
diff --git a/utils/Makefile b/utils/Makefile
index d8dba43ab..93e06c9ae 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -7,7 +7,7 @@ ISYSLIB=isys
LOADERDIR = ../loader2
LOADLIBES = -lpopt
-CFLAGS = -Wall -g -I.. -I$(LOADERDIR) -Werror
+CFLAGS = -Wall -g -I.. -I$(LOADERDIR) -Werror -D_FORTIFY_SOURCE=2
RPMCFLAGS = $(CFLAGS) -I/usr/include/rpm
LDFLAGS = -g
@@ -37,10 +37,18 @@ moddeps: moddeps.o moduledeps.o
$(LOADLIBES) -lresolv -lpopt -lbz2
md5.o: md5.c md5.h
- gcc -c -O -g md5.c
+ gcc -c -O -g md5.c -D_FORTIFY_SOURCE=2
-genhdlist: genhdlist.c hash.c
- $(CC) $(LDFLAGS) $(RPMCFLAGS) -o genhdlist genhdlist.c hash.c \
+hash.o : hash.c
+ $(CC) $(RPMCFLAGS) -c -o $@ $<
+
+# XXX rpm needs to be fixed not to have const functions. Until then,
+# -Wno-return-type
+genhdlist.o : genhdlist.c
+ $(CC) $(RPMCFLAGS) -Wno-return-type -c -o $@ $<
+
+genhdlist: genhdlist.o hash.o
+ $(CC) $(LDFLAGS) -o genhdlist $^ \
-lrpm -lrpmdb -lrpmio -lbz2 -lz -lpopt -lelf -lpthread -lbeecrypt
depends: