kodi: update triplets for the void arm*-musl cross compilers.
Only require java and swig if building on glibc.
This commit is contained in:
parent
1601b6e92c
commit
c253e916ff
2 changed files with 28 additions and 21 deletions
|
@ -46,21 +46,6 @@
|
|||
#include <memory.h>
|
||||
|
||||
#define WRITE_STR(str, size, file) fwrite(str, size, 1, file)
|
||||
--- ./m4/xbmc_arch.m4.orig
|
||||
+++ ./m4/xbmc_arch.m4
|
||||
@@ -2,10 +2,10 @@
|
||||
|
||||
# host detection and setup
|
||||
case $host in
|
||||
- i*86*-linux-gnu*|i*86*-*-linux-uclibc*)
|
||||
+ i*86*-linux-gnu*|i*86*-*-linux-uclibc|*i*86*-linux-musl*)
|
||||
AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX")
|
||||
;;
|
||||
- x86_64-*-linux-gnu*|x86_64-*-linux-uclibc*)
|
||||
+ x86_64-*-linux-gnu*|x86_64-*-linux-uclibc*|x86_64-*-linux-musl*)
|
||||
AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX")
|
||||
;;
|
||||
i386-*-freebsd*)
|
||||
--- ./configure.ac.orig
|
||||
+++ ./configure.ac
|
||||
@@ -604,7 +604,7 @@
|
||||
|
@ -90,10 +75,10 @@
|
|||
ARCH="arm"
|
||||
use_arch="arm"
|
||||
use_joystick=no
|
||||
--- ./m4/xbmc_arch.m4.orig
|
||||
+++ ./m4/xbmc_arch.m4
|
||||
@@ -2,10 +2,10 @@
|
||||
|
||||
--- ./m4/xbmc_arch.m4.orig 2015-10-19 08:31:15.000000000 +0200
|
||||
+++ ./m4/xbmc_arch.m4 2015-11-05 18:50:57.346659240 +0100
|
||||
@@ -2,10 +2,10 @@ AC_DEFUN([XBMC_SETUP_ARCH_DEFINES],[
|
||||
|
||||
# build detection and setup - this is the native arch
|
||||
case $build in
|
||||
- i*86*-linux-gnu*|i*86*-*-linux-uclibc*)
|
||||
|
@ -105,7 +90,7 @@
|
|||
AC_SUBST(NATIVE_ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX")
|
||||
;;
|
||||
i386-*-freebsd*)
|
||||
@@ -23,7 +23,7 @@
|
||||
@@ -23,7 +23,7 @@ case $build in
|
||||
powerpc64-*-linux-gnu*|powerpc64-*-linux-uclibc*)
|
||||
AC_SUBST(NATIVE_ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX -D_POWERPC64")
|
||||
;;
|
||||
|
@ -114,3 +99,25 @@
|
|||
AC_SUBST(NATIVE_ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX")
|
||||
;;
|
||||
*)
|
||||
@@ -33,10 +33,10 @@ esac
|
||||
|
||||
# host detection and setup - this is the target arch
|
||||
case $host in
|
||||
- i*86*-linux-gnu*|i*86*-*-linux-uclibc*)
|
||||
+ i*86*-linux-gnu*|i*86*-*-linux-uclibc|*i*86*-linux-musl*)
|
||||
AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX")
|
||||
;;
|
||||
- x86_64-*-linux-gnu*|x86_64-*-linux-uclibc*)
|
||||
+ x86_64-*-linux-gnu*|x86_64-*-linux-uclibc*|x86_64-*-linux-musl*)
|
||||
AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX")
|
||||
;;
|
||||
i386-*-freebsd*)
|
||||
@@ -60,7 +60,7 @@ case $host in
|
||||
powerpc64-*-linux-gnu*|powerpc64-*-linux-uclibc*)
|
||||
AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX -D_POWERPC64")
|
||||
;;
|
||||
- arm*-*-linux-gnu*|arm*-*-linux-uclibc*)
|
||||
+ arm*-*-linux-gnu*|arm*-*-linux-uclibc*|arm*-linux-musl*)
|
||||
AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX")
|
||||
;;
|
||||
mips*-*-linux-gnu*|mips*-*-linux-uclibc*)
|
||||
|
|
|
@ -38,7 +38,7 @@ depends="libbluray libmad libvorbis libcurl libflac libmodplug libass libmpeg2
|
|||
depends+=" glxinfo hicolor-icon-theme desktop-file-utils xdpyinfo"
|
||||
|
||||
# musl builds need generated addons (no java).
|
||||
case "$XBPS_TARGET_MACHINE" in
|
||||
case "$XBPS_MACHINE" in
|
||||
*-musl) _kodi_nojava=yes;;
|
||||
*) hostmakedepends+=" swig openjdk-jre";;
|
||||
esac
|
||||
|
|
Loading…
Reference in a new issue