diff options
Diffstat (limited to 'package/logrotate/patches/patch-Makefile')
| -rw-r--r-- | package/logrotate/patches/patch-Makefile | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/package/logrotate/patches/patch-Makefile b/package/logrotate/patches/patch-Makefile index c2b81fbbc..9b8fec9c3 100644 --- a/package/logrotate/patches/patch-Makefile +++ b/package/logrotate/patches/patch-Makefile @@ -1,11 +1,14 @@ ---- logrotate-3.8.7.orig/Makefile 2013-06-10 13:29:16.000000000 +0200 -+++ logrotate-3.8.7/Makefile 2014-03-23 15:16:09.000000000 +0100 -@@ -1,11 +1,11 @@ +--- logrotate-3.8.9.orig/Makefile 2015-02-13 07:11:21.000000000 +0100 ++++ logrotate-3.8.9/Makefile 2015-04-02 16:40:24.000000000 +0200 +@@ -1,11 +1,12 @@ VERSION = $(shell awk '/Version:/ { print $$2 }' logrotate.spec) -OS_NAME = $(shell uname -s) +-LFS = $(shell echo `getconf LFS_CFLAGS 2>/dev/null`) +-CFLAGS = -Wall -D_GNU_SOURCE -D$(OS_NAME) -DVERSION=\"$(VERSION)\" -DHAVE_STRPTIME=1 -DHAVE_QSORT $(RPM_OPT_FLAGS) $(LFS) +OS_NAME = Linux - LFS = $(shell echo `getconf LFS_CFLAGS 2>/dev/null`) - CFLAGS = -Wall -D_GNU_SOURCE -D$(OS_NAME) -DVERSION=\"$(VERSION)\" $(RPM_OPT_FLAGS) $(LFS) ++#LFS = $(shell echo `getconf LFS_CFLAGS 2>/dev/null`) ++CFLAGS ?= ++CFLAGS += -D_GNU_SOURCE -D$(OS_NAME) -DVERSION=\"$(VERSION)\" -DHAVE_STRPTIME=1 -DHAVE_QSORT $(RPM_OPT_FLAGS) $(LFS) PROG = logrotate MAN = logrotate.8 MAN5 = logrotate.conf.5 @@ -14,7 +17,7 @@ SVNURL= svn+ssh://svn.fedorahosted.org/svn/logrotate SVNPUBURL = http://svn.fedorahosted.org/svn/logrotate SVNTAG = r$(subst .,-,$(VERSION)) -@@ -64,7 +64,7 @@ endif +@@ -64,7 +65,7 @@ endif # Red Hat Linux ifeq ($(OS_NAME),Linux) INSTALL = install @@ -23,8 +26,8 @@ endif # FreeBSD -@@ -117,6 +117,7 @@ RCSVERSION = $(subst .,-,$(VERSION)) - all: $(TARGET) pretest +@@ -124,6 +125,7 @@ show_warning: + @echo "" $(PROG): $(OBJS) + $(CC) $(LDFLAGS) -o $(PROG) $^ $(LIBS) |