[ovs-dev] [PATCH] ofp-tcpdump: Fix tcpdump patch breakage due to libtool.

Ben Pfaff blp at nicira.com
Wed Dec 18 21:43:23 UTC 2013


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 at nicira.com>
---
 third-party/ofp-tcpdump.patch |    9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/third-party/ofp-tcpdump.patch b/third-party/ofp-tcpdump.patch
index b1ac9a5..bba4e90 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 @@
-- 
1.7.10.4




More information about the dev mailing list