[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 03/11] getdtablesize: Fix Android build
From: |
Kevin Cernekee |
Subject: |
[PATCH 03/11] getdtablesize: Fix Android build |
Date: |
Wed, 11 Feb 2015 15:22:51 -0800 |
* m4/getdtablesize.m4: Add Android case to host OS check. Recent NDK
versions have this symbol in the .so library (at least 32-bit
platforms) but are missing the declaration in the header file,
causing the m4 logic to guess incorrectly.
---
ChangeLog | 6 ++++++
m4/getdtablesize.m4 | 4 +++-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index ad394da93ae3..c1a37f5f1504 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,6 +22,12 @@
test case passed when running on an Android host, and the code
hasn't really changed since 2009.
+ getdtablesize: Fix Android build
+ * m4/getdtablesize.m4: Add Android case to host OS check. Recent NDK
+ versions have this symbol in the .so library (at least 32-bit
+ platforms) but are missing the declaration in the header file,
+ causing the m4 logic to guess incorrectly.
+
2015-02-08 Daiki Ueno <address@hidden>
uniname/unimame-tests: don't link with -lunistring
diff --git a/m4/getdtablesize.m4 b/m4/getdtablesize.m4
index a6b6c1b6c52c..3ad204c35138 100644
--- a/m4/getdtablesize.m4
+++ b/m4/getdtablesize.m4
@@ -26,7 +26,9 @@ AC_DEFUN([gl_FUNC_GETDTABLESIZE],
[gl_cv_func_getdtablesize_works=yes],
[gl_cv_func_getdtablesize_works=no],
[case "$host_os" in
- cygwin*) # on cygwin 1.5.25, getdtablesize() automatically grows
+ cygwin*|*-android*)
+ # on cygwin 1.5.25, getdtablesize() automatically grows
+ # on Android API level >= 21, the declaration is missing from
unistd.h
gl_cv_func_getdtablesize_works="guessing no" ;;
*) gl_cv_func_getdtablesize_works="guessing yes" ;;
esac])
--
2.2.0.rc0.207.ga3a616c
- [PATCH 00/11] Android compatibility, Kevin Cernekee, 2015/02/11
- [PATCH 01/11] Fix FILE struct compatibility with Android API level >= 21, Kevin Cernekee, 2015/02/11
- [PATCH 02/11] Assume unbroken ungetc() on Android, Kevin Cernekee, 2015/02/11
- [PATCH 03/11] getdtablesize: Fix Android build,
Kevin Cernekee <=
- [PATCH 04/11] localename: Fix Android build, Kevin Cernekee, 2015/02/11
- [PATCH 06/11] euidaccess: Fix Android build, Kevin Cernekee, 2015/02/11
- [PATCH 08/11] net_if: Handle content-free <net/if.h> system headers, Kevin Cernekee, 2015/02/11
- [PATCH 07/11] linkat_nofollow: Add fallback case for cross compiling, Kevin Cernekee, 2015/02/11
- [PATCH 05/11] getugroups: Fix Android build, Kevin Cernekee, 2015/02/11
- [PATCH 09/11] signal_h: Fix Android build, Kevin Cernekee, 2015/02/11
- [PATCH 11/11] getdtablesize: Fix RLIMIT_NOFILE fallback case, Kevin Cernekee, 2015/02/11
- [PATCH 10/11] duplocale: Fix Android build of duplocale-tests, Kevin Cernekee, 2015/02/11
- Re: [PATCH 00/11] Android compatibility, Paul Eggert, 2015/02/11