diff options
Diffstat (limited to 'meta/recipes-connectivity/libpcap/libpcap')
| -rw-r--r-- | meta/recipes-connectivity/libpcap/libpcap/ieee80215-arphrd.patch | 24 | ||||
| -rw-r--r-- | meta/recipes-connectivity/libpcap/libpcap/libpcap-pkgconfig-support.patch | 71 |
2 files changed, 71 insertions, 24 deletions
diff --git a/meta/recipes-connectivity/libpcap/libpcap/ieee80215-arphrd.patch b/meta/recipes-connectivity/libpcap/libpcap/ieee80215-arphrd.patch deleted file mode 100644 index 2f5cd213bc..0000000000 --- a/meta/recipes-connectivity/libpcap/libpcap/ieee80215-arphrd.patch +++ /dev/null @@ -1,24 +0,0 @@ -Upstream-Status: Pending - -Index: libpcap-1.0.0/pcap-linux.c -=================================================================== ---- libpcap-1.0.0.orig/pcap-linux.c 2009-01-28 11:58:54.000000000 +0300 -+++ libpcap-1.0.0/pcap-linux.c 2009-01-28 11:59:04.000000000 +0300 -@@ -1616,6 +1616,17 @@ - * so let's use "Linux-cooked" mode. Jean II */ - //handle->md.cooked = 1; - break; -+#ifndef ARPHRD_IEEE80215 -+#define ARPHRD_IEEE80215 805 -+#endif -+#ifndef ARPHRD_IEEE80215_PHY -+#define ARPHRD_IEEE80215_PHY 806 -+#endif -+ -+ case ARPHRD_IEEE80215: -+ case ARPHRD_IEEE80215_PHY: -+ handle->linktype = DLT_IEEE802_15_4; -+ break; - - /* ARPHRD_LAPD is unofficial and randomly allocated, if reallocation - * is needed, please report it to <daniele@orlandi.com> */ diff --git a/meta/recipes-connectivity/libpcap/libpcap/libpcap-pkgconfig-support.patch b/meta/recipes-connectivity/libpcap/libpcap/libpcap-pkgconfig-support.patch new file mode 100644 index 0000000000..9cfb9df880 --- /dev/null +++ b/meta/recipes-connectivity/libpcap/libpcap/libpcap-pkgconfig-support.patch @@ -0,0 +1,71 @@ +From 8887132e85892a72a84ca3878e60f254ad2ce939 Mon Sep 17 00:00:00 2001 +From: Joe MacDonald <joe_macdonald@mentor.com> +Date: Tue, 24 Feb 2015 15:56:06 -0500 +Subject: [PATCH] libpcap: pkgconfig support + +Adding basic structure to support pkg-config. + +Upstream-status: Inappropriate [embedded specific] + +Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com> +--- + Makefile.in | 5 +++++ + configure.in | 1 + + libpcap.pc.in | 10 ++++++++++ + 3 files changed, 16 insertions(+) + create mode 100644 libpcap.pc.in + +diff --git a/Makefile.in b/Makefile.in +index 1c2d745..1f25faf 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -60,6 +60,10 @@ V_RPATH_OPT = @V_RPATH_OPT@ + DEPENDENCY_CFLAG = @DEPENDENCY_CFLAG@ + PROG=libpcap + ++# pkgconfig support ++pkgconfigdir = $(libdir)/pkgconfig ++pkgconfig_DATA = libpcap.pc ++ + # Standard CFLAGS + FULL_CFLAGS = $(CCOPT) $(INCLS) $(DEFS) $(CFLAGS) + +@@ -275,6 +279,7 @@ EXTRA_DIST = \ + lbl/os-solaris2.h \ + lbl/os-sunos4.h \ + lbl/os-ultrix4.h \ ++ libpcap.pc \ + missing/snprintf.c \ + mkdep \ + msdos/bin2c.c \ +diff --git a/configure.in b/configure.in +index 8f5c86b..fb51b35 100644 +--- a/configure.in ++++ b/configure.in +@@ -1700,6 +1700,7 @@ esac + AC_PROG_INSTALL + + AC_CONFIG_HEADER(config.h) ++AC_CONFIG_FILES([libpcap.pc]) + + AC_OUTPUT_COMMANDS([if test -f .devel; then + echo timestamp > stamp-h +diff --git a/libpcap.pc.in b/libpcap.pc.in +new file mode 100644 +index 0000000..4f78ad8 +--- /dev/null ++++ b/libpcap.pc.in +@@ -0,0 +1,10 @@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++ ++Name: libpcap ++Description: System-independent interface for user-level packet capture. ++Version: @VERSION@ ++Libs: -L${libdir} -lpcap ++Cflags: -I${includedir} +-- +1.9.1 + |