[Android] [PATCH] Force failed detection of search.h, tdestroy and tfind

Victorien Le Couviour--Tuffet victorien.lecouviour.tuffet at gmail.com
Tue Oct 9 08:11:27 CEST 2018


Fixes build with the NDK 17

Force failed detection of search.h in order to avoid conflicts with
vlc_fixups.
Force failed detection of tdestroy so that fixups will declare it.
Force failed detection of tfind so that twalk compat function is always
built (since it's sometimes missing), along with its matching
implementation of tfind.
---

Add tfind to failed detections of tree functions since twalk might be
missing, and so we don't need a single patch regarding this on VLC.

 compile-libvlc.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/compile-libvlc.sh b/compile-libvlc.sh
index a20598450..df89e5ab3 100755
--- a/compile-libvlc.sh
+++ b/compile-libvlc.sh
@@ -545,6 +545,11 @@ else
     VLC_LDFLAGS="${VLC_LDFLAGS} -L${NDK_LIB_DIR} -landroid_support"
 fi
 
+# always use fixups and compat for search.h
+export ac_cv_header_search_h=no
+export ac_cv_func_tdestroy=no
+export ac_cv_func_tfind=no
+
 if [ ! -e ./config.h -o "$RELEASE" = 1 ]; then
 CFLAGS="${VLC_CFLAGS} ${EXTRA_CFLAGS}" \
 CXXFLAGS="${VLC_CXXFLAGS} ${EXTRA_CFLAGS} ${EXTRA_CXXFLAGS}" \
-- 
2.19.1



More information about the Android mailing list