diff options
author | Fabio Berton <fabio.berton@ossystems.com.br> | 2016-11-22 16:15:59 -0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-12-13 22:55:22 +0000 |
commit | 252898f56e0c4eed9e22e4795d8403ab69dac266 (patch) | |
tree | 1113a6acc386512ed2aa9cdd018aa140b6659d79 /meta/recipes-connectivity/libpcap/libpcap | |
parent | 5647a73fb1830abc6d015318af53f09eb8e63b1e (diff) | |
download | poky-252898f56e0c4eed9e22e4795d8403ab69dac266.tar.gz |
libpcap: Disable exposed bits of WinPCAP remote capture support
Disable bits of remote capture support inherited from the WinPCAP merge
which cause applications to fails to build if they define HAVE_REMOTE.
(From OE-Core rev: 4e412234c37efec42b3962c11d44903c0c58c92e)
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/libpcap')
-rw-r--r-- | meta/recipes-connectivity/libpcap/libpcap/disable-remote.patch | 36 |
1 files changed, 36 insertions, 0 deletions
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 0000000000..7e1eea6b1e --- /dev/null +++ b/meta/recipes-connectivity/libpcap/libpcap/disable-remote.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | Disable bits of remote capture support inherited from the WinPCAP merge | ||
2 | which cause applications to FTBFS if they define HAVE_REMOTE. | ||
3 | |||
4 | Patch from: | ||
5 | https://anonscm.debian.org/cgit/users/rfrancoise/libpcap.git/commit/? | ||
6 | id=f35949969269dfdcc3549b12fade604755e1e326 | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | |||
10 | --- a/pcap/pcap.h | ||
11 | +++ b/pcap/pcap.h | ||
12 | @@ -506,6 +506,11 @@ | ||
13 | #define MODE_STAT 1 | ||
14 | #define MODE_MON 2 | ||
15 | |||
16 | +#ifdef HAVE_REMOTE | ||
17 | + /* Includes most of the public stuff that is needed for the remote capture */ | ||
18 | + #include <remote-ext.h> | ||
19 | +#endif /* HAVE_REMOTE */ | ||
20 | + | ||
21 | #elif defined(MSDOS) | ||
22 | |||
23 | /* | ||
24 | @@ -526,11 +531,6 @@ | ||
25 | |||
26 | #endif /* _WIN32/MSDOS/UN*X */ | ||
27 | |||
28 | -#ifdef HAVE_REMOTE | ||
29 | - /* Includes most of the public stuff that is needed for the remote capture */ | ||
30 | - #include <remote-ext.h> | ||
31 | -#endif /* HAVE_REMOTE */ | ||
32 | - | ||
33 | #ifdef __cplusplus | ||
34 | } | ||
35 | #endif | ||
36 | |||