Land #488, Android build fixes

4 files changed, 11 insertions, 3 deletions

diff --git a/include/compat/netinet/in.h b/include/compat/netinet/in.h
index 20e57b8..d1afb27 100644
--- a/include/compat/netinet/in.h
+++ b/include/compat/netinet/in.h
@@ -8,3 +8,12 @@
 #else
 #include <win32netcompat.h>
 #endif
+
+#ifndef LIBCRYPTOCOMPAT_NETINET_IN_H
+#define LIBCRYPTOCOMPAT_NETINET_IN_H
+
+#ifdef __ANDROID__
+typedef uint16_t in_port_t;
+#endif
+
+#endif
diff --git a/m4/check-libc.m4 b/m4/check-libc.m4
index a4df0b7..85d253a 100644
--- a/m4/check-libc.m4
+++ b/m4/check-libc.m4
@@ -130,6 +130,7 @@ AC_CHECK_FUNCS([getauxval])
 AC_SEARCH_LIBS([dl_iterate_phdr],[dl])
 AC_CHECK_FUNCS([dl_iterate_phdr])
 
+AC_SEARCH_LIBS([pthread_once],[pthread])
 AC_SEARCH_LIBS([clock_gettime],[rt posix4])
 AC_CHECK_FUNCS([clock_gettime])
 AM_CONDITIONAL([HAVE_CLOCK_GETTIME], [test "x$ac_cv_func_clock_gettime" = xyes])
diff --git a/m4/check-os-options.m4 b/m4/check-os-options.m4
index 414e63d..9fc0faf 100644
--- a/m4/check-os-options.m4
+++ b/m4/check-os-options.m4
@@ -9,7 +9,7 @@ case $host_os in
                 if test "`echo $CC | cut -d ' ' -f 1`" != "gcc" ; then
                         CFLAGS="-qnoansialias $USER_CFLAGS"
                 fi
-                AC_SUBST([PLATFORM_LDADD], ['-lperfstat -lpthread'])
+                AC_SUBST([PLATFORM_LDADD], ['-lperfstat'])
                 ;;
         *cygwin*)
                 HOST_OS=cygwin
@@ -74,13 +74,11 @@ char buf[1]; getentropy(buf, 1);
                         CFLAGS="-g -O2 +DD64 +Otype_safety=off $USER_CFLAGS"
                 fi
                 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=600 -D__STRICT_ALIGNMENT"
-                AC_SUBST([PLATFORM_LDADD], ['-lpthread'])
                 ;;
         *linux*)
                 HOST_OS=linux
                 HOST_ABI=elf
                 CPPFLAGS="$CPPFLAGS -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_SOURCE -D_GNU_SOURCE"
-                AC_SUBST([PLATFORM_LDADD], ['-lpthread'])
                 ;;
         *netbsd*)
                 HOST_OS=netbsd
diff --git a/patches/modes_lcl.h b/patches/modes_lcl.h.patch
index 1ba9f2e..1ba9f2e 100644
--- a/patches/modes_lcl.h
+++ b/patches/modes_lcl.h.patch