[Android] build: force failed detection of search.h and tdestroy

Victorien Le Couviour--Tuffet git at videolan.org
Tue Oct 23 17:26:42 CEST 2018


vlc-android | branch: 4.0 | Victorien Le Couviour--Tuffet <victorien.lecouviour.tuffet at gmail.com> | Wed Sep 26 22:12:33 2018 +0200| [ed13f713b17a888460ae0b0791b66dbe48c192ba] | committer: Thomas Guillem

build: force failed detection of search.h and tdestroy

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. Since tfind
is always available (found) tdestroy compat function will never be built (which
is the wanted behaviour since it is always available too).

> https://code.videolan.org/videolan/vlc-android/commit/ed13f713b17a888460ae0b0791b66dbe48c192ba
---

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

diff --git a/compile-libvlc.sh b/compile-libvlc.sh
index c7fa567cc..9e65c8398 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 for search.h and tdestroy
+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}" \



More information about the Android mailing list