* [gentoo-commits] gentoo-x86 commit in net-misc/olsrd/files: olsrd-0.6.3-make-gtk.patch olsrd-0.6.1-build_fix.patch olsrd-0.5.6.7-build_fix.patch
@ 2012-06-28 1:53 Jeroen Roovers (jer)
0 siblings, 0 replies; only message in thread
From: Jeroen Roovers (jer) @ 2012-06-28 1:53 UTC (permalink / raw
To: gentoo-commits
jer 12/06/28 01:53:09
Modified: olsrd-0.6.1-build_fix.patch
Added: olsrd-0.6.3-make-gtk.patch
Removed: olsrd-0.5.6.7-build_fix.patch
Log:
Version bump.
(Portage version: 2.2.0_alpha113/cvs/Linux x86_64)
Revision Changes Path
1.2 net-misc/olsrd/files/olsrd-0.6.1-build_fix.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/olsrd/files/olsrd-0.6.1-build_fix.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/olsrd/files/olsrd-0.6.1-build_fix.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/olsrd/files/olsrd-0.6.1-build_fix.patch?r1=1.1&r2=1.2
Index: olsrd-0.6.1-build_fix.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-misc/olsrd/files/olsrd-0.6.1-build_fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- olsrd-0.6.1-build_fix.patch 6 Jan 2011 22:43:26 -0000 1.1
+++ olsrd-0.6.1-build_fix.patch 28 Jun 2012 01:53:08 -0000 1.2
@@ -1,6 +1,5 @@
-diff -ru olsrd-0.6.1~/Makefile olsrd-0.6.1/Makefile
---- olsrd-0.6.1~/Makefile 2011-01-06 23:29:17.000000000 +0100
-+++ olsrd-0.6.1/Makefile 2011-01-06 23:32:36.000000000 +0100
+--- a/Makefile
++++ b/Makefile
@@ -71,8 +71,6 @@
switch:
$(MAKECMD) -C $(SWITCHDIR)
1.1 net-misc/olsrd/files/olsrd-0.6.3-make-gtk.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/olsrd/files/olsrd-0.6.3-make-gtk.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/olsrd/files/olsrd-0.6.3-make-gtk.patch?rev=1.1&content-type=text/plain
Index: olsrd-0.6.3-make-gtk.patch
===================================================================
--- a/gui/linux-gtk/Makefile
+++ b/gui/linux-gtk/Makefile
@@ -1,8 +1,8 @@
CC ?= gcc
-CFLAGS += -Wall `pkg-config --cflags gtk+-2.0`
+CFLAGS += -Wall $(shell pkg-config --cflags gdk-pixbuf-2.0 glib-2.0 gtk+-2.0)
LDFLAGS +=
-LIBS := `pkg-config --libs gtk+-2.0` -lm
+LIBS := $(shell pkg-config --libs gdk-pixbuf-2.0 glib-2.0 gtk+-2.0) -lm
OBJS= src/main.o src/interface.o src/callbacks.o src/ipc.o \
src/packet.o src/nodes.o src/routes.o
@@ -10,7 +10,7 @@
all: olsrd-gui
olsrd-gui: $(OBJS)
- $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
clean:
rm -f $(OBJS) olsrd-gui
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2012-06-28 1:53 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-06-28 1:53 [gentoo-commits] gentoo-x86 commit in net-misc/olsrd/files: olsrd-0.6.3-make-gtk.patch olsrd-0.6.1-build_fix.patch olsrd-0.5.6.7-build_fix.patch Jeroen Roovers (jer)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox