Test commit Android

xbmc · Aug 14, 2024 · 2152ade · 2152ade
1 parent bd985b7
commit 2152ade
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/depends/common/libzvbi/0011-fix-android-ndk-26.patch b/depends/common/libzvbi/0011-fix-android-ndk-26.patch
@@ -0,0 +1,12 @@
+diff --color -aur a/configure.ac b/configure.ac
+--- a/configure.ac	2023-08-25 16:50:40
++++ b/configure.ac	2024-08-13 11:48:38
+@@ -248,7 +248,7 @@
+ dnl When upgrading to autoconf 2.71, AC_TRY_LINK deprecated and replaced
+ dnl with AC_LINK_IFELSE.
+ dnl
+-AC_CHECK_LIB(pthread, pthread_create,,[
++AC_SEARCH_LIBS([pthread_create], [pthread pthreads],,[
+   AC_CHECK_LIB(pthreadGC2, pthread_create,,[
+     AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[pthread_create();]])],[],[
+       # same as previous, but use '-pthread' instead of '-lpthread'
diff --git a/depends/common/libzvbi/CMakeLists.txt b/depends/common/libzvbi/CMakeLists.txt
@@ -5,7 +5,11 @@ cmake_minimum_required(VERSION 3.5)
 list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR})
 
 list(APPEND zvbi_conf CPPFLAGS=-I${CMAKE_INSTALL_PREFIX}/include)
-list(APPEND zvbi_conf CFLAGS=-I${CMAKE_INSTALL_PREFIX}/include)
+if (CORE_SYSTEM_NAME STREQUAL android)
+  list(APPEND zvbi_conf CFLAGS="-I${CMAKE_INSTALL_PREFIX}/include -Wno-implicit-function-declaration")
+else()
+  list(APPEND zvbi_conf CFLAGS=-I${CMAKE_INSTALL_PREFIX}/include)
+endif()
 list(APPEND zvbi_conf LDFLAGS=-L${CMAKE_INSTALL_PREFIX}/lib)
 if (CORE_SYSTEM_NAME STREQUAL android)
   list(APPEND zvbi_conf LIBS=-liconv)