Skip to content

Commit

Permalink
Test commit Android
Browse files Browse the repository at this point in the history
  • Loading branch information
phunkyfish committed Aug 13, 2024
1 parent bd985b7 commit 49fcf8b
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 1 deletion.
27 changes: 27 additions & 0 deletions depends/common/libzvbi/0011-fix-android-ndk-26.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
From 2edb528dcbc848f9f9b3e11433a7d150d7351caa Mon Sep 17 00:00:00 2001
From: Sam Nazarko <[email protected]>
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 <[email protected]>
---
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

6 changes: 5 additions & 1 deletion depends/common/libzvbi/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 49fcf8b

Please sign in to comment.