diff options
| l--------- | patches/libnet-1.1.4/autogen.sh | 1 | ||||
| -rw-r--r-- | patches/libnet-1.1.4/libnet-1.1.3-endianess.diff | 59 | ||||
| -rw-r--r-- | patches/libnet-1.1.4/series | 1 | ||||
| -rw-r--r-- | rules/libnet.make | 13 |
4 files changed, 7 insertions, 67 deletions
diff --git a/patches/libnet-1.1.4/autogen.sh b/patches/libnet-1.1.4/autogen.sh deleted file mode 120000 index 9f8a4cb7d..000000000 --- a/patches/libnet-1.1.4/autogen.sh +++ /dev/null @@ -1 +0,0 @@ -../autogen.sh
\ No newline at end of file diff --git a/patches/libnet-1.1.4/libnet-1.1.3-endianess.diff b/patches/libnet-1.1.4/libnet-1.1.3-endianess.diff deleted file mode 100644 index be4575411..000000000 --- a/patches/libnet-1.1.4/libnet-1.1.3-endianess.diff +++ /dev/null @@ -1,59 +0,0 @@ -Subject: fix endianess check for cross-compiling -From: Michael Olbrich <m.olbrich@pengutronix.de> - -The original check tries to run a program to check the endianess. -This fails when cross-compiling. Use autoconf stuff instead. - -Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> - ---- -# 20091229 rsc: there's already a similar patch in the libnet git, so we -# wait for a new release - - autogen.sh | 8 ++++++++ - configure.in | 12 +++++++++++- - 2 files changed, 19 insertions(+), 1 deletion(-) - -Index: b/autogen.sh -=================================================================== ---- /dev/null -+++ b/autogen.sh -@@ -0,0 +1,8 @@ -+rm -fr autom4te.cache -+libtoolize --copy --force -+aclocal -I . -+#autoheader -+automake -a -c --foreign -+autoconf -+rm -fr autom4te.cache -+ -Index: b/configure.in -=================================================================== ---- a/configure.in -+++ b/configure.in -@@ -6,6 +6,7 @@ dnl All rights reserved. - dnl - dnl Process this file with autoconf to produce a configure script. - -+AC_PREREQ(2.52) - AC_INIT(libnet, 1.1.4) - AC_MSG_RESULT(beginning autoconfiguration process for libnet-${PACKAGE_VERSION} ...) - AC_CANONICAL_SYSTEM -@@ -29,7 +30,16 @@ dnl - dnl And some custom things - dnl - --AC_LIBNET_ENDIAN_CHECK -+AC_C_BIGENDIAN([ -+ AC_DEFINE([LIBNET_BIG_ENDIAN], [1], [big endian]) -+ ENDIANESS="LIBNET_BIG_ENDIAN" -+ LIBNET_CONFIG_DEFINES="$LIBNET_CONFIG_DEFINES -DLIBNET_BIG_ENDIAN" -+],[ -+ AC_DEFINE([LIBNET_LIL_ENDIAN], [1], [little endian]) -+ ENDIANESS="LIBNET_LIL_ENDIAN" -+ LIBNET_CONFIG_DEFINES="$LIBNET_CONFIG_DEFINES -DLIBNET_LIL_ENDIAN" -+], AC_MSG_WARN(cannot detect endianess. try setting ac_cv_c_bigendian to yes or no)) -+ - AC_LBL_UNALIGNED_ACCESS - dnl AC_LBL_LIBRARY_NET - diff --git a/patches/libnet-1.1.4/series b/patches/libnet-1.1.4/series deleted file mode 100644 index b96f6cd61..000000000 --- a/patches/libnet-1.1.4/series +++ /dev/null @@ -1 +0,0 @@ -libnet-1.1.3-endianess.diff diff --git a/rules/libnet.make b/rules/libnet.make index 15faf7af5..635c3d8c4 100644 --- a/rules/libnet.make +++ b/rules/libnet.make @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_LIBNET) += libnet # # Paths and names # -LIBNET_VERSION := 1.1.4 -LIBNET_MD5 := c5e06418a89cc4209f677a776a798fd9 +LIBNET_VERSION := 1.1.6 +LIBNET_MD5 := 710296fe424a49344e5fcc0d09e53317 LIBNET := libnet-$(LIBNET_VERSION) LIBNET_SUFFIX := tar.gz LIBNET_URL := $(call ptx/mirror, SF, libnet-dev/$(LIBNET).$(LIBNET_SUFFIX)) @@ -29,15 +29,16 @@ LIBNET_DIR := $(BUILDDIR)/$(LIBNET) # Prepare # ---------------------------------------------------------------------------- -# -# autoconf -# LIBNET_CONF_TOOL := autoconf - LIBNET_CONF_ENV := \ $(CROSS_ENV) \ libnet_cv_have_packet_socket=yes +LIBNET_CONF_OPT := \ + $(CROSS_AUTOCONF_USR) \ + --disable-samples \ + --with-link-layer=linux + # ---------------------------------------------------------------------------- # Target-Install # ---------------------------------------------------------------------------- |