summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/libpcap
diff options
context:
space:
mode:
authorFabio Berton <fabio.berton@ossystems.com.br>2016-11-08 11:52:48 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-11-15 15:19:54 (GMT)
commitdd24fbfb477fe3876f2205cfcf9d55f7327dead5 (patch)
tree60171923ef35244ed72b6361332c0a4f0e3ec822 /meta/recipes-connectivity/libpcap
parentac0d917b67ff3a180986fa234c44c14a0cb38c63 (diff)
downloadpoky-dd24fbfb477fe3876f2205cfcf9d55f7327dead5.tar.gz
libpcap: Update to version 1.8.1
- Option --enable-canusb was removed on commit: https://github.com/the-tcpdump-group/libpcap/commit/93ca5ff7030aaf1219e1de05ec89a68384bfc50b - Autotools class was improved and we can now stop aclocal from running at all. - File configure.in was renamed to configure.ac, rework libpcap-pkgconfig-support patch and do_configure_prepend task to use configure.ac file. (From OE-Core rev: 62771b5a426e4b7d38e4997dc3f252a547f481ce) Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/libpcap')
-rw-r--r--meta/recipes-connectivity/libpcap/libpcap.inc5
-rw-r--r--meta/recipes-connectivity/libpcap/libpcap/aclocal.patch167
-rw-r--r--meta/recipes-connectivity/libpcap/libpcap/libpcap-pkgconfig-support.patch32
-rw-r--r--meta/recipes-connectivity/libpcap/libpcap_1.8.1.bb (renamed from meta/recipes-connectivity/libpcap/libpcap_1.7.4.bb)13
4 files changed, 25 insertions, 192 deletions
diff --git a/meta/recipes-connectivity/libpcap/libpcap.inc b/meta/recipes-connectivity/libpcap/libpcap.inc
index 7b29a52..4453a9e 100644
--- a/meta/recipes-connectivity/libpcap/libpcap.inc
+++ b/meta/recipes-connectivity/libpcap/libpcap.inc
@@ -19,6 +19,7 @@ BINCONFIG = "${bindir}/pcap-config"
19inherit autotools binconfig-disabled pkgconfig bluetooth 19inherit autotools binconfig-disabled pkgconfig bluetooth
20 20
21EXTRA_OECONF = "--with-pcap=linux" 21EXTRA_OECONF = "--with-pcap=linux"
22EXTRA_AUTORECONF += "--exclude=aclocal"
22 23
23PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} \ 24PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} \
24 ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \ 25 ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \
@@ -26,7 +27,6 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ
26PACKAGECONFIG[bluez4] = "--enable-bluetooth,--disable-bluetooth,bluez4" 27PACKAGECONFIG[bluez4] = "--enable-bluetooth,--disable-bluetooth,bluez4"
27# Add a dummy PACKAGECONFIG for bluez5 since it is not supported by libpcap. 28# Add a dummy PACKAGECONFIG for bluez5 since it is not supported by libpcap.
28PACKAGECONFIG[bluez5] = ",," 29PACKAGECONFIG[bluez5] = ",,"
29PACKAGECONFIG[canusb] = "--enable-canusb,--enable-canusb=no,libusb"
30PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus" 30PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus"
31PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," 31PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
32PACKAGECONFIG[libnl] = "--with-libnl,--without-libnl,libnl" 32PACKAGECONFIG[libnl] = "--with-libnl,--without-libnl,libnl"
@@ -36,8 +36,5 @@ CFLAGS_prepend = "-I${S} "
36CXXFLAGS_prepend = "-I${S} " 36CXXFLAGS_prepend = "-I${S} "
37 37
38do_configure_prepend () { 38do_configure_prepend () {
39 if [ ! -e ${S}/acinclude.m4 ]; then
40 cat ${S}/aclocal.m4 > ${S}/acinclude.m4
41 fi
42 sed -i -e's,^V_RPATH_OPT=.*$,V_RPATH_OPT=,' ${S}/pcap-config.in 39 sed -i -e's,^V_RPATH_OPT=.*$,V_RPATH_OPT=,' ${S}/pcap-config.in
43} 40}
diff --git a/meta/recipes-connectivity/libpcap/libpcap/aclocal.patch b/meta/recipes-connectivity/libpcap/libpcap/aclocal.patch
deleted file mode 100644
index 2151982..0000000
--- a/meta/recipes-connectivity/libpcap/libpcap/aclocal.patch
+++ /dev/null
@@ -1,167 +0,0 @@
1Upstream-Status: Inappropriate [configuration]
2
3diff -ruN libpcap-1.1.1-orig/aclocal.m4 libpcap-1.1.1/aclocal.m4
4--- libpcap-1.1.1-orig/aclocal.m4 2010-06-29 10:46:32.815117569 +0800
5+++ libpcap-1.1.1/aclocal.m4 2010-06-29 10:49:17.150149949 +0800
6@@ -37,7 +37,7 @@
7 dnl AC_LBL_C_INIT. Now, we run AC_LBL_C_INIT_BEFORE_CC, AC_PROG_CC,
8 dnl and AC_LBL_C_INIT at the top level.
9 dnl
10-AC_DEFUN(AC_LBL_C_INIT_BEFORE_CC,
11+AC_DEFUN([AC_LBL_C_INIT_BEFORE_CC],
12 [
13 AC_BEFORE([$0], [AC_LBL_C_INIT])
14 AC_BEFORE([$0], [AC_PROG_CC])
15@@ -90,7 +90,7 @@
16 dnl LDFLAGS
17 dnl LBL_CFLAGS
18 dnl
19-AC_DEFUN(AC_LBL_C_INIT,
20+AC_DEFUN([AC_LBL_C_INIT],
21 [
22 AC_BEFORE([$0], [AC_LBL_FIXINCLUDES])
23 AC_BEFORE([$0], [AC_LBL_DEVEL])
24@@ -217,7 +217,7 @@
25 dnl V_SONAME_OPT
26 dnl V_RPATH_OPT
27 dnl
28-AC_DEFUN(AC_LBL_SHLIBS_INIT,
29+AC_DEFUN([AC_LBL_SHLIBS_INIT],
30 [AC_PREREQ(2.50)
31 if test "$GCC" = yes ; then
32 #
33@@ -361,7 +361,7 @@
34 # Make sure we use the V_CCOPT flags, because some of those might
35 # disable inlining.
36 #
37-AC_DEFUN(AC_LBL_C_INLINE,
38+AC_DEFUN([AC_LBL_C_INLINE],
39 [AC_MSG_CHECKING(for inline)
40 save_CFLAGS="$CFLAGS"
41 CFLAGS="$V_CCOPT"
42@@ -407,7 +407,7 @@
43 dnl
44 dnl AC_LBL_FIXINCLUDES
45 dnl
46-AC_DEFUN(AC_LBL_FIXINCLUDES,
47+AC_DEFUN([AC_LBL_FIXINCLUDES],
48 [if test "$GCC" = yes ; then
49 AC_MSG_CHECKING(for ANSI ioctl definitions)
50 AC_CACHE_VAL(ac_cv_lbl_gcc_fixincludes,
51@@ -453,7 +453,7 @@
52 dnl $2 (yacc appended)
53 dnl $3 (optional flex and bison -P prefix)
54 dnl
55-AC_DEFUN(AC_LBL_LEX_AND_YACC,
56+AC_DEFUN([AC_LBL_LEX_AND_YACC],
57 [AC_ARG_WITH(flex, [ --without-flex don't use flex])
58 AC_ARG_WITH(bison, [ --without-bison don't use bison])
59 if test "$with_flex" = no ; then
60@@ -506,7 +506,7 @@
61 dnl
62 dnl DECLWAITSTATUS (defined)
63 dnl
64-AC_DEFUN(AC_LBL_UNION_WAIT,
65+AC_DEFUN([AC_LBL_UNION_WAIT],
66 [AC_MSG_CHECKING(if union wait is used)
67 AC_CACHE_VAL(ac_cv_lbl_union_wait,
68 AC_TRY_COMPILE([
69@@ -535,7 +535,7 @@
70 dnl
71 dnl HAVE_SOCKADDR_SA_LEN (defined)
72 dnl
73-AC_DEFUN(AC_LBL_SOCKADDR_SA_LEN,
74+AC_DEFUN([AC_LBL_SOCKADDR_SA_LEN],
75 [AC_MSG_CHECKING(if sockaddr struct has the sa_len member)
76 AC_CACHE_VAL(ac_cv_lbl_sockaddr_has_sa_len,
77 AC_TRY_COMPILE([
78@@ -560,7 +560,7 @@
79 dnl
80 dnl HAVE_SOCKADDR_STORAGE (defined)
81 dnl
82-AC_DEFUN(AC_LBL_SOCKADDR_STORAGE,
83+AC_DEFUN([AC_LBL_SOCKADDR_STORAGE],
84 [AC_MSG_CHECKING(if sockaddr_storage struct exists)
85 AC_CACHE_VAL(ac_cv_lbl_has_sockaddr_storage,
86 AC_TRY_COMPILE([
87@@ -593,7 +593,7 @@
88 dnl won't be using code that would use that member, or we wouldn't
89 dnl compile in any case).
90 dnl
91-AC_DEFUN(AC_LBL_HP_PPA_INFO_T_DL_MODULE_ID_1,
92+AC_DEFUN([AC_LBL_HP_PPA_INFO_T_DL_MODULE_ID_1],
93 [AC_MSG_CHECKING(if dl_hp_ppa_info_t struct has dl_module_id_1 member)
94 AC_CACHE_VAL(ac_cv_lbl_dl_hp_ppa_info_t_has_dl_module_id_1,
95 AC_TRY_COMPILE([
96@@ -619,7 +619,7 @@
97 dnl
98 dnl ac_cv_lbl_have_run_path (yes or no)
99 dnl
100-AC_DEFUN(AC_LBL_HAVE_RUN_PATH,
101+AC_DEFUN([AC_LBL_HAVE_RUN_PATH],
102 [AC_MSG_CHECKING(for ${CC-cc} -R)
103 AC_CACHE_VAL(ac_cv_lbl_have_run_path,
104 [echo 'main(){}' > conftest.c
105@@ -644,7 +644,7 @@
106 dnl
107 dnl LBL_ALIGN (DEFINED)
108 dnl
109-AC_DEFUN(AC_LBL_UNALIGNED_ACCESS,
110+AC_DEFUN([AC_LBL_UNALIGNED_ACCESS],
111 [AC_MSG_CHECKING(if unaligned accesses fail)
112 AC_CACHE_VAL(ac_cv_lbl_unaligned_fail,
113 [case "$host_cpu" in
114@@ -749,7 +749,7 @@
115 dnl HAVE_OS_PROTO_H (defined)
116 dnl os-proto.h (symlinked)
117 dnl
118-AC_DEFUN(AC_LBL_DEVEL,
119+AC_DEFUN([AC_LBL_DEVEL],
120 [rm -f os-proto.h
121 if test "${LBL_CFLAGS+set}" = set; then
122 $1="$$1 ${LBL_CFLAGS}"
123@@ -886,7 +886,7 @@
124 dnl statically and happen to have a libresolv.a lying around (and no
125 dnl libnsl.a).
126 dnl
127-AC_DEFUN(AC_LBL_LIBRARY_NET, [
128+AC_DEFUN([AC_LBL_LIBRARY_NET], [
129 # Most operating systems have gethostbyname() in the default searched
130 # libraries (i.e. libc):
131 # Some OSes (eg. Solaris) place it in libnsl
132@@ -909,7 +909,7 @@
133 dnl Test for __attribute__
134 dnl
135
136-AC_DEFUN(AC_C___ATTRIBUTE__, [
137+AC_DEFUN([AC_C___ATTRIBUTE__], [
138 AC_MSG_CHECKING(for __attribute__)
139 AC_CACHE_VAL(ac_cv___attribute__, [
140 AC_COMPILE_IFELSE(
141@@ -947,7 +947,7 @@
142 dnl
143 dnl -Scott Barron
144 dnl
145-AC_DEFUN(AC_LBL_TPACKET_STATS,
146+AC_DEFUN([AC_LBL_TPACKET_STATS],
147 [AC_MSG_CHECKING(if if_packet.h has tpacket_stats defined)
148 AC_CACHE_VAL(ac_cv_lbl_tpacket_stats,
149 AC_TRY_COMPILE([
150@@ -976,7 +976,7 @@
151 dnl doesn't have that member (which is OK, as either we won't be using
152 dnl code that would use that member, or we wouldn't compile in any case).
153 dnl
154-AC_DEFUN(AC_LBL_LINUX_TPACKET_AUXDATA_TP_VLAN_TCI,
155+AC_DEFUN([AC_LBL_LINUX_TPACKET_AUXDATA_TP_VLAN_TCI],
156 [AC_MSG_CHECKING(if tpacket_auxdata struct has tp_vlan_tci member)
157 AC_CACHE_VAL(ac_cv_lbl_dl_hp_ppa_info_t_has_dl_module_id_1,
158 AC_TRY_COMPILE([
159@@ -1003,7 +1003,7 @@
160 dnl
161 dnl HAVE_DLPI_PASSIVE (defined)
162 dnl
163-AC_DEFUN(AC_LBL_DL_PASSIVE_REQ_T,
164+AC_DEFUN([AC_LBL_DL_PASSIVE_REQ_T],
165 [AC_MSG_CHECKING(if dl_passive_req_t struct exists)
166 AC_CACHE_VAL(ac_cv_lbl_has_dl_passive_req_t,
167 AC_TRY_COMPILE([
diff --git a/meta/recipes-connectivity/libpcap/libpcap/libpcap-pkgconfig-support.patch b/meta/recipes-connectivity/libpcap/libpcap/libpcap-pkgconfig-support.patch
index b861513..afaa3be 100644
--- a/meta/recipes-connectivity/libpcap/libpcap/libpcap-pkgconfig-support.patch
+++ b/meta/recipes-connectivity/libpcap/libpcap/libpcap-pkgconfig-support.patch
@@ -1,25 +1,27 @@
1From 8887132e85892a72a84ca3878e60f254ad2ce939 Mon Sep 17 00:00:00 2001 1From 2796129af52901dd68595e5e88a639308541def9 Mon Sep 17 00:00:00 2001
2From: Joe MacDonald <joe_macdonald@mentor.com> 2From: Fabio Berton <fabio.berton@ossystems.com.br>
3Date: Tue, 24 Feb 2015 15:56:06 -0500 3Date: Thu, 3 Nov 2016 17:56:29 -0200
4Subject: [PATCH] libpcap: pkgconfig support 4Subject: [PATCH] libpcap: pkgconfig support
5Organization: O.S. Systems Software LTDA.
5 6
6Adding basic structure to support pkg-config. 7Adding basic structure to support pkg-config.
7 8
8Upstream-Status: Inappropriate [embedded specific] 9Upstream-Status: Inappropriate [embedded specific]
9 10
10Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com> 11Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
12Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
11--- 13---
12 Makefile.in | 5 +++++ 14 Makefile.in | 5 +++++
13 configure.in | 1 + 15 configure.ac | 1 +
14 libpcap.pc.in | 10 ++++++++++ 16 libpcap.pc.in | 10 ++++++++++
15 3 files changed, 16 insertions(+) 17 3 files changed, 16 insertions(+)
16 create mode 100644 libpcap.pc.in 18 create mode 100644 libpcap.pc.in
17 19
18diff --git a/Makefile.in b/Makefile.in 20diff --git a/Makefile.in b/Makefile.in
19index 1c2d745..1f25faf 100644 21index e71d973..d7004ed 100644
20--- a/Makefile.in 22--- a/Makefile.in
21+++ b/Makefile.in 23+++ b/Makefile.in
22@@ -60,6 +60,10 @@ V_RPATH_OPT = @V_RPATH_OPT@ 24@@ -61,6 +61,10 @@ V_RPATH_OPT = @V_RPATH_OPT@
23 DEPENDENCY_CFLAG = @DEPENDENCY_CFLAG@ 25 DEPENDENCY_CFLAG = @DEPENDENCY_CFLAG@
24 PROG=libpcap 26 PROG=libpcap
25 27
@@ -30,19 +32,19 @@ index 1c2d745..1f25faf 100644
30 # Standard CFLAGS 32 # Standard CFLAGS
31 FULL_CFLAGS = $(CCOPT) $(INCLS) $(DEFS) $(CFLAGS) 33 FULL_CFLAGS = $(CCOPT) $(INCLS) $(DEFS) $(CFLAGS)
32 34
33@@ -275,6 +279,7 @@ EXTRA_DIST = \ 35@@ -286,6 +290,7 @@ EXTRA_DIST = \
34 lbl/os-solaris2.h \ 36 lbl/os-solaris2.h \
35 lbl/os-sunos4.h \ 37 lbl/os-sunos4.h \
36 lbl/os-ultrix4.h \ 38 lbl/os-ultrix4.h \
37+ libpcap.pc \ 39+ libpcap.pc \
40 missing/getopt.c \
41 missing/getopt.h \
38 missing/snprintf.c \ 42 missing/snprintf.c \
39 mkdep \ 43diff --git a/configure.ac b/configure.ac
40 msdos/bin2c.c \ 44index da2f940..4fc67bf 100644
41diff --git a/configure.in b/configure.in 45--- a/configure.ac
42index 8f5c86b..fb51b35 100644 46+++ b/configure.ac
43--- a/configure.in 47@@ -1805,6 +1805,7 @@ fi
44+++ b/configure.in
45@@ -1700,6 +1700,7 @@ esac
46 AC_PROG_INSTALL 48 AC_PROG_INSTALL
47 49
48 AC_CONFIG_HEADER(config.h) 50 AC_CONFIG_HEADER(config.h)
@@ -67,5 +69,5 @@ index 0000000..4f78ad8
67+Libs: -L${libdir} -lpcap 69+Libs: -L${libdir} -lpcap
68+Cflags: -I${includedir} 70+Cflags: -I${includedir}
69-- 71--
701.9.1 722.1.4
71 73
diff --git a/meta/recipes-connectivity/libpcap/libpcap_1.7.4.bb b/meta/recipes-connectivity/libpcap/libpcap_1.8.1.bb
index 8d12b25..9072fe0 100644
--- a/meta/recipes-connectivity/libpcap/libpcap_1.7.4.bb
+++ b/meta/recipes-connectivity/libpcap/libpcap_1.8.1.bb
@@ -1,10 +1,11 @@
1require libpcap.inc 1require libpcap.inc
2 2
3SRC_URI += "file://aclocal.patch \ 3SRC_URI += " \
4 file://libpcap-pkgconfig-support.patch \ 4 file://libpcap-pkgconfig-support.patch \
5 " 5"
6SRC_URI[md5sum] = "b2e13142bbaba857ab1c6894aedaf547" 6
7SRC_URI[sha256sum] = "7ad3112187e88328b85e46dce7a9b949632af18ee74d97ffc3f2b41fe7f448b0" 7SRC_URI[md5sum] = "3d48f9cd171ff12b0efd9134b52f1447"
8SRC_URI[sha256sum] = "673dbc69fdc3f5a86fb5759ab19899039a8e5e6c631749e48dcd9c6f0c83541e"
8 9
9# 10#
10# make install doesn't cover the shared lib 11# make install doesn't cover the shared lib
@@ -13,7 +14,7 @@ SRC_URI[sha256sum] = "7ad3112187e88328b85e46dce7a9b949632af18ee74d97ffc3f2b41fe7
13 14
14do_configure_prepend () { 15do_configure_prepend () {
15 #remove hardcoded references to /usr/include 16 #remove hardcoded references to /usr/include
16 sed 's|\([ "^'\''I]\+\)/usr/include/|\1${STAGING_INCDIR}/|g' -i ${S}/configure.in 17 sed 's|\([ "^'\''I]\+\)/usr/include/|\1${STAGING_INCDIR}/|g' -i ${S}/configure.ac
17} 18}
18 19
19do_install_prepend () { 20do_install_prepend () {