| 1 |
jlec 15/02/10 08:19:01 |
| 2 |
|
| 3 |
Added: multitail-6.3-as-needed.patch |
| 4 |
Removed: multitail-5.2.13-as-needed.patch |
| 5 |
multitail-5.2.12-as-needed.patch |
| 6 |
5.2.2-as-needed.patch 5.2.6-buffer-overflow.patch |
| 7 |
Log: |
| 8 |
Version Bump; use src_compile to build; drop old patches |
| 9 |
|
| 10 |
(Portage version: 2.2.16/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!) |
| 11 |
|
| 12 |
Revision Changes Path |
| 13 |
1.1 app-text/multitail/files/multitail-6.3-as-needed.patch |
| 14 |
|
| 15 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/multitail/files/multitail-6.3-as-needed.patch?rev=1.1&view=markup |
| 16 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/multitail/files/multitail-6.3-as-needed.patch?rev=1.1&content-type=text/plain |
| 17 |
|
| 18 |
Index: multitail-6.3-as-needed.patch |
| 19 |
=================================================================== |
| 20 |
Makefile | 12 ++++++------ |
| 21 |
1 file changed, 6 insertions(+), 6 deletions(-) |
| 22 |
|
| 23 |
diff --git a/Makefile b/Makefile |
| 24 |
index f672e41..7dc6a6e 100644 |
| 25 |
--- a/Makefile |
| 26 |
+++ b/Makefile |
| 27 |
@@ -8,11 +8,11 @@ CONFIG_FILE=$(DESTDIR)/etc/multitail.conf |
| 28 |
CC?=gcc |
| 29 |
DEBUG=-g -O2 -Wall # -D_DEBUG # -pg # -D_DEBUG #-pg -W -pedantic # -pg #-fprofile-arcs |
| 30 |
ifeq ($(UTF8_SUPPORT),yes) |
| 31 |
-LDFLAGS+=-lpanelw -lncursesw -lutil -lm |
| 32 |
-CFLAGS+=-funsigned-char -D`uname` -DVERSION=\"$(VERSION)\" -DCONFIG_FILE=\"$(CONFIG_FILE)\" -DUTF8_SUPPORT -D_FORTIFY_SOURCE=2 |
| 33 |
+LIBS+=`$(PKG_CONFIG) --libs ncursesw panelw` -lutil -lm |
| 34 |
+CFLAGS+=-funsigned-char -D`uname` -DVERSION=\"$(VERSION)\" $(DEBUG) -DCONFIG_FILE=\"$(CONFIG_FILE)\" -DUTF8_SUPPORT |
| 35 |
else |
| 36 |
-LDFLAGS+=-lpanel -lncurses -lutil -lm |
| 37 |
-CFLAGS+=-funsigned-char -D`uname` -DVERSION=\"$(VERSION)\" -DCONFIG_FILE=\"$(CONFIG_FILE)\" -D_FORTIFY_SOURCE=2 |
| 38 |
+LIBS+=`$(PKG_CONFIG) --libs ncurses panel` -lutil -lm |
| 39 |
+CFLAGS+=-funsigned-char -D`uname` -DVERSION=\"$(VERSION)\" $(DEBUG) -DCONFIG_FILE=\"$(CONFIG_FILE)\" |
| 40 |
endif |
| 41 |
|
| 42 |
OBJS=utils.o mt.o error.o my_pty.o term.o scrollback.o help.o mem.o cv.o selbox.o stripstring.o color.o misc.o ui.o exec.o diff.o config.o cmdline.o globals.o history.o xclip.o |
| 43 |
@@ -20,10 +20,10 @@ OBJS=utils.o mt.o error.o my_pty.o term.o scrollback.o help.o mem.o cv.o selbox. |
| 44 |
all: multitail |
| 45 |
|
| 46 |
multitail: $(OBJS) |
| 47 |
- $(CC) $(OBJS) $(LDFLAGS) -o multitail |
| 48 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -Wall -W $(OBJS) -o $@ $(LIBS) |
| 49 |
|
| 50 |
multitail_ccmalloc: $(OBJS) |
| 51 |
- ccmalloc --no-wrapper $(CC) -Wall -W $(OBJS) $(LDFLAGS) -o ccmultitail |
| 52 |
+ ccmalloc --no-wrapper $(CC) $(CFLAGS) $(LDFLAGS) -Wall -W $(OBJS) -o $@ $(LIBS) |
| 53 |
|
| 54 |
install: multitail |
| 55 |
mkdir -p $(DESTDIR)$(PREFIX)/bin |
Archives