summaryrefslogtreecommitdiff
path: root/third-party
diff options
context:
space:
mode:
authorBen Pfaff <blp@nicira.com>2013-12-18 13:47:16 -0800
committerBen Pfaff <blp@nicira.com>2013-12-18 13:47:16 -0800
commitbb1329ec397a27765228558314127d72623d4e40 (patch)
tree69d127ca295cd2098bdfca45520f271c0453d4ae /third-party
parent9a65230446515c66b942d45f7f25533e4445bb64 (diff)
downloadopenvswitch-bb1329ec397a27765228558314127d72623d4e40.tar.gz
ofp-tcpdump: Fix tcpdump patch breakage due to libtool.
The recently introduced use of libtool, in commit 38b7a52b618b98 (openvswitch: Use libtool and allow building shared libs) broke the tcpdump patch. This fixes the problem. Signed-off-by: Ben Pfaff <blp@nicira.com> Acked-by: Justin Pettit <jpettit@nicira.com>
Diffstat (limited to 'third-party')
-rw-r--r--third-party/ofp-tcpdump.patch9
1 files changed, 9 insertions, 0 deletions
diff --git a/third-party/ofp-tcpdump.patch b/third-party/ofp-tcpdump.patch
index b1ac9a571..bba4e90b6 100644
--- a/third-party/ofp-tcpdump.patch
+++ b/third-party/ofp-tcpdump.patch
@@ -52,6 +52,15 @@
LIBNETDISSECT_SRC=print-isakmp.c
LIBNETDISSECT_OBJ=$(LIBNETDISSECT_SRC:.c=.o)
+@@ -363,7 +364,7 @@ all: $(PROG)
+
+ $(PROG): $(OBJ)
+ @rm -f $@
+- $(CC) $(FULL_CFLAGS) $(LDFLAGS) -o $@ $(OBJ) $(LIBS)
++ libtool --mode=link $(CC) $(FULL_CFLAGS) $(LDFLAGS) -o $@ $(OBJ) $(LIBS)
+
+ $(LIBNETDISSECT): $(LIBNETDISSECT_OBJ)
+ @rm -f $@
--- tcpdump/print-openflow.c 1969-12-31 16:00:00.000000000 -0800
+++ tcpdump/print-openflow.c 2009-05-11 15:38:41.000000000 -0700
@@ -0,0 +1,45 @@