From f157f622a5728a6cbda254b8f819ca3e21f47fb7 Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Fri, 3 Aug 2012 13:32:39 +0000 Subject: [PATCH] [package] xtables-addons: fix build for 64-bits targets The first fix is a pointer comparison fix, and the second is not to override the Linux kernel's TARGET_LDFLAGS with those that we use during cross-compiling. SVN-Revision: 32958 --- net/xtables-addons/Makefile | 4 +--- net/xtables-addons/patches/200-add-lua-packetscript.patch | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/net/xtables-addons/Makefile b/net/xtables-addons/Makefile index 7c5d1c906a..27f170bd70 100644 --- a/net/xtables-addons/Makefile +++ b/net/xtables-addons/Makefile @@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=xtables-addons PKG_VERSION:=1.42 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_MD5SUM:=7c996a0400667b57ab4fb53a013ae742 @@ -44,7 +44,6 @@ define Build/Compile CROSS_COMPILE="$(TARGET_CROSS)" \ DESTDIR="$(PKG_INSTALL_DIR)" \ DEPMOD="/bin/true" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ all endef @@ -54,7 +53,6 @@ define Build/Install CROSS_COMPILE="$(TARGET_CROSS)" \ DESTDIR="$(PKG_INSTALL_DIR)" \ DEPMOD="/bin/true" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ install endef diff --git a/net/xtables-addons/patches/200-add-lua-packetscript.patch b/net/xtables-addons/patches/200-add-lua-packetscript.patch index af7d1bc8eb..03fe5fa9ff 100644 --- a/net/xtables-addons/patches/200-add-lua-packetscript.patch +++ b/net/xtables-addons/patches/200-add-lua-packetscript.patch @@ -18014,7 +18014,7 @@ + else if (pskb->transport_header) + p->start = pskb->transport_header; + p->offset = 0; -+ p->length = pskb->tail - p->start; ++ p->length = (unsigned long)pskb->tail - (unsigned long)p->start; + p->changes = NULL; + + /* marking userdata 'lua_packet_seg' with the corresponding metatable */ -- 2.30.2