diff options
author | Michael Olbrich <m.olbrich@pengutronix.de> | 2014-01-29 00:28:49 +0100 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2014-01-29 20:44:13 +0100 |
commit | f8c9a69e150b688b3e2001e6e11be0a5833a7219 (patch) | |
tree | b3599e9afef39a249d90503339ecf45fd156e670 /rules | |
parent | 67bd01207680ec3d4e4b459a53798c7fda6994eb (diff) | |
download | ptxdist-f8c9a69e150b688b3e2001e6e11be0a5833a7219.tar.gz ptxdist-f8c9a69e150b688b3e2001e6e11be0a5833a7219.tar.xz |
libpcap: version bump 1.4.0 -> 1.5.3
And switch to libnl3.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules')
-rw-r--r-- | rules/libpcap.in | 3 | ||||
-rw-r--r-- | rules/libpcap.make | 13 |
2 files changed, 11 insertions, 5 deletions
diff --git a/rules/libpcap.in b/rules/libpcap.in index 4b0834b09..ace4dadc5 100644 --- a/rules/libpcap.in +++ b/rules/libpcap.in @@ -3,7 +3,8 @@ menuconfig LIBPCAP tristate prompt "libpcap " - select LIBNL + select GCCLIBS_GCC_S + select LIBNL3 select BLUEZ if LIBPCAP_BLUETOOTH help libpcap is a system-independent interface for user-level packet capture. diff --git a/rules/libpcap.make b/rules/libpcap.make index 251661c4b..f93f5ddf5 100644 --- a/rules/libpcap.make +++ b/rules/libpcap.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_LIBPCAP) += libpcap # # Paths and names # -LIBPCAP_VERSION := 1.4.0 -LIBPCAP_MD5 := 56e88a5aabdd1e04414985ac24f7e76c +LIBPCAP_VERSION := 1.5.3 +LIBPCAP_MD5 := 7e7321fb3aff2f2bb05c8229f3795d4a LIBPCAP := libpcap-$(LIBPCAP_VERSION) LIBPCAP_SUFFIX := tar.gz LIBPCAP_URL := http://www.tcpdump.org/release/$(LIBPCAP).$(LIBPCAP_SUFFIX) @@ -31,7 +31,9 @@ LIBPCAP_DIR := $(BUILDDIR)/$(LIBPCAP) LIBPCAP_PATH := PATH=$(CROSS_PATH) LIBPCAP_ENV := \ $(CROSS_ENV) \ - ac_cv_linux_vers=2 + ac_cv_linux_vers=2 \ + ac_cv_lib_nl_nl_socket_alloc=no \ + ac_cv_lib_nl_nl_handle_alloc=no LIBPCAP_COMPILE_ENV := \ $(CROSS_ENV_CFLAGS) \ @@ -51,7 +53,10 @@ LIBPCAP_AUTOCONF := \ --disable-universal \ --enable-shared \ --$(call ptx/endis, PTXCONF_LIBPCAP_BLUETOOTH)-bluetooth \ - --with-libnl \ + --disable-canusb \ + --disable-can \ + --disable-dbus \ + --with-libnl=$(SYSROOT)/usr \ --without-dag \ --without-septel |