diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-17 21:55:49 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-17 21:55:49 +0100 |
| commit | 15c84adca94bfe4a89ece5c04f06a884cf508ebb (patch) | |
| tree | 727d3fd768a1abe75521190b90833b3a68cce4c6 /package/logrotate/patches | |
| parent | 0de5d9ecedff55481b3c1eb9c3841de17716a485 (diff) | |
fix packages to be compile with stack protector
- libtool do not pass -fstack-protector while linking,
but this is required to successfully link libraries or
executables with SSP
- pass LDFLAGS for non-libtool packages
Diffstat (limited to 'package/logrotate/patches')
| -rw-r--r-- | package/logrotate/patches/patch-Makefile | 32 |
1 files changed, 28 insertions, 4 deletions
diff --git a/package/logrotate/patches/patch-Makefile b/package/logrotate/patches/patch-Makefile index 2b348b75f..755e612b1 100644 --- a/package/logrotate/patches/patch-Makefile +++ b/package/logrotate/patches/patch-Makefile @@ -1,6 +1,6 @@ --- logrotate-3.7.8.orig/Makefile 2008-05-19 12:25:54.000000000 +0200 -+++ logrotate-3.7.8/Makefile 2010-02-06 00:00:58.853084930 +0100 -@@ -1,7 +1,7 @@ ++++ logrotate-3.7.8/Makefile 2011-01-15 23:45:59.000000000 +0100 +@@ -1,10 +1,10 @@ VERSION = $(shell awk '/Version:/ { print $$2 }' logrotate.spec) -OS_NAME = $(shell uname -s) +OS_NAME = Linux @@ -9,8 +9,32 @@ +CFLAGS ?= -Wall -D_GNU_SOURCE -D$(OS_NAME) -DVERSION=\"$(VERSION)\" $(RPM_OPT_FLAGS) $(LFS) PROG = logrotate MAN = logrotate.8 - LOADLIBES = -lpopt -@@ -96,16 +96,16 @@ test: $(TARGET) +-LOADLIBES = -lpopt ++LIBS = -lpopt + SVNURL= svn+ssh://svn.fedorahosted.org/svn/logrotate + SVNPUBURL = http://svn.fedorahosted.org/svn/logrotate + SVNTAG = r$(subst .,-,$(VERSION)) +@@ -68,10 +68,7 @@ MANDIR = $(BASEDIR)/man + OBJS = logrotate.o log.o config.o basenames.o + SOURCES = $(subst .o,.c,$(OBJS) $(LIBOBJS)) + +-ifeq ($(RPM_OPT_FLAGS),) +-CFLAGS += -g +-LDFLAGS = -g +-endif ++LDFLAGS ?= + + ifeq (.depend,$(wildcard .depend)) + TARGET=$(PROG) +@@ -84,6 +81,7 @@ RCSVERSION = $(subst .,-,$(VERSION)) + all: $(TARGET) + + $(PROG): $(OBJS) ++ $(CC) $(LDFLAGS) -o $(PROG) $^ $(LIBS) + + clean: + rm -f $(OBJS) $(PROG) core* .depend +@@ -96,16 +94,16 @@ test: $(TARGET) (cd test; ./test) install: |