From 2549b0cbb8cc6812be18f1b903349a1b025e5670 Mon Sep 17 00:00:00 2001 From: marmeladema Date: Tue, 16 Mar 2021 22:22:08 +0000 Subject: [PATCH] kodi: enable cross compilation for 32bit arm architectures --- srcpkgs/kodi/template | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template index 8bb2a2965731b7..c64d926eb0102d 100644 --- a/srcpkgs/kodi/template +++ b/srcpkgs/kodi/template @@ -42,7 +42,7 @@ fi lib32disabled=yes archs="i686* x86_64* aarch64* - ppc64*" + ppc64* armv6l* armv7l*" hostmakedepends=" automake libtool pkg-config gperf cmake gettext zip unzip nasm yasm python3-devel @@ -60,7 +60,7 @@ makedepends=" giflib-devel libxslt-devel gnutls-devel libssh-devel libmicrohttpd-devel libcec-devel dcadec-devel flatbuffers-devel fmt-devel lcms2-devel libfstrcmp-devel rapidjson libcdio-paranoia spdlog libwaylandpp-devel - libinput-devel libdav1d-devel gtest-devel" + libinput-devel libdav1d-devel gtest-devel python3-devel" # The following dependencies are dlopen(3)ed. depends="libbluray libmad libvorbis libcurl libflac libmodplug libass libmpeg2 @@ -81,12 +81,6 @@ _gtest_filter+=":TestWebServer.CanGetRangedFileRangeFirstSecond" _gtest_filter+=":TestWebServer.CanGetRangedFileRangeFirstSecondLast" case "$XBPS_TARGET_MACHINE" in - aarch64*) - hostmakedepends+=" libmariadbclient-devel SDL2_image-devel lzo-devel" - hostmakedepends+=" libwaylandpp-devel" - makedepends+=" python3-devel ffmpeg-devel" - configure_args+=" -DENABLE_VAAPI=OFF" - ;; i686) # Additionaly disable these tests on i686 architecutre # https://github.com/void-linux/void-packages/commit/3c0332ab330e30a2c280de2258ed9bf60a9c2e09/checks/2101961301/logs @@ -98,6 +92,15 @@ esac if [ -z "$CROSS_BUILD" ]; then make_build_target+=" kodi-test" +else + hostmakedepends+=" libmariadbclient-devel SDL2_image-devel lzo-devel + libwaylandpp-devel" +fi + +if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then + makedepends+=" libatomic-devel" + configure_args+=" -DCMAKE_EXE_LINKER_FLAGS=-latomic" + LDFLAGS+=" -latomic" fi pre_configure() {