diff options
author | Roy Li <rongqing.li@windriver.com> | 2014-07-08 13:20:47 +0800 |
---|---|---|
committer | Joe MacDonald <joe_macdonald@mentor.com> | 2014-07-20 23:57:27 -0400 |
commit | be2a2437005087b3f8d43a09ddc69991ed81e110 (patch) | |
tree | d5ebb9df219228d8b8f8b446deab6a89c9f267a5 /meta-networking | |
parent | fb70d449341acebebd160dd4c2827c2b7cf46ea3 (diff) | |
download | meta-openembedded-be2a2437005087b3f8d43a09ddc69991ed81e110.tar.gz |
Uprev tcpdump to 4.5.1
1. update the patch tcpdump_configure_no_-O2.patch
2. do not check libdlpi dependence on cross-compile, or else it will
cause do_qa_configure to fail.
3. do not check libpcap dependence, since the libpcap has been added
into DEPENDS, or else it will cause do_qa_configure to fail
4. make the check of getaddrinfo work on cross-compile
Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Diffstat (limited to 'meta-networking')
9 files changed, 120 insertions, 44 deletions
diff --git a/meta-networking/recipes-support/tcpdump/tcpdump-4.3.0/tcpdump_configure_no_-O2.patch b/meta-networking/recipes-support/tcpdump/tcpdump-4.3.0/tcpdump_configure_no_-O2.patch deleted file mode 100644 index 7929da5b1..000000000 --- a/meta-networking/recipes-support/tcpdump/tcpdump-4.3.0/tcpdump_configure_no_-O2.patch +++ /dev/null | |||
@@ -1,42 +0,0 @@ | |||
1 | --- | ||
2 | configure | 8 ++++---- | ||
3 | 1 files changed, 4 insertions(+), 4 deletions(-) | ||
4 | |||
5 | diff --git a/configure b/configure | ||
6 | index cb51d19..73d51af 100755 | ||
7 | --- a/configure | ||
8 | +++ b/configure | ||
9 | @@ -2691,13 +2691,13 @@ if test "$ac_test_CFLAGS" = set; then | ||
10 | CFLAGS=$ac_save_CFLAGS | ||
11 | elif test $ac_cv_prog_cc_g = yes; then | ||
12 | if test "$GCC" = yes; then | ||
13 | - CFLAGS="-g -O2" | ||
14 | + CFLAGS="-g" | ||
15 | else | ||
16 | CFLAGS="-g" | ||
17 | fi | ||
18 | else | ||
19 | if test "$GCC" = yes; then | ||
20 | - CFLAGS="-O2" | ||
21 | + CFLAGS="" | ||
22 | else | ||
23 | CFLAGS= | ||
24 | fi | ||
25 | @@ -2830,7 +2830,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu | ||
26 | if test "$GCC" = yes ; then | ||
27 | if test "$SHLICC2" = yes ; then | ||
28 | ac_cv_lbl_gcc_vers=2 | ||
29 | - V_CCOPT="-O2" | ||
30 | + V_CCOPT="" | ||
31 | else | ||
32 | { echo "$as_me:$LINENO: checking gcc version" >&5 | ||
33 | echo $ECHO_N "checking gcc version... $ECHO_C" >&6; } | ||
34 | @@ -2847,7 +2847,7 @@ fi | ||
35 | { echo "$as_me:$LINENO: result: $ac_cv_lbl_gcc_vers" >&5 | ||
36 | echo "${ECHO_T}$ac_cv_lbl_gcc_vers" >&6; } | ||
37 | if test $ac_cv_lbl_gcc_vers -gt 1 ; then | ||
38 | - V_CCOPT="-O2" | ||
39 | + V_CCOPT="" | ||
40 | fi | ||
41 | fi | ||
42 | else | ||
diff --git a/meta-networking/recipes-support/tcpdump/tcpdump-4.3.0/0001-minimal-IEEE802.15.4-allowed.patch b/meta-networking/recipes-support/tcpdump/tcpdump-4.5.1/0001-minimal-IEEE802.15.4-allowed.patch index 9d3d60d4d..9d3d60d4d 100644 --- a/meta-networking/recipes-support/tcpdump/tcpdump-4.3.0/0001-minimal-IEEE802.15.4-allowed.patch +++ b/meta-networking/recipes-support/tcpdump/tcpdump-4.5.1/0001-minimal-IEEE802.15.4-allowed.patch | |||
diff --git a/meta-networking/recipes-support/tcpdump/tcpdump-4.3.0/configure.patch b/meta-networking/recipes-support/tcpdump/tcpdump-4.5.1/configure.patch index 3697420fd..3697420fd 100644 --- a/meta-networking/recipes-support/tcpdump/tcpdump-4.3.0/configure.patch +++ b/meta-networking/recipes-support/tcpdump/tcpdump-4.5.1/configure.patch | |||
diff --git a/meta-networking/recipes-support/tcpdump/tcpdump-4.3.0/ipv6-cross.patch b/meta-networking/recipes-support/tcpdump/tcpdump-4.5.1/ipv6-cross.patch index 7eba2c5a6..7eba2c5a6 100644 --- a/meta-networking/recipes-support/tcpdump/tcpdump-4.3.0/ipv6-cross.patch +++ b/meta-networking/recipes-support/tcpdump/tcpdump-4.5.1/ipv6-cross.patch | |||
diff --git a/meta-networking/recipes-support/tcpdump/tcpdump-4.5.1/tcpdump-configure-dlpi.patch b/meta-networking/recipes-support/tcpdump/tcpdump-4.5.1/tcpdump-configure-dlpi.patch new file mode 100644 index 000000000..50e2d5439 --- /dev/null +++ b/meta-networking/recipes-support/tcpdump/tcpdump-4.5.1/tcpdump-configure-dlpi.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | [PATCH] tcpdump: cross-compiling not check dlpi. | ||
2 | |||
3 | For cross-compiling on Linux platforms, we do not need to check libdlpi | ||
4 | since it is only placed on Solaris. | ||
5 | Also, checking libdlpi in native /lib would cause do_qa_configure fail. | ||
6 | |||
7 | Upstream-Status: Pending. | ||
8 | |||
9 | Signed-off-by: Xin Ouyang <Xin.Ouyang@windriver.com> | ||
10 | --- | ||
11 | configure.in | 4 +++- | ||
12 | 1 files changed, 3 insertions(+), 1 deletions(-) | ||
13 | |||
14 | diff --git a/configure.in b/configure.in | ||
15 | index 7f9591c..ca277c0 100644 | ||
16 | --- a/configure.in | ||
17 | +++ b/configure.in | ||
18 | @@ -716,7 +716,9 @@ don't.]) | ||
19 | fi | ||
20 | |||
21 | # libdlpi is needed for Solaris 11 and later. | ||
22 | -AC_CHECK_LIB(dlpi, dlpi_walk, LIBS="$LIBS -ldlpi" LDFLAGS="-L/lib $LDFLAGS", ,-L/lib) | ||
23 | +if test "$cross_compiling" != yes; then | ||
24 | + AC_CHECK_LIB(dlpi, dlpi_walk, LIBS="$LIBS -ldlpi" LDFLAGS="-L/lib $LDFLAGS", ,-L/lib) | ||
25 | +fi | ||
26 | |||
27 | dnl portability macros for getaddrinfo/getnameinfo | ||
28 | dnl | ||
29 | -- | ||
30 | 1.7.5.4 | ||
31 | |||
diff --git a/meta-networking/recipes-support/tcpdump/tcpdump-4.5.1/tcpdump-cross-getaddrinfo.patch b/meta-networking/recipes-support/tcpdump/tcpdump-4.5.1/tcpdump-cross-getaddrinfo.patch new file mode 100644 index 000000000..b414b72e9 --- /dev/null +++ b/meta-networking/recipes-support/tcpdump/tcpdump-4.5.1/tcpdump-cross-getaddrinfo.patch | |||
@@ -0,0 +1,23 @@ | |||
1 | Fix getaddinfo check when cross compiling | ||
2 | |||
3 | Upstream-Status: Pending. | ||
4 | |||
5 | AC_TRY_RUN defaults to td_cv_buggygetaddrinfo=yes when | ||
6 | cross-compiling. So this change indicates that we | ||
7 | are cross-compiling. | ||
8 | |||
9 | Signed-of-by: Aws Ismail <aws.ismail@windriver.com> | ||
10 | |||
11 | diff --git a/configure.in b/configure.in | ||
12 | index ca277c0..283035e 100644 | ||
13 | --- a/configure.in | ||
14 | +++ b/configure.in | ||
15 | @@ -434,7 +434,7 @@ main() | ||
16 | ], | ||
17 | td_cv_buggygetaddrinfo=no, | ||
18 | td_cv_buggygetaddrinfo=yes, | ||
19 | - td_cv_buggygetaddrinfo=yes)]) | ||
20 | + td_cv_buggygetaddrinfo=cross)]) | ||
21 | if test "$td_cv_buggygetaddrinfo" = no; then | ||
22 | AC_MSG_RESULT(good) | ||
23 | else | ||
diff --git a/meta-networking/recipes-support/tcpdump/tcpdump-4.5.1/tcpdump_configure_no_-O2.patch b/meta-networking/recipes-support/tcpdump/tcpdump-4.5.1/tcpdump_configure_no_-O2.patch new file mode 100644 index 000000000..b2296bc52 --- /dev/null +++ b/meta-networking/recipes-support/tcpdump/tcpdump-4.5.1/tcpdump_configure_no_-O2.patch | |||
@@ -0,0 +1,27 @@ | |||
1 | --- | ||
2 | configure | 4 ++-- | ||
3 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
4 | |||
5 | diff --git a/configure b/configure | ||
6 | index 468a517..a890728 100755 | ||
7 | --- a/configure | ||
8 | +++ b/configure | ||
9 | @@ -3036,13 +3036,13 @@ if test "$ac_test_CFLAGS" = set; then | ||
10 | CFLAGS=$ac_save_CFLAGS | ||
11 | elif test $ac_cv_prog_cc_g = yes; then | ||
12 | if test "$GCC" = yes; then | ||
13 | - CFLAGS="-g -O2" | ||
14 | + CFLAGS="-g" | ||
15 | else | ||
16 | CFLAGS="-g" | ||
17 | fi | ||
18 | else | ||
19 | if test "$GCC" = yes; then | ||
20 | - CFLAGS="-O2" | ||
21 | + CFLAGS= | ||
22 | else | ||
23 | CFLAGS= | ||
24 | fi | ||
25 | -- | ||
26 | 1.7.9.5 | ||
27 | |||
diff --git a/meta-networking/recipes-support/tcpdump/tcpdump-4.5.1/unnecessary-to-check-libpcap.patch b/meta-networking/recipes-support/tcpdump/tcpdump-4.5.1/unnecessary-to-check-libpcap.patch new file mode 100644 index 000000000..d7a3ac23b --- /dev/null +++ b/meta-networking/recipes-support/tcpdump/tcpdump-4.5.1/unnecessary-to-check-libpcap.patch | |||
@@ -0,0 +1,33 @@ | |||
1 | unnecessary to check libpcap | ||
2 | |||
3 | Upstream-Status: Pending | ||
4 | |||
5 | since the check of libpcap did not consider the cross-compile, lead to the | ||
6 | below error: | ||
7 | This autoconf log indicates errors, it looked at host include and/or | ||
8 | library paths while determining system capabilities. | ||
9 | |||
10 | In fact, the libpcap has been added into the tcpdump's DEPENDS, not need to | ||
11 | check if libpcap existed. | ||
12 | |||
13 | Signed-off-by: Roy Li <rongqing.li@windriver.com> | ||
14 | --- | ||
15 | configure.in | 2 +- | ||
16 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
17 | |||
18 | diff --git a/configure.in b/configure.in | ||
19 | index 06fade1..9125de7 100644 | ||
20 | --- a/configure.in | ||
21 | +++ b/configure.in | ||
22 | @@ -567,7 +567,7 @@ AC_SEARCH_LIBS(getrpcbynumber, nsl, | ||
23 | dnl AC_CHECK_LIB(z, uncompress) | ||
24 | dnl AC_CHECK_HEADERS(zlib.h) | ||
25 | |||
26 | -AC_LBL_LIBPCAP(V_PCAPDEP, V_INCLS) | ||
27 | +#AC_LBL_LIBPCAP(V_PCAPDEP, V_INCLS) | ||
28 | |||
29 | # | ||
30 | # Check for these after AC_LBL_LIBPCAP, so we link with the appropriate | ||
31 | -- | ||
32 | 1.7.9.5 | ||
33 | |||
diff --git a/meta-networking/recipes-support/tcpdump/tcpdump_4.3.0.bb b/meta-networking/recipes-support/tcpdump/tcpdump_4.5.1.bb index 0d88990ab..9ce02d626 100644 --- a/meta-networking/recipes-support/tcpdump/tcpdump_4.3.0.bb +++ b/meta-networking/recipes-support/tcpdump/tcpdump_4.5.1.bb | |||
@@ -11,9 +11,13 @@ SRC_URI = " \ | |||
11 | file://0001-minimal-IEEE802.15.4-allowed.patch \ | 11 | file://0001-minimal-IEEE802.15.4-allowed.patch \ |
12 | file://ipv6-cross.patch \ | 12 | file://ipv6-cross.patch \ |
13 | file://configure.patch \ | 13 | file://configure.patch \ |
14 | file://unnecessary-to-check-libpcap.patch \ | ||
15 | file://tcpdump-configure-dlpi.patch \ | ||
16 | file://tcpdump-cross-getaddrinfo.patch \ | ||
14 | " | 17 | " |
15 | SRC_URI[md5sum] = "a3fe4d30ac85ff5467c889ff46b7e1e8" | 18 | SRC_URI[md5sum] = "973a2513d0076e34aa9da7e15ed98e1b" |
16 | SRC_URI[sha256sum] = "efd08b610210d39977ec3175fa82dad9fbd33587930081be2a905a712dba4286" | 19 | SRC_URI[sha256sum] = "14ab39657128f3a650aed4cf455f76c7590601087b6101c253d698f6e73f0b96" |
20 | export LIBS=" -lpcap" | ||
17 | 21 | ||
18 | inherit autotools-brokensep | 22 | inherit autotools-brokensep |
19 | CACHED_CONFIGUREVARS = "ac_cv_linux_vers=${ac_cv_linux_vers=2}" | 23 | CACHED_CONFIGUREVARS = "ac_cv_linux_vers=${ac_cv_linux_vers=2}" |