From 49fcf8b127c992ed9b251e477278006616a1c845 Mon Sep 17 00:00:00 2001 From: phunkyfish Date: Tue, 13 Aug 2024 12:01:31 +0100 Subject: [PATCH] Test commit Android --- .../libzvbi/0011-fix-android-ndk-26.patch | 27 +++++++++++++++++++ depends/common/libzvbi/CMakeLists.txt | 6 ++++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 depends/common/libzvbi/0011-fix-android-ndk-26.patch diff --git a/depends/common/libzvbi/0011-fix-android-ndk-26.patch b/depends/common/libzvbi/0011-fix-android-ndk-26.patch new file mode 100644 index 00000000..1e72d5f7 --- /dev/null +++ b/depends/common/libzvbi/0011-fix-android-ndk-26.patch @@ -0,0 +1,27 @@ +From 2edb528dcbc848f9f9b3e11433a7d150d7351caa Mon Sep 17 00:00:00 2001 +From: Sam Nazarko +Date: Sat, 11 May 2024 18:12:41 +0100 +Subject: [PATCH] Fix build where README file cannot be located by passing + foreign parameter to automake + +Signed-off-by: Sam Nazarko +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 77d6aed..6432334 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -10,7 +10,7 @@ AC_CONFIG_MACRO_DIRS([m4]) + AC_CONFIG_AUX_DIR(build-aux) + + dnl Automake initialization +-AM_INIT_AUTOMAKE([1.16 check-news dist-bzip2]) ++AM_INIT_AUTOMAKE([1.16 check-news dist-bzip2 foreign]) + + dnl Store the host string without "unknown" for cross-compile use + host_str=$host +-- +2.34.1 + diff --git a/depends/common/libzvbi/CMakeLists.txt b/depends/common/libzvbi/CMakeLists.txt index aaf846c7..c5a2c5e2 100644 --- 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)