From 59d79da6a1a851259ab0f9e5fc2a5895c8527464 Mon Sep 17 00:00:00 2001 From: Jasper Lievisse Adriaanse Date: Fri, 8 Apr 2016 08:42:50 +0200 Subject: [PATCH] sync patch after gopacket/pcap sync --- .../docker/xgo-image/beats-builder/gopacket_pcap.patch | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dev-tools/packer/docker/xgo-image/beats-builder/gopacket_pcap.patch b/dev-tools/packer/docker/xgo-image/beats-builder/gopacket_pcap.patch index 29b5e010aab..b3c3407a14a 100644 --- a/dev-tools/packer/docker/xgo-image/beats-builder/gopacket_pcap.patch +++ b/dev-tools/packer/docker/xgo-image/beats-builder/gopacket_pcap.patch @@ -1,15 +1,16 @@ diff --git a/vendor/github.com/tsg/gopacket/pcap/pcap.go b/vendor/github.com/tsg/gopacket/pcap/pcap.go -index d2465bb..7b23b84 100644 +index f5612e6..4438e6f 100644 --- a/vendor/github.com/tsg/gopacket/pcap/pcap.go +++ b/vendor/github.com/tsg/gopacket/pcap/pcap.go -@@ -8,13 +8,14 @@ +@@ -8,14 +8,15 @@ package pcap - + /* -#cgo linux LDFLAGS: -lpcap +#cgo linux,386 LDFLAGS: /libpcap/i386/usr/lib/i386-linux-gnu/libpcap.a +#cgo linux,amd64 LDFLAGS: /libpcap/amd64/usr/lib/x86_64-linux-gnu/libpcap.a #cgo freebsd LDFLAGS: -lpcap + #cgo openbsd LDFLAGS: -lpcap #cgo darwin LDFLAGS: -lpcap #cgo solaris LDFLAGS: -lpcap -#cgo windows CFLAGS: -I C:/WpdPack/Include @@ -20,4 +21,4 @@ index d2465bb..7b23b84 100644 +#cgo windows,amd64 LDFLAGS: -L /libpcap/win/WpdPack/Lib/x64 -lwpcap #include #include - +