summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Cross <sean@chumby.com>2010-09-10 15:46:30 +0000
committerKhem Raj <raj.khem@gmail.com>2010-09-17 14:22:30 -0700
commit7be37151f94a344002209b17fc8eb104a5e3a244 (patch)
treee7a2b324d2490ebc2d06d0d38e6f686a8e406a99
parent516803115c6842780b2c48d2bea56c52280bbf99 (diff)
driftnet: fix recipe to work with a modern build system
The driftnet recipe seems to be patching the Makefile to explicitly specify a compiler called arm-linux-gcc, and to remove the dependency on pkg-config. I believe both of these are obsolete practices now. Signed-off-by: Sean Cross <sean@chumby.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--recipes/driftnet/driftnet-0.1.6/arm.patch13
1 files changed, 1 insertions, 12 deletions
diff --git a/recipes/driftnet/driftnet-0.1.6/arm.patch b/recipes/driftnet/driftnet-0.1.6/arm.patch
index 340a6cf186..c5b715553c 100644
--- a/recipes/driftnet/driftnet-0.1.6/arm.patch
+++ b/recipes/driftnet/driftnet-0.1.6/arm.patch
@@ -5,7 +5,7 @@
# Compiler to use.
-#CC = gcc
-+CC = arm-linux-gcc
++CC ?= arm-linux-gcc
# Basic compiler, linker flags; should not need any changes.
CFLAGS += -g -Wall
@@ -17,17 +17,6 @@
#LDFLAGS += -L/path/to/libpcap.so
# Required on Linux to get BSDish definitions of the TCP/IP structs.
-@@ -31,8 +31,8 @@
-
- # Optional C compiler and linker flags. Typical driftnet builds have support
- # for displaying captured images in an X window, and need the following flags:
--CFLAGS += `gtk-config --cflags`
--LDLIBS += -ljpeg -lungif `gtk-config --libs`
-+CFLAGS += -I$(STAGING_INCDIR)/glib-2.0 -I$(STAGING_INCDIR)/gtk-2.0 -I$(STAGING_INCDIR)/../lib/gtk-2.0/include -I$(STAGING_INCDIR)/atk-1.0
-+LDLIBS += -ljpeg -lungif -lgtk-x11-2.0 -lgdk-x11-2.0 -rdynamic -lgmodule-2.0 -lglib-2.0 -ldl -lXext -lX11 -lm
-
- # Alternatively, you can build a version of driftnet which can only be used
- # in `adjunct' mode as the back end for some other image-processing program. To
@@ -81,13 +81,13 @@
( echo '.\" DO NOT EDIT THIS FILE-- edit driftnet.1.in instead' ; sed s/@@@VERSION@@@/$(VERSION)/ ) < driftnet.1.in > driftnet.1