* [gentoo-commits] gentoo-x86 commit in app-text/multitail/files: multitail-6.3-as-needed.patch multitail-5.2.13-as-needed.patch multitail-5.2.12-as-needed.patch 5.2.2-as-needed.patch 5.2.6-buffer-overflow.patch
@ 2015-02-10 8:19 Justin Lecher (jlec)
0 siblings, 0 replies; only message in thread
From: Justin Lecher (jlec) @ 2015-02-10 8:19 UTC (permalink / raw
To: gentoo-commits
jlec 15/02/10 08:19:01
Added: multitail-6.3-as-needed.patch
Removed: multitail-5.2.13-as-needed.patch
multitail-5.2.12-as-needed.patch
5.2.2-as-needed.patch 5.2.6-buffer-overflow.patch
Log:
Version Bump; use src_compile to build; drop old patches
(Portage version: 2.2.16/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)
Revision Changes Path
1.1 app-text/multitail/files/multitail-6.3-as-needed.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/multitail/files/multitail-6.3-as-needed.patch?rev=1.1&view=markup
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
Index: multitail-6.3-as-needed.patch
===================================================================
Makefile | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/Makefile b/Makefile
index f672e41..7dc6a6e 100644
--- a/Makefile
+++ b/Makefile
@@ -8,11 +8,11 @@ CONFIG_FILE=$(DESTDIR)/etc/multitail.conf
CC?=gcc
DEBUG=-g -O2 -Wall # -D_DEBUG # -pg # -D_DEBUG #-pg -W -pedantic # -pg #-fprofile-arcs
ifeq ($(UTF8_SUPPORT),yes)
-LDFLAGS+=-lpanelw -lncursesw -lutil -lm
-CFLAGS+=-funsigned-char -D`uname` -DVERSION=\"$(VERSION)\" -DCONFIG_FILE=\"$(CONFIG_FILE)\" -DUTF8_SUPPORT -D_FORTIFY_SOURCE=2
+LIBS+=`$(PKG_CONFIG) --libs ncursesw panelw` -lutil -lm
+CFLAGS+=-funsigned-char -D`uname` -DVERSION=\"$(VERSION)\" $(DEBUG) -DCONFIG_FILE=\"$(CONFIG_FILE)\" -DUTF8_SUPPORT
else
-LDFLAGS+=-lpanel -lncurses -lutil -lm
-CFLAGS+=-funsigned-char -D`uname` -DVERSION=\"$(VERSION)\" -DCONFIG_FILE=\"$(CONFIG_FILE)\" -D_FORTIFY_SOURCE=2
+LIBS+=`$(PKG_CONFIG) --libs ncurses panel` -lutil -lm
+CFLAGS+=-funsigned-char -D`uname` -DVERSION=\"$(VERSION)\" $(DEBUG) -DCONFIG_FILE=\"$(CONFIG_FILE)\"
endif
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
@@ -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.
all: multitail
multitail: $(OBJS)
- $(CC) $(OBJS) $(LDFLAGS) -o multitail
+ $(CC) $(CFLAGS) $(LDFLAGS) -Wall -W $(OBJS) -o $@ $(LIBS)
multitail_ccmalloc: $(OBJS)
- ccmalloc --no-wrapper $(CC) -Wall -W $(OBJS) $(LDFLAGS) -o ccmultitail
+ ccmalloc --no-wrapper $(CC) $(CFLAGS) $(LDFLAGS) -Wall -W $(OBJS) -o $@ $(LIBS)
install: multitail
mkdir -p $(DESTDIR)$(PREFIX)/bin
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2015-02-10 8:19 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-02-10 8:19 [gentoo-commits] gentoo-x86 commit in app-text/multitail/files: multitail-6.3-as-needed.patch multitail-5.2.13-as-needed.patch multitail-5.2.12-as-needed.patch 5.2.2-as-needed.patch 5.2.6-buffer-overflow.patch Justin Lecher (jlec)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox