Re: [OpenWrt-Devel] [iptables] iptables broken ?

2012-11-25 Thread shazz
oh ! the mighty underscore :)

I try !

On Sun, Nov 25, 2012 at 1:12 AM, Szabolcs Nagy n...@port70.net wrote:
 * Frank Meerk?tter fr...@meerkoetter.org [2012-11-24 22:25:26 +0100]:
 On 24/11/12 20:49, shazz wrote:
  error: nested redefinition of 'enum tcp_ca_state'
  /var/www/LOG/openwrt/tpl703n/trunk/build_dir/linux-ar71xx_generic_eglibc-2.16/linux-3.3.8/user_headers/include/linux/tcp.h:117:6:

 Revert
 4cf1359d5dc38debc89834d895f9a3951044bf90
 [package] iptables: add some musl portability fixes
 as a workaround.


 there seems to be a typo in the iptables musl_fixes.patch:

 diff --git a/package/network/utils/iptables/patches/300-musl_fixes.patch 
 b/package/network/utils/iptables/patches/300-musl_fixe
 index b6f6a0e..e329aa9 100644
 --- a/package/network/utils/iptables/patches/300-musl_fixes.patch
 +++ b/package/network/utils/iptables/patches/300-musl_fixes.patch
 @@ -66,7 +66,7 @@
   #define _XT_OSF_H

   #include linux/types.h
 -+#if !defined(__UCLIBC__)  !defined(__GLIBC_)
 ++#if !defined(__UCLIBC__)  !defined(__GLIBC__)
  +#include linux/tcp.h
  +#endif

 ___
 openwrt-devel mailing list
 openwrt-devel@lists.openwrt.org
 https://lists.openwrt.org/mailman/listinfo/openwrt-devel
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel


[OpenWrt-Devel] [iptables] iptables broken ?

2012-11-24 Thread shazz
Hi,

my 2 builds failed yesterday :
mips-openwrt-linux-gnu-gcc
-Wp,-MMD,./.libxt_hashlimit.oo.d,-MT,libxt_hashlimit.oo
-D_LARGEFILE_SOURCE=1 -D_LARGE_FILES -D_FILE_OFFSET_BITS=64
-D_REENTRANT -Wall -Waggregate-return -Wmissing-declarations
-Wmissing-prototypes -Wredundant-decls -Wshadow -Wstrict-prototypes
-Winline -pipe  -DXTABLES_LIBDIR=\/usr/lib/iptables\
-DXTABLES_INTERNAL -I../include -I../include -I
/var/www/LOG/openwrt/tpl703n/trunk/build_dir/linux-ar71xx_generic_eglibc-2.16/linux-3.3.8/user_headers/include
-I 
/var/www/LOG/openwrt/tpl703n/trunk/build_dir/linux-ar71xx_generic_eglibc-2.16/linux-3.3.8/user_headers/include
-D_INIT=libxt_hashlimit_init -DPIC -fPIC -Os -pipe -mips32r2
-mtune=mips32r2 -fno-caller-saves -fhonour-copts
-Wno-error=unused-but-set-variable -msoft-float
-I/var/www/LOG/openwrt/tpl703n/trunk/build_dir/linux-ar71xx_generic_eglibc-2.16/iptables-1.4.10/include
-I/var/www/LOG/openwrt/tpl703n/trunk/build_dir/linux-ar71xx_generic_eglibc-2.16/linux-3.3.8/user_headers/include
 -o libxt_hashlimit.oo -c libxt_hashlimit.c;
mips-openwrt-linux-gnu-gcc  -shared
-L/var/www/LOG/openwrt/tpl703n/trunk/staging_dir/target-mips_r2_eglibc-2.16/usr/lib
-L/var/www/LOG/openwrt/tpl703n/trunk/staging_dir/target-mips_r2_eglibc-2.16/lib
-L/var/www/LOG/openwrt/tpl703n/trunk/staging_dir/toolchain-mips_r2_gcc-4.7-linaro_eglibc-2.16/usr/lib
-L/var/www/LOG/openwrt/tpl703n/trunk/staging_dir/toolchain-mips_r2_gcc-4.7-linaro_eglibc-2.16/lib
 -o libxt_hashlimit.so libxt_hashlimit.oo;
