diff options
| -rw-r--r-- | patches/libpcap-1.4.0/series | 2 | ||||
| -rw-r--r-- | patches/libpcap-1.5.3/0001-build-and-install-share-lib-only.patch (renamed from patches/libpcap-1.4.0/0001-build-and-install-share-lib-only.patch) | 16 | ||||
| -rw-r--r-- | patches/libpcap-1.5.3/0002-pcap-config-add-SYSROOT-support.patch (renamed from patches/libpcap-1.4.0/0002-pcap-config-add-SYSROOT-support.patch) | 6 | ||||
| -rw-r--r-- | patches/libpcap-1.5.3/0003-configure.in-allow-specifying-path-for-libnl3.patch | 25 | ||||
| l--------- | patches/libpcap-1.5.3/autogen.sh | 1 | ||||
| -rw-r--r-- | patches/libpcap-1.5.3/series | 6 | ||||
| -rw-r--r-- | rules/libpcap.in | 3 | ||||
| -rw-r--r-- | rules/libpcap.make | 13 |
8 files changed, 50 insertions, 22 deletions
diff --git a/patches/libpcap-1.4.0/series b/patches/libpcap-1.4.0/series deleted file mode 100644 index 78662cfce..000000000 --- a/patches/libpcap-1.4.0/series +++ /dev/null @@ -1,2 +0,0 @@ -0001-build-and-install-share-lib-only.patch -0002-pcap-config-add-SYSROOT-support.patch diff --git a/patches/libpcap-1.4.0/0001-build-and-install-share-lib-only.patch b/patches/libpcap-1.5.3/0001-build-and-install-share-lib-only.patch index ee6c12e71..68030377a 100644 --- a/patches/libpcap-1.4.0/0001-build-and-install-share-lib-only.patch +++ b/patches/libpcap-1.5.3/0001-build-and-install-share-lib-only.patch @@ -1,7 +1,6 @@ -From eb6374bab46421bafc2734f5451d28184d2bd861 Mon Sep 17 00:00:00 2001 From: Michael Olbrich <m.olbrich@pengutronix.de> Date: Fri, 31 May 2013 17:28:01 +0200 -Subject: [PATCH 1/2] build and install share lib only +Subject: [PATCH] build and install share lib only This patch removes the static library from the dependency list for "all" and "install". This way libpcap.a is not built and @@ -13,10 +12,10 @@ Signed-off-by: Alexander Aring <alex.aring@gmail.com> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in -index 772cc7d..7f3c5ca 100644 +index 2784960..653b353 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -345,7 +345,7 @@ EXTRA_DIST = \ +@@ -356,7 +356,7 @@ EXTRA_DIST = \ Win32/Src/inet_net.c \ Win32/Src/inet_pton.c @@ -25,15 +24,12 @@ index 772cc7d..7f3c5ca 100644 libpcap.a: $(OBJ) @rm -f $@ -@@ -530,7 +530,7 @@ opentest: tests/opentest.c libpcap.a - selpolltest: tests/selpolltest.c libpcap.a - $(CC) $(FULL_CFLAGS) -I. -L. -o selpolltest $(srcdir)/tests/selpolltest.c libpcap.a $(LIBS) +@@ -544,7 +544,7 @@ selpolltest: tests/selpolltest.c libpcap.a + valgrindtest: tests/valgrindtest.c libpcap.a + $(CC) $(FULL_CFLAGS) -I. -L. -o valgrindtest $(srcdir)/tests/valgrindtest.c libpcap.a $(LIBS) -install: install-shared install-archive pcap-config +install: install-shared pcap-config [ -d $(DESTDIR)$(libdir) ] || \ (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir)) [ -d $(DESTDIR)$(includedir) ] || \ --- -1.8.3 - diff --git a/patches/libpcap-1.4.0/0002-pcap-config-add-SYSROOT-support.patch b/patches/libpcap-1.5.3/0002-pcap-config-add-SYSROOT-support.patch index fbde3e7a5..cfcb11842 100644 --- a/patches/libpcap-1.4.0/0002-pcap-config-add-SYSROOT-support.patch +++ b/patches/libpcap-1.5.3/0002-pcap-config-add-SYSROOT-support.patch @@ -1,7 +1,6 @@ -From c293ce6876bb3c8129dfa14be07ce871808fae81 Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde <mkl@pengutronix.de> Date: Sun, 10 Jan 2010 00:49:07 +0100 -Subject: [PATCH 2/2] pcap-config: add SYSROOT support +Subject: [PATCH] pcap-config: add SYSROOT support Signed-off-by: Alexander Aring <alex.aring@gmail.com> --- @@ -23,6 +22,3 @@ index 206be3b..fb68cb3 100644 V_RPATH_OPT="@V_RPATH_OPT@" LIBS="@LIBS@" --- -1.8.3 - diff --git a/patches/libpcap-1.5.3/0003-configure.in-allow-specifying-path-for-libnl3.patch b/patches/libpcap-1.5.3/0003-configure.in-allow-specifying-path-for-libnl3.patch new file mode 100644 index 000000000..df133a081 --- /dev/null +++ b/patches/libpcap-1.5.3/0003-configure.in-allow-specifying-path-for-libnl3.patch @@ -0,0 +1,25 @@ +From: Michael Olbrich <m.olbrich@pengutronix.de> +Date: Wed, 29 Jan 2014 09:17:52 +0100 +Subject: [PATCH] configure.in: allow specifying path for libnl3 + +--- + configure.in | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/configure.in b/configure.in +index 2cae646..a83acdf 100644 +--- a/configure.in ++++ b/configure.in +@@ -460,7 +460,11 @@ linux) + AC_DEFINE(HAVE_LIBNL_3_x,1,[if libnl exists and is version 3.x]) + AC_DEFINE(HAVE_LIBNL_NLE,1,[libnl has NLE_FAILURE]) + AC_DEFINE(HAVE_LIBNL_SOCKETS,1,[libnl has new-style socket api]) +- V_INCLS="$V_INCLS -I/usr/include/libnl3" ++ if test x$with_libnl != xyes ; then ++ V_INCLS="$V_INCLS -I${with_libnl}/include/libnl3" ++ else ++ V_INCLS="$V_INCLS -I/usr/include/libnl3" ++ fi + have_any_nl="yes" + ]) + diff --git a/patches/libpcap-1.5.3/autogen.sh b/patches/libpcap-1.5.3/autogen.sh new file mode 120000 index 000000000..9f8a4cb7d --- /dev/null +++ b/patches/libpcap-1.5.3/autogen.sh @@ -0,0 +1 @@ +../autogen.sh
\ No newline at end of file diff --git a/patches/libpcap-1.5.3/series b/patches/libpcap-1.5.3/series new file mode 100644 index 000000000..d68098e92 --- /dev/null +++ b/patches/libpcap-1.5.3/series @@ -0,0 +1,6 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-build-and-install-share-lib-only.patch +0002-pcap-config-add-SYSROOT-support.patch +0003-configure.in-allow-specifying-path-for-libnl3.patch +# 94d8ab7be7249a642f246cfb06146722 - git-ptx-patches magic 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 |