From 3f189a24f23d5540441384ad2581f3f4886344df Mon Sep 17 00:00:00 2001
From: Brent Cook <busterb@gmail.com>
Date: Tue, 1 Jan 2019 22:59:47 -0600
Subject: [PATCH 1/3] check if we need to link pthread dynamically

On Linux, bionic and musl for instance do not need libpthread. With
bionic, there is not even a stub library for compatibility.
---
 m4/check-libc.m4       | 1 +
 m4/check-os-options.m4 | 4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)

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

From b6479e01f64ef3f1f0616592f5139956c8b6dc25 Mon Sep 17 00:00:00 2001
From: Brent Cook <busterb@gmail.com>
Date: Tue, 1 Jan 2019 23:07:00 -0600
Subject: [PATCH 2/3] define in_port_t for Android

---
 include/compat/netinet/in.h | 9 +++++++++
 1 file changed, 9 insertions(+)

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

From 3247230d47b896afa0819415ed953e9e9af57dfe Mon Sep 17 00:00:00 2001
From: Brent Cook <busterb@gmail.com>
Date: Fri, 4 Jan 2019 07:28:54 -0600
Subject: [PATCH 3/3] rename modes_lcl patch so it applies

---
 patches/{modes_lcl.h => modes_lcl.h.patch} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename patches/{modes_lcl.h => modes_lcl.h.patch} (100%)

diff --git a/patches/modes_lcl.h b/patches/modes_lcl.h.patch
similarity index 100%
rename from patches/modes_lcl.h
rename to patches/modes_lcl.h.patch