From 7434c476c3e8743841c4bdcd1dda54f673590bf2 Mon Sep 17 00:00:00 2001 From: Kevin Cernekee Date: Wed, 11 Feb 2015 15:22:51 -0800 Subject: [PATCH] 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. --- ChangeLog | 6 ++++++ m4/getdtablesize.m4 | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 35e9e4da19..f38a67845c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -32,6 +32,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 uniname/unimame-tests: don't link with -lunistring diff --git a/m4/getdtablesize.m4 b/m4/getdtablesize.m4 index a6b6c1b6c5..3ad204c351 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.39.5