Fix build errors on Android
Get series with b4
b4 am [email protected]Versions newest first
- v1 Latest3 patches 4 repliesIn review
Patches in v1 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/3 | android: libiptc: Fix socklen_t type mismatch on Androidlibiptc/ libiptc/ | +2 | 1 reply | |
| 2/3 | android: Don't include conflicting headersinclude/ | +1 | 2 replies | |
| 3/3 | android: build: Blacklist TCPOPTSTRIP on systems that lack TCPOPT_*configure.ac | +8 | 1 reply |
Reviews trailers per patch
No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.
Cover letter [PATCH iptables 0/3] Fix build errors on Android
The current head of tree is not buildable with Android NDK r9 due to a few small incompatibilities. This series attempts to address them.
Android normally bundles a version of iptables which has additional deltas (xt_quota2 match, xt_IDLETIMER modifications) from mainline. I will not address those here.
With my patches applied, this produces a usable ARM xtables-multi binary:
NDK=/opt/android-ndk-r9
export PATH=$NDK/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86_64/bin:$PATH ./autogen.sh
./configure --host=arm-linux-androideabi \
--disable-shared --enable-static \
CFLAGS="--sysroot=$NDK/platforms/android-8/arch-arm"make
I retested x86 PC builds to make sure that nothing else broke.
Another way to handle the TCPOPTSTRIP issue is to add #ifndef's in libxt_TCPOPTSTRIP.c for each missing constant, similar to how TCPOPT_MD5SIG is currently done. If this is preferred, let me know.
Kevin Cernekee (3):
android: libiptc: Fix socklen_t type mismatch on Android
android: Don't include conflicting headers
android: build: Blacklist TCPOPTSTRIP on systems that lack TCPOPT_*
configure.ac | 8 ++++++++ include/libiptc/ipt_kernel_headers.h | 2 +- libiptc/libip4tc.c | 2 +- libiptc/libip6tc.c | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-)
Signature · 1 line
1.7.9.5