summaryrefslogtreecommitdiff
path: root/package/logrotate
diff options
context:
space:
mode:
Diffstat (limited to 'package/logrotate')
-rw-r--r--package/logrotate/Makefile1
-rw-r--r--package/logrotate/patches/patch-Makefile32
2 files changed, 28 insertions, 5 deletions
diff --git a/package/logrotate/Makefile b/package/logrotate/Makefile
index 1c7577a..884b2d0 100644
--- a/package/logrotate/Makefile
+++ b/package/logrotate/Makefile
@@ -18,7 +18,6 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LOGROTATE,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIG_STYLE:= manual
-
TCFLAGS+= -D_GNU_SOURCE -DVERSION=\"$(PKG_VERSION)\"
post-install:
diff --git a/package/logrotate/patches/patch-Makefile b/package/logrotate/patches/patch-Makefile
index 2b348b7..755e612 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: