diff options
Diffstat (limited to 'community/kodi/fix-musl.patch')
| -rw-r--r-- | community/kodi/fix-musl.patch | 48 |
1 files changed, 25 insertions, 23 deletions
diff --git a/community/kodi/fix-musl.patch b/community/kodi/fix-musl.patch index 75a7b07f32..a5a9d92141 100644 --- a/community/kodi/fix-musl.patch +++ b/community/kodi/fix-musl.patch @@ -1,38 +1,27 @@ ---- ./xbmc/cores/DllLoader/ldt_keeper.c.orig -+++ ./xbmc/cores/DllLoader/ldt_keeper.c -@@ -48,7 +48,7 @@ - #if defined(__GLIBC__) && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 0)) - _syscall3( int, modify_ldt, int, func, void *, ptr, unsigned long, bytecount ); - #else --#if defined(TARGET_ANDROID) && defined(__i386__) && !defined(modify_ldt) -+#if defined(__linux__) && !defined(__GLIBC__) && !defined(modify_ldt) - #define modify_ldt(a,b,c) syscall( __NR_modify_ldt, a, b, c); - #else - int modify_ldt(int func, void *ptr, unsigned long bytecount); diff --git a/configure.ac b/configure.ac -index 5d47a4a..3860e32 100644 +index 9bd8d6e..205acfc 100644 --- a/configure.ac +++ b/configure.ac -@@ -564,7 +564,7 @@ case $host in +@@ -526,7 +526,7 @@ case $host in use_x11=no - build_shared_lib=yes + build_shared_lib=yes ;; - i*86*-linux-gnu*|i*86*-*-linux-uclibc*) + i*86*-linux-*) target_platform=target_linux + CORE_SYSTEM_NAME=linux ARCH="i486-linux" - if test "$use_cpu" = "no" -a "$cross_compiling" = "yes"; then -@@ -586,7 +586,7 @@ case $host in +@@ -549,7 +549,7 @@ case $host in fi fi ;; - x86_64-*-linux-gnu*|x86_64-*-linux-uclibc*) + x86_64-*-linux-*) target_platform=target_linux + CORE_SYSTEM_NAME=linux ARCH="x86_64-linux" - if test "$use_cpu" = "no" -a "$cross_compiling" = "yes"; then diff --git a/m4/xbmc_arch.m4 b/m4/xbmc_arch.m4 -index 0b66a82..5198263 100644 +index d28f263..6fb6210 100644 --- a/m4/xbmc_arch.m4 +++ b/m4/xbmc_arch.m4 @@ -2,10 +2,10 @@ AC_DEFUN([XBMC_SETUP_ARCH_DEFINES],[ @@ -86,11 +75,11 @@ index 0b66a82..5198263 100644 + powerpc-*-linux-*) AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX -D_POWERPC") ;; -- powerpc64-*-linux-gnu*|powerpc64-*-linux-uclibc*) -+ powerpc64-*-linux-*) +- powerpc64*-*-linux-gnu*|powerpc64*-*-linux-uclibc*) ++ powerpc64*-*-linux-*) AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX -D_POWERPC64") ;; -- arm*-*-linux-gnu*|arm*-*-linux-uclibc*) +- arm*-*-linux-gnu*|arm*-*-linux-uclibc*|aarch64*-*-linux-gnu*|aarch64*-*-linux-uclibc*) + arm*-*-linux-*) AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX") ;; @@ -100,10 +89,10 @@ index 0b66a82..5198263 100644 ;; *-*linux-android*) diff --git a/tools/depends/configure.ac b/tools/depends/configure.ac -index 12935e3..fdd5bf3 100644 +index 3626ea5..f178f7a 100644 --- a/tools/depends/configure.ac +++ b/tools/depends/configure.ac -@@ -97,13 +97,13 @@ platform_cc=gcc +@@ -120,13 +120,13 @@ platform_cc=gcc platform_cxx=g++ case $build in @@ -120,3 +109,16 @@ index 12935e3..fdd5bf3 100644 build_os="linux" ;; *darwin*) +diff --git a/xbmc/cores/DllLoader/ldt_keeper.c b/xbmc/cores/DllLoader/ldt_keeper.c +index 3fe6854..ca78612 100644 +--- a/xbmc/cores/DllLoader/ldt_keeper.c ++++ b/xbmc/cores/DllLoader/ldt_keeper.c +@@ -48,7 +48,7 @@ extern "C" { + #if defined(__GLIBC__) && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 0)) + _syscall3( int, modify_ldt, int, func, void *, ptr, unsigned long, bytecount ); + #else +-#if defined(TARGET_ANDROID) && defined(__i386__) && !defined(modify_ldt) ++#if defined(__linux__) && !defined(__GLIBC__) && !defined(modify_ldt) + #define modify_ldt(a,b,c) syscall( __NR_modify_ldt, a, b, c); + #else + int modify_ldt(int func, void *ptr, unsigned long bytecount); |