mips-openwrt-linux-gnu-gcc -Wp,-MMD,./.libxt_osf.oo.d,-MT,libxt_osf.oo
-D_LARGEFILE_SOURCE=1 -D_LARGE_FILES -D_FILE_OFFSET_BITS=64
-D_REENTRANT -Wall -Waggregate-return -Wmissing-declarations
-Wmissing-prototypes -Wredundant-decls -Wshadow -Wstrict-prototypes
-Winline -pipe  -DXTABLES_LIBDIR=\/usr/lib/iptables\
-DXTABLES_INTERNAL -I../include -I../include -I
/var/www/LOG/openwrt/tpl703n/trunk/build_dir/linux-ar71xx_generic_eglibc-2.16/linux-3.3.8/user_headers/include
-I 
/var/www/LOG/openwrt/tpl703n/trunk/build_dir/linux-ar71xx_generic_eglibc-2.16/linux-3.3.8/user_headers/include
-D_INIT=libxt_osf_init -DPIC -fPIC -Os -pipe -mips32r2 -mtune=mips32r2
-fno-caller-saves -fhonour-copts -Wno-error=unused-but-set-variable
-msoft-float 
-I/var/www/LOG/openwrt/tpl703n/trunk/build_dir/linux-ar71xx_generic_eglibc-2.16/iptables-1.4.10/include
-I/var/www/LOG/openwrt/tpl703n/trunk/build_dir/linux-ar71xx_generic_eglibc-2.16/linux-3.3.8/user_headers/include
 -o libxt_osf.oo -c libxt_osf.c;
In file included from ../include/linux/netfilter/xt_osf.h:25:0,
 from libxt_osf.c:38:
/var/www/LOG/openwrt/tpl703n/trunk/build_dir/linux-ar71xx_generic_eglibc-2.16/linux-3.3.8/user_headers/include/linux/tcp.h:24:8:
error: redefinition of 'struct tcphdr'
In file included from libxt_osf.c:36:0:
/var/www/LOG/openwrt/tpl703n/trunk/staging_dir/toolchain-mips_r2_gcc-4.7-linaro_eglibc-2.16/lib/gcc/mips-openwrt-linux-gnu/4.7.3/../../../../mips-openwrt-linux-gnu/sys-include/netinet/tcp.h:92:8:
note: originally defined here
In file included from ../include/linux/netfilter/xt_osf.h:25:0,
 from libxt_osf.c:38:
/var/www/LOG/openwrt/tpl703n/trunk/build_dir/linux-ar71xx_generic_eglibc-2.16/linux-3.3.8/user_headers/include/linux/tcp.h:117:6:
error: nested redefinition of 'enum tcp_ca_state'
/var/www/LOG/openwrt/tpl703n/trunk/build_dir/linux-ar71xx_generic_eglibc-2.16/linux-3.3.8/user_headers/include/linux/tcp.h:117:6:
error: redeclaration of 'enum tcp_ca_state'
In file included from libxt_osf.c:36:0:
...

and a lot more redefinition errors.

Any idea ?
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel


Re: [OpenWrt-Devel] [iptables] iptables broken ?

2012-11-24 Thread Frank Meerkötter
On 24/11/12 20:49, shazz wrote:
 Hi,
 
 my 2 builds failed yesterday :
 mips-openwrt-linux-gnu-gcc
 -Wp,-MMD,./.libxt_hashlimit.oo.d,-MT,libxt_hashlimit.oo
[...]
 error: nested redefinition of 'enum tcp_ca_state'
 /var/www/LOG/openwrt/tpl703n/trunk/build_dir/linux-ar71xx_generic_eglibc-2.16/linux-3.3.8/user_headers/include/linux/tcp.h:117:6:
 error: redeclaration of 'enum tcp_ca_state'
 In file included from libxt_osf.c:36:0:
 ...
 
 and a lot more redefinition errors.
 
 Any idea ?

Revert
4cf1359d5dc38debc89834d895f9a3951044bf90 
[package] iptables: add some musl portability fixes
as a workaround.

Regards,
Frank


___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel


Re: [OpenWrt-Devel] [iptables] iptables broken ?

2012-11-24 Thread Szabolcs Nagy
* Frank Meerk?tter fr...@meerkoetter.org [2012-11-24 22:25:26 +0100]:
 On 24/11/12 20:49, shazz wrote:
  error: nested redefinition of 'enum tcp_ca_state'
  /var/www/LOG/openwrt/tpl703n/trunk/build_dir/linux-ar71xx_generic_eglibc-2.16/linux-3.3.8/user_headers/include/linux/tcp.h:117:6:
 
 Revert
 4cf1359d5dc38debc89834d895f9a3951044bf90 
 [package] iptables: add some musl portability fixes
 as a workaround.
 

there seems to be a typo in the iptables musl_fixes.patch:

diff --git a/package/network/utils/iptables/patches/300-musl_fixes.patch 
b/package/network/utils/iptables/patches/300-musl_fixe
index b6f6a0e..e329aa9 100644
--- a/package/network/utils/iptables/patches/300-musl_fixes.patch
+++ b/package/network/utils/iptables/patches/300-musl_fixes.patch
@@ -66,7 +66,7 @@
  #define _XT_OSF_H
  
  #include linux/types.h
-+#if !defined(__UCLIBC__)  !defined(__GLIBC_)
++#if !defined(__UCLIBC__)  !defined(__GLIBC__)
 +#include linux/tcp.h
 +#endif
  
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel