From be2a2437005087b3f8d43a09ddc69991ed81e110 Mon Sep 17 00:00:00 2001 From: Roy Li Date: Tue, 8 Jul 2014 13:20:47 +0800 Subject: 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 Signed-off-by: Joe MacDonald --- .../0001-minimal-IEEE802.15.4-allowed.patch | 22 ---------- .../tcpdump/tcpdump-4.3.0/configure.patch | 29 ------------- .../tcpdump/tcpdump-4.3.0/ipv6-cross.patch | 41 ------------------- .../tcpdump-4.3.0/tcpdump_configure_no_-O2.patch | 42 ------------------- .../0001-minimal-IEEE802.15.4-allowed.patch | 22 ++++++++++ .../tcpdump/tcpdump-4.5.1/configure.patch | 29 +++++++++++++ .../tcpdump/tcpdump-4.5.1/ipv6-cross.patch | 41 +++++++++++++++++++ .../tcpdump-4.5.1/tcpdump-configure-dlpi.patch | 31 ++++++++++++++ .../tcpdump-4.5.1/tcpdump-cross-getaddrinfo.patch | 23 +++++++++++ .../tcpdump-4.5.1/tcpdump_configure_no_-O2.patch | 27 +++++++++++++ .../unnecessary-to-check-libpcap.patch | 33 +++++++++++++++ .../recipes-support/tcpdump/tcpdump_4.3.0.bb | 43 -------------------- .../recipes-support/tcpdump/tcpdump_4.5.1.bb | 47 ++++++++++++++++++++++ 13 files changed, 253 insertions(+), 177 deletions(-) delete mode 100644 meta-networking/recipes-support/tcpdump/tcpdump-4.3.0/0001-minimal-IEEE802.15.4-allowed.patch delete mode 100644 meta-networking/recipes-support/tcpdump/tcpdump-4.3.0/configure.patch delete mode 100644 meta-networking/recipes-support/tcpdump/tcpdump-4.3.0/ipv6-cross.patch delete mode 100644 meta-networking/recipes-support/tcpdump/tcpdump-4.3.0/tcpdump_configure_no_-O2.patch create mode 100644 meta-networking/recipes-support/tcpdump/tcpdump-4.5.1/0001-minimal-IEEE802.15.4-allowed.patch create mode 100644 meta-networking/recipes-support/tcpdump/tcpdump-4.5.1/configure.patch create mode 100644 meta-networking/recipes-support/tcpdump/tcpdump-4.5.1/ipv6-cross.patch create mode 100644 meta-networking/recipes-support/tcpdump/tcpdump-4.5.1/tcpdump-configure-dlpi.patch create mode 100644 meta-networking/recipes-support/tcpdump/tcpdump-4.5.1/tcpdump-cross-getaddrinfo.patch create mode 100644 meta-networking/recipes-support/tcpdump/tcpdump-4.5.1/tcpdump_configure_no_-O2.patch create mode 100644 meta-networking/recipes-support/tcpdump/tcpdump-4.5.1/unnecessary-to-check-libpcap.patch delete mode 100644 meta-networking/recipes-support/tcpdump/tcpdump_4.3.0.bb create mode 100644 meta-networking/recipes-support/tcpdump/tcpdump_4.5.1.bb (limited to 'meta-networking/recipes-support') 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.3.0/0001-minimal-IEEE802.15.4-allowed.patch deleted file mode 100644 index 9d3d60d4d7..0000000000 --- a/meta-networking/recipes-support/tcpdump/tcpdump-4.3.0/0001-minimal-IEEE802.15.4-allowed.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Sergey Lapin -Date: Wed, 28 Jan 2009 16:34:15 +0300 -Subject: [PATCH] minimal IEEE802.15.4 allowed - ---- - tcpdump.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -diff --git a/tcpdump.c b/tcpdump.c -index 06683af..fbc944c 100644 ---- a/tcpdump.c -+++ b/tcpdump.c -@@ -282,6 +282,9 @@ static struct printer printers[] = { - #ifdef DLT_MFR - { mfr_if_print, DLT_MFR }, - #endif -+#ifdef DLT_IEEE802_15_4 -+ { raw_if_print, DLT_IEEE802_15_4 }, -+#endif - #if defined(DLT_BLUETOOTH_HCI_H4_WITH_PHDR) && defined(HAVE_PCAP_BLUETOOTH_H) - { bt_if_print, DLT_BLUETOOTH_HCI_H4_WITH_PHDR}, - #endif diff --git a/meta-networking/recipes-support/tcpdump/tcpdump-4.3.0/configure.patch b/meta-networking/recipes-support/tcpdump/tcpdump-4.3.0/configure.patch deleted file mode 100644 index 3697420fd3..0000000000 --- a/meta-networking/recipes-support/tcpdump/tcpdump-4.3.0/configure.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- - aclocal.m4 | 1 - - configure.in | 1 + - 2 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/aclocal.m4 b/aclocal.m4 -index 40b5866..0c662b0 100644 ---- a/aclocal.m4 -+++ b/aclocal.m4 -@@ -40,7 +40,6 @@ dnl - AC_DEFUN(AC_LBL_C_INIT_BEFORE_CC, - [AC_PREREQ(2.50) - AC_BEFORE([$0], [AC_LBL_C_INIT]) -- AC_BEFORE([$0], [AC_PROG_CC]) - AC_BEFORE([$0], [AC_LBL_FIXINCLUDES]) - AC_BEFORE([$0], [AC_LBL_DEVEL]) - AC_ARG_WITH(gcc, [ --without-gcc don't use gcc]) -diff --git a/configure.in b/configure.in -index 11257c9..7f9591c 100644 ---- a/configure.in -+++ b/configure.in -@@ -19,6 +19,7 @@ AC_REVISION($Revision: 1.204 $) - AC_PREREQ(2.50) - AC_INIT(tcpdump.c) - -+AC_PROG_CC - AC_CANONICAL_HOST - - AC_LBL_C_INIT_BEFORE_CC(V_CCOPT, V_INCLS) diff --git a/meta-networking/recipes-support/tcpdump/tcpdump-4.3.0/ipv6-cross.patch b/meta-networking/recipes-support/tcpdump/tcpdump-4.3.0/ipv6-cross.patch deleted file mode 100644 index 7eba2c5a6d..0000000000 --- a/meta-networking/recipes-support/tcpdump/tcpdump-4.3.0/ipv6-cross.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- - configure.in | 12 ++++++++---- - 1 files changed, 8 insertions(+), 4 deletions(-) - -diff --git a/configure.in b/configure.in -index eb3e5e8..11257c9 100644 ---- a/configure.in -+++ b/configure.in -@@ -181,8 +181,9 @@ yes) AC_MSG_RESULT(yes) - ipv6=no - ;; - esac ], -- -- AC_TRY_RUN([ /* AF_INET6 available check */ -+[ -+ if test x"$cross_compiling" != "xyes"; then -+ AC_TRY_RUN([ /* AF_INET6 avalable check */ - #include - #include - main() -@@ -201,7 +202,10 @@ main() - ipv6=no], - [ AC_MSG_RESULT(no) - ipv6=no] --)) -+ ) -+else -+ AC_MSG_FAILURE([Unable to check for ipv6 when crosscompiling, please specify.]) -+fi]) - - ipv6type=unknown - ipv6lib=none -@@ -316,7 +320,7 @@ if test "$ipv6" = "yes" -a "$ipv6lib" != "none"; then - fi - - --if test "$ipv6" = "yes"; then -+if test x"$cross_compiling" != "xyes" -a "$ipv6" = "yes"; then - # - # XXX - on Tru64 UNIX 5.1, there is no "getaddrinfo()" - # function in libc; there are "ngetaddrinfo()" and 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 7929da5b1f..0000000000 --- a/meta-networking/recipes-support/tcpdump/tcpdump-4.3.0/tcpdump_configure_no_-O2.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- - configure | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/configure b/configure -index cb51d19..73d51af 100755 ---- a/configure -+++ b/configure -@@ -2691,13 +2691,13 @@ if test "$ac_test_CFLAGS" = set; then - CFLAGS=$ac_save_CFLAGS - elif test $ac_cv_prog_cc_g = yes; then - if test "$GCC" = yes; then -- CFLAGS="-g -O2" -+ CFLAGS="-g" - else - CFLAGS="-g" - fi - else - if test "$GCC" = yes; then -- CFLAGS="-O2" -+ CFLAGS="" - else - CFLAGS= - fi -@@ -2830,7 +2830,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu - if test "$GCC" = yes ; then - if test "$SHLICC2" = yes ; then - ac_cv_lbl_gcc_vers=2 -- V_CCOPT="-O2" -+ V_CCOPT="" - else - { echo "$as_me:$LINENO: checking gcc version" >&5 - echo $ECHO_N "checking gcc version... $ECHO_C" >&6; } -@@ -2847,7 +2847,7 @@ fi - { echo "$as_me:$LINENO: result: $ac_cv_lbl_gcc_vers" >&5 - echo "${ECHO_T}$ac_cv_lbl_gcc_vers" >&6; } - if test $ac_cv_lbl_gcc_vers -gt 1 ; then -- V_CCOPT="-O2" -+ V_CCOPT="" - fi - fi - else diff --git a/meta-networking/recipes-support/tcpdump/tcpdump-4.5.1/0001-minimal-IEEE802.15.4-allowed.patch b/meta-networking/recipes-support/tcpdump/tcpdump-4.5.1/0001-minimal-IEEE802.15.4-allowed.patch new file mode 100644 index 0000000000..9d3d60d4d7 --- /dev/null +++ b/meta-networking/recipes-support/tcpdump/tcpdump-4.5.1/0001-minimal-IEEE802.15.4-allowed.patch @@ -0,0 +1,22 @@ +From: Sergey Lapin +Date: Wed, 28 Jan 2009 16:34:15 +0300 +Subject: [PATCH] minimal IEEE802.15.4 allowed + +--- + tcpdump.c | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/tcpdump.c b/tcpdump.c +index 06683af..fbc944c 100644 +--- a/tcpdump.c ++++ b/tcpdump.c +@@ -282,6 +282,9 @@ static struct printer printers[] = { + #ifdef DLT_MFR + { mfr_if_print, DLT_MFR }, + #endif ++#ifdef DLT_IEEE802_15_4 ++ { raw_if_print, DLT_IEEE802_15_4 }, ++#endif + #if defined(DLT_BLUETOOTH_HCI_H4_WITH_PHDR) && defined(HAVE_PCAP_BLUETOOTH_H) + { bt_if_print, DLT_BLUETOOTH_HCI_H4_WITH_PHDR}, + #endif diff --git a/meta-networking/recipes-support/tcpdump/tcpdump-4.5.1/configure.patch b/meta-networking/recipes-support/tcpdump/tcpdump-4.5.1/configure.patch new file mode 100644 index 0000000000..3697420fd3 --- /dev/null +++ b/meta-networking/recipes-support/tcpdump/tcpdump-4.5.1/configure.patch @@ -0,0 +1,29 @@ +--- + aclocal.m4 | 1 - + configure.in | 1 + + 2 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/aclocal.m4 b/aclocal.m4 +index 40b5866..0c662b0 100644 +--- a/aclocal.m4 ++++ b/aclocal.m4 +@@ -40,7 +40,6 @@ dnl + AC_DEFUN(AC_LBL_C_INIT_BEFORE_CC, + [AC_PREREQ(2.50) + AC_BEFORE([$0], [AC_LBL_C_INIT]) +- AC_BEFORE([$0], [AC_PROG_CC]) + AC_BEFORE([$0], [AC_LBL_FIXINCLUDES]) + AC_BEFORE([$0], [AC_LBL_DEVEL]) + AC_ARG_WITH(gcc, [ --without-gcc don't use gcc]) +diff --git a/configure.in b/configure.in +index 11257c9..7f9591c 100644 +--- a/configure.in ++++ b/configure.in +@@ -19,6 +19,7 @@ AC_REVISION($Revision: 1.204 $) + AC_PREREQ(2.50) + AC_INIT(tcpdump.c) + ++AC_PROG_CC + AC_CANONICAL_HOST + + AC_LBL_C_INIT_BEFORE_CC(V_CCOPT, V_INCLS) diff --git a/meta-networking/recipes-support/tcpdump/tcpdump-4.5.1/ipv6-cross.patch b/meta-networking/recipes-support/tcpdump/tcpdump-4.5.1/ipv6-cross.patch new file mode 100644 index 0000000000..7eba2c5a6d --- /dev/null +++ b/meta-networking/recipes-support/tcpdump/tcpdump-4.5.1/ipv6-cross.patch @@ -0,0 +1,41 @@ +--- + configure.in | 12 ++++++++---- + 1 files changed, 8 insertions(+), 4 deletions(-) + +diff --git a/configure.in b/configure.in +index eb3e5e8..11257c9 100644 +--- a/configure.in ++++ b/configure.in +@@ -181,8 +181,9 @@ yes) AC_MSG_RESULT(yes) + ipv6=no + ;; + esac ], +- +- AC_TRY_RUN([ /* AF_INET6 available check */ ++[ ++ if test x"$cross_compiling" != "xyes"; then ++ AC_TRY_RUN([ /* AF_INET6 avalable check */ + #include + #include + main() +@@ -201,7 +202,10 @@ main() + ipv6=no], + [ AC_MSG_RESULT(no) + ipv6=no] +-)) ++ ) ++else ++ AC_MSG_FAILURE([Unable to check for ipv6 when crosscompiling, please specify.]) ++fi]) + + ipv6type=unknown + ipv6lib=none +@@ -316,7 +320,7 @@ if test "$ipv6" = "yes" -a "$ipv6lib" != "none"; then + fi + + +-if test "$ipv6" = "yes"; then ++if test x"$cross_compiling" != "xyes" -a "$ipv6" = "yes"; then + # + # XXX - on Tru64 UNIX 5.1, there is no "getaddrinfo()" + # function in libc; there are "ngetaddrinfo()" and 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 0000000000..50e2d54399 --- /dev/null +++ b/meta-networking/recipes-support/tcpdump/tcpdump-4.5.1/tcpdump-configure-dlpi.patch @@ -0,0 +1,31 @@ +[PATCH] tcpdump: cross-compiling not check dlpi. + +For cross-compiling on Linux platforms, we do not need to check libdlpi +since it is only placed on Solaris. +Also, checking libdlpi in native /lib would cause do_qa_configure fail. + +Upstream-Status: Pending. + +Signed-off-by: Xin Ouyang +--- + configure.in | 4 +++- + 1 files changed, 3 insertions(+), 1 deletions(-) + +diff --git a/configure.in b/configure.in +index 7f9591c..ca277c0 100644 +--- a/configure.in ++++ b/configure.in +@@ -716,7 +716,9 @@ don't.]) + fi + + # libdlpi is needed for Solaris 11 and later. +-AC_CHECK_LIB(dlpi, dlpi_walk, LIBS="$LIBS -ldlpi" LDFLAGS="-L/lib $LDFLAGS", ,-L/lib) ++if test "$cross_compiling" != yes; then ++ AC_CHECK_LIB(dlpi, dlpi_walk, LIBS="$LIBS -ldlpi" LDFLAGS="-L/lib $LDFLAGS", ,-L/lib) ++fi + + dnl portability macros for getaddrinfo/getnameinfo + dnl +-- +1.7.5.4 + 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 0000000000..b414b72e9d --- /dev/null +++ b/meta-networking/recipes-support/tcpdump/tcpdump-4.5.1/tcpdump-cross-getaddrinfo.patch @@ -0,0 +1,23 @@ +Fix getaddinfo check when cross compiling + +Upstream-Status: Pending. + +AC_TRY_RUN defaults to td_cv_buggygetaddrinfo=yes when +cross-compiling. So this change indicates that we +are cross-compiling. + +Signed-of-by: Aws Ismail + +diff --git a/configure.in b/configure.in +index ca277c0..283035e 100644 +--- a/configure.in ++++ b/configure.in +@@ -434,7 +434,7 @@ main() + ], + td_cv_buggygetaddrinfo=no, + td_cv_buggygetaddrinfo=yes, +- td_cv_buggygetaddrinfo=yes)]) ++ td_cv_buggygetaddrinfo=cross)]) + if test "$td_cv_buggygetaddrinfo" = no; then + AC_MSG_RESULT(good) + 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 0000000000..b2296bc524 --- /dev/null +++ b/meta-networking/recipes-support/tcpdump/tcpdump-4.5.1/tcpdump_configure_no_-O2.patch @@ -0,0 +1,27 @@ +--- + configure | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure b/configure +index 468a517..a890728 100755 +--- a/configure ++++ b/configure +@@ -3036,13 +3036,13 @@ if test "$ac_test_CFLAGS" = set; then + CFLAGS=$ac_save_CFLAGS + elif test $ac_cv_prog_cc_g = yes; then + if test "$GCC" = yes; then +- CFLAGS="-g -O2" ++ CFLAGS="-g" + else + CFLAGS="-g" + fi + else + if test "$GCC" = yes; then +- CFLAGS="-O2" ++ CFLAGS= + else + CFLAGS= + fi +-- +1.7.9.5 + 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 0000000000..d7a3ac23b1 --- /dev/null +++ b/meta-networking/recipes-support/tcpdump/tcpdump-4.5.1/unnecessary-to-check-libpcap.patch @@ -0,0 +1,33 @@ +unnecessary to check libpcap + +Upstream-Status: Pending + +since the check of libpcap did not consider the cross-compile, lead to the +below error: + This autoconf log indicates errors, it looked at host include and/or + library paths while determining system capabilities. + +In fact, the libpcap has been added into the tcpdump's DEPENDS, not need to +check if libpcap existed. + +Signed-off-by: Roy Li +--- + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.in b/configure.in +index 06fade1..9125de7 100644 +--- a/configure.in ++++ b/configure.in +@@ -567,7 +567,7 @@ AC_SEARCH_LIBS(getrpcbynumber, nsl, + dnl AC_CHECK_LIB(z, uncompress) + dnl AC_CHECK_HEADERS(zlib.h) + +-AC_LBL_LIBPCAP(V_PCAPDEP, V_INCLS) ++#AC_LBL_LIBPCAP(V_PCAPDEP, V_INCLS) + + # + # Check for these after AC_LBL_LIBPCAP, so we link with the appropriate +-- +1.7.9.5 + diff --git a/meta-networking/recipes-support/tcpdump/tcpdump_4.3.0.bb b/meta-networking/recipes-support/tcpdump/tcpdump_4.3.0.bb deleted file mode 100644 index 0d88990abf..0000000000 --- a/meta-networking/recipes-support/tcpdump/tcpdump_4.3.0.bb +++ /dev/null @@ -1,43 +0,0 @@ -SUMMARY = "A sophisticated network protocol analyzer" -HOMEPAGE = "http://www.tcpdump.org/" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=1d4b0366557951c84a94fabe3529f867" -SECTION = "console/network" -DEPENDS = "libpcap" - -SRC_URI = " \ - http://www.tcpdump.org/release/tcpdump-${PV}.tar.gz \ - file://tcpdump_configure_no_-O2.patch \ - file://0001-minimal-IEEE802.15.4-allowed.patch \ - file://ipv6-cross.patch \ - file://configure.patch \ -" -SRC_URI[md5sum] = "a3fe4d30ac85ff5467c889ff46b7e1e8" -SRC_URI[sha256sum] = "efd08b610210d39977ec3175fa82dad9fbd33587930081be2a905a712dba4286" - -inherit autotools-brokensep -CACHED_CONFIGUREVARS = "ac_cv_linux_vers=${ac_cv_linux_vers=2}" - -EXTRA_OECONF = "--without-crypto \ - ${@base_contains('DISTRO_FEATURES', 'ipv6', '--enable-ipv6', '--disable-ipv6', d)}" - -EXTRA_AUTORECONF += " -I m4" - -do_configure_prepend() { - mkdir -p ${S}/m4 - if [ -f aclocal.m4 ]; then - mv aclocal.m4 ${S}/m4 - fi - # AC_CHECK_LIB(dlpi.. was looking to host /lib - sed -i 's:-L/lib::g' ./configure.in -} -do_configure_append() { - sed -i 's:-L/usr/lib::' ./Makefile - sed -i 's:-Wl,-rpath,${STAGING_LIBDIR}::' ./Makefile - sed -i 's:-I/usr/include::' ./Makefile -} - -do_install_append() { - # tcpdump 4.0.0 installs a copy to /usr/sbin/tcpdump.4.0.0 - rm -f ${D}${sbindir}/tcpdump.${PV} -} diff --git a/meta-networking/recipes-support/tcpdump/tcpdump_4.5.1.bb b/meta-networking/recipes-support/tcpdump/tcpdump_4.5.1.bb new file mode 100644 index 0000000000..9ce02d626b --- /dev/null +++ b/meta-networking/recipes-support/tcpdump/tcpdump_4.5.1.bb @@ -0,0 +1,47 @@ +SUMMARY = "A sophisticated network protocol analyzer" +HOMEPAGE = "http://www.tcpdump.org/" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://LICENSE;md5=1d4b0366557951c84a94fabe3529f867" +SECTION = "console/network" +DEPENDS = "libpcap" + +SRC_URI = " \ + http://www.tcpdump.org/release/tcpdump-${PV}.tar.gz \ + file://tcpdump_configure_no_-O2.patch \ + file://0001-minimal-IEEE802.15.4-allowed.patch \ + file://ipv6-cross.patch \ + file://configure.patch \ + file://unnecessary-to-check-libpcap.patch \ + file://tcpdump-configure-dlpi.patch \ + file://tcpdump-cross-getaddrinfo.patch \ +" +SRC_URI[md5sum] = "973a2513d0076e34aa9da7e15ed98e1b" +SRC_URI[sha256sum] = "14ab39657128f3a650aed4cf455f76c7590601087b6101c253d698f6e73f0b96" +export LIBS=" -lpcap" + +inherit autotools-brokensep +CACHED_CONFIGUREVARS = "ac_cv_linux_vers=${ac_cv_linux_vers=2}" + +EXTRA_OECONF = "--without-crypto \ + ${@base_contains('DISTRO_FEATURES', 'ipv6', '--enable-ipv6', '--disable-ipv6', d)}" + +EXTRA_AUTORECONF += " -I m4" + +do_configure_prepend() { + mkdir -p ${S}/m4 + if [ -f aclocal.m4 ]; then + mv aclocal.m4 ${S}/m4 + fi + # AC_CHECK_LIB(dlpi.. was looking to host /lib + sed -i 's:-L/lib::g' ./configure.in +} +do_configure_append() { + sed -i 's:-L/usr/lib::' ./Makefile + sed -i 's:-Wl,-rpath,${STAGING_LIBDIR}::' ./Makefile + sed -i 's:-I/usr/include::' ./Makefile +} + +do_install_append() { + # tcpdump 4.0.0 installs a copy to /usr/sbin/tcpdump.4.0.0 + rm -f ${D}${sbindir}/tcpdump.${PV} +} -- cgit 1.2.3-korg