diff options
author | Alexander Aring <aar@pengutronix.de> | 2016-04-27 17:54:22 +0200 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2016-05-17 08:28:34 +0200 |
commit | 3bb02472422390ea508ddf5b7a05b3ed9173361f (patch) | |
tree | 17a77980c1439182e98ac97293f5d1f4d7c06b87 /rules | |
parent | 32dc89d1684015aac52d3ed813432020f06a904a (diff) | |
download | ptxdist-3bb02472422390ea508ddf5b7a05b3ed9173361f.tar.gz ptxdist-3bb02472422390ea508ddf5b7a05b3ed9173361f.tar.xz |
libpcap: version bump 1.5.3 -> 1.7.4
Signed-off-by: Alexander Aring <aar@pengutronix.de>
[mol: fix building with bluetooth support]
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules')
-rw-r--r-- | rules/libpcap.make | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/rules/libpcap.make b/rules/libpcap.make index 88a368694..4b3a76eea 100644 --- a/rules/libpcap.make +++ b/rules/libpcap.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_LIBPCAP) += libpcap # # Paths and names # -LIBPCAP_VERSION := 1.5.3 -LIBPCAP_MD5 := 7e7321fb3aff2f2bb05c8229f3795d4a +LIBPCAP_VERSION := 1.7.4 +LIBPCAP_MD5 := b2e13142bbaba857ab1c6894aedaf547 LIBPCAP := libpcap-$(LIBPCAP_VERSION) LIBPCAP_SUFFIX := tar.gz LIBPCAP_URL := http://www.tcpdump.org/release/$(LIBPCAP).$(LIBPCAP_SUFFIX) @@ -34,7 +34,8 @@ LIBPCAP_ENV := \ $(CROSS_ENV) \ ac_cv_linux_vers=2 \ ac_cv_lib_nl_nl_socket_alloc=no \ - ac_cv_lib_nl_nl_handle_alloc=no + ac_cv_lib_nl_nl_handle_alloc=no \ + ac_cv_lbl_hci_channel_monitor_is_defined=no LIBPCAP_COMPILE_ENV := \ $(CROSS_ENV_CFLAGS) \ @@ -47,19 +48,22 @@ LIBPCAP_COMPILE_ENV := \ # LIBPCAP_AUTOCONF := \ $(CROSS_AUTOCONF_USR) \ - $(GLOBAL_IPV6_OPTION) \ --enable-protochain \ + $(GLOBAL_IPV6_OPTION) \ --disable-optimizer-dbg \ --disable-yydebug \ --disable-universal \ --enable-shared \ + --disable-usb \ --$(call ptx/endis, PTXCONF_LIBPCAP_BLUETOOTH)-bluetooth \ --disable-canusb \ --disable-can \ --disable-dbus \ + --disable-packet-ring \ --with-libnl=$(SYSROOT)/usr \ --without-dag \ - --without-septel + --without-septel \ + --without-snf ifdef PTXCONF_ARCH_MINGW LIBPCAP_AUTOCONF += --with-pcap=null |