Skip to content
Snippets Groups Projects
Commit 848b0f08 authored by Steve Lhomme's avatar Steve Lhomme
Browse files

contrib: zvbi: fix Android usage of pthread

- pthread_create is not detected properly with the NDK26.
- pthread_cancel is called but it's not supported by Android, it's probably dead code that is removed during linking
parent 5858d5c2
No related branches found
No related tags found
1 merge request!5225contrib: zvbi: fix Android usage of pthread
Pipeline #458702 passed with warnings with stage
in 2 hours, 39 minutes, and 19 seconds
......@@ -27,6 +27,8 @@ endif
ifdef HAVE_ANDROID
$(APPLY) $(SRC)/zvbi/zvbi-android.patch
endif
# check for pthread_create in pthreads as well
sed -i.orig "s/AC_CHECK_LIB(pthread, pthread_create,,/AC_SEARCH_LIBS([pthread_create], [pthread pthreads],,/" $(UNPACK_DIR)/configure.in
$(MOVE)
DEPS_zvbi = png $(DEPS_png) iconv $(DEPS_iconv)
......@@ -36,6 +38,11 @@ ZVBICONF := \
--disable-nls --disable-proxy \
--without-doxygen
ifdef HAVE_ANDROID
# discard bogus pthread_cancel calls
ZVBICONF += CFLAGS="$(CFLAGS) -Wno-implicit-function-declaration"
endif
ifdef HAVE_WIN32
DEPS_zvbi += winpthreads $(DEPS_winpthreads)
endif
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment