Disable bits of remote capture support inherited from the WinPCAP merge which cause applications to fails to build if they define HAVE_REMOTE.
Signed-off-by: Fabio Berton <[email protected]> --- .../libpcap/libpcap/disable-remote.patch | 36 ++++++++++++++++++++++ meta/recipes-connectivity/libpcap/libpcap_1.8.1.bb | 1 + 2 files changed, 37 insertions(+) create mode 100644 meta/recipes-connectivity/libpcap/libpcap/disable-remote.patch diff --git a/meta/recipes-connectivity/libpcap/libpcap/disable-remote.patch b/meta/recipes-connectivity/libpcap/libpcap/disable-remote.patch new file mode 100644 index 0000000..7e1eea6 --- /dev/null +++ b/meta/recipes-connectivity/libpcap/libpcap/disable-remote.patch @@ -0,0 +1,36 @@ +Disable bits of remote capture support inherited from the WinPCAP merge +which cause applications to FTBFS if they define HAVE_REMOTE. + +Patch from: +https://anonscm.debian.org/cgit/users/rfrancoise/libpcap.git/commit/? +id=f35949969269dfdcc3549b12fade604755e1e326 + +Upstream-Status: Pending + +--- a/pcap/pcap.h ++++ b/pcap/pcap.h +@@ -506,6 +506,11 @@ + #define MODE_STAT 1 + #define MODE_MON 2 + ++#ifdef HAVE_REMOTE ++ /* Includes most of the public stuff that is needed for the remote capture */ ++ #include <remote-ext.h> ++#endif /* HAVE_REMOTE */ ++ + #elif defined(MSDOS) + + /* +@@ -526,11 +531,6 @@ + + #endif /* _WIN32/MSDOS/UN*X */ + +-#ifdef HAVE_REMOTE +- /* Includes most of the public stuff that is needed for the remote capture */ +- #include <remote-ext.h> +-#endif /* HAVE_REMOTE */ +- + #ifdef __cplusplus + } + #endif + diff --git a/meta/recipes-connectivity/libpcap/libpcap_1.8.1.bb b/meta/recipes-connectivity/libpcap/libpcap_1.8.1.bb index 9072fe0..8ce18e5 100644 --- a/meta/recipes-connectivity/libpcap/libpcap_1.8.1.bb +++ b/meta/recipes-connectivity/libpcap/libpcap_1.8.1.bb @@ -2,6 +2,7 @@ require libpcap.inc SRC_URI += " \ file://libpcap-pkgconfig-support.patch \ + file://disable-remote.patch \ " SRC_URI[md5sum] = "3d48f9cd171ff12b0efd9134b52f1447" -- 2.1.4 -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
