Gitiles
Code Review Sign In
gerrit.openbmc.org / openbmc / openbmc / 5b9ede0403237c7dace972affa65cf64a1aadd0e / . / meta-openembedded / meta-multimedia / recipes-mediacenter / kodi / kodi-17 / 0009-build-Add-support-for-musl-triplets.patch
blob: f3e739aedbbf0f6c29655112bc624af826552db7 [file] [log] [blame]
Brad Bishop6e60e8b2018-02-01 10:27:11 -0500[diff] [blame]1From 8b2bad58585af0f829fb06e19c9bd2b6caf30808 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 6 Nov 2016 11:54:41 -0800
4Subject: [PATCH 09/10] build: Add support for musl triplets
5
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7---
8 configure.ac | 12 ++++++------
9 m4/xbmc_arch.m4 | 22 +++++++++++-----------
10 tools/depends/configure.ac | 12 ++++++------
11 3 files changed, 23 insertions(+), 23 deletions(-)
12
13diff --git a/configure.ac b/configure.ac
14index ab4eea3..925466a 100644
15--- a/configure.ac
16+++ b/configure.ac
17@@ -526,7 +526,7 @@ case $host in
18 use_x11=no
19 build_shared_lib=yes
20 ;;
21- i*86*-linux-gnu*|i*86*-*-linux-uclibc*)
22+ i*86*-linux-gnu*|i*86*-*-linux-uclibc*|i*86*-*-linux-musl*)
23 target_platform=target_linux
24 CORE_SYSTEM_NAME=linux
25 ARCH="i486-linux"
26@@ -549,7 +549,7 @@ case $host in
27 fi
28 fi
29 ;;
30- x86_64-*-linux-gnu*|x86_64-*-linux-uclibc*)
31+ x86_64-*-linux-gnu*|x86_64-*-linux-uclibc*|x86_64-*-linux-musl*)
32 target_platform=target_linux
33 CORE_SYSTEM_NAME=linux
34 ARCH="x86_64-linux"
35@@ -601,17 +601,17 @@ case $host in
36 DEPENDS_ROOT_FOR_XCODE=$(echo ${prefix%/*})
37 AC_SUBST([DEPENDS_ROOT_FOR_XCODE])
38 ;;
39- powerpc-*-linux-gnu*|powerpc-*-linux-uclibc*)
40+ powerpc-*-linux-gnu*|powerpc-*-linux-uclibc*|powerpc-*-linux-musl*)
41 target_platform=target_linux
42 CORE_SYSTEM_NAME=linux
43 ARCH="powerpc-linux"
44 ;;
45- powerpc64*-*-linux-gnu*|powerpc64*-*-linux-uclibc*)
46+ powerpc64*-*-linux-gnu*|powerpc64*-*-linux-uclibc*|powerpc64*-*-linux-musl*)
47 target_platform=target_linux
48 CORE_SYSTEM_NAME=linux
49 ARCH="powerpc64-linux"
50 ;;
51- arm*-*-linux-gnu*|arm*-*-linux-uclibc*)
52+ arm*-*-linux-gnu*|arm*-*-linux-uclibc*|arm*-*-linux-musl*)
53 target_platform=target_linux
54 CORE_SYSTEM_NAME=linux
55 ARCH="arm"
56@@ -621,7 +621,7 @@ case $host in
57 use_gl=no
58 USE_STATIC_FFMPEG=1
59 ;;
60- aarch64*-*-linux-gnu*|aarch64*-*-linux-uclibc*)
61+ aarch64*-*-linux-gnu*|aarch64*-*-linux-uclibc*|aarch64*-*-linux-musl*)
62 target_platform=target_linux
63 ARCH="aarch64"
64 use_arch="aarch64"
65diff --git a/m4/xbmc_arch.m4 b/m4/xbmc_arch.m4
66index d28f263..ff5dc20 100644
67--- a/m4/xbmc_arch.m4
68+++ b/m4/xbmc_arch.m4
69@@ -2,10 +2,10 @@ AC_DEFUN([XBMC_SETUP_ARCH_DEFINES],[
70
71 # build detection and setup - this is the native arch
72 case $build in
73- i*86*-linux-gnu*|i*86*-*-linux-uclibc*)
74+ i*86*-linux-gnu*|i*86*-*-linux-uclibc*|i*86*-*-linux-musl*)
75 AC_SUBST(NATIVE_ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX")
76 ;;
77- x86_64-*-linux-gnu*|x86_64-*-linux-uclibc*)
78+ x86_64-*-linux-gnu*|x86_64-*-linux-uclibc*|x86_64-*-linux-musl*)
79 AC_SUBST(NATIVE_ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX")
80 ;;
81 i386-*-freebsd*)
82@@ -17,13 +17,13 @@ case $build in
83 *86*-apple-darwin*)
84 AC_SUBST(NATIVE_ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_DARWIN -DTARGET_DARWIN_OSX -D_LINUX")
85 ;;
86- powerpc-*-linux-gnu*|powerpc-*-linux-uclibc*)
87+ powerpc-*-linux-gnu*|powerpc-*-linux-uclibc*|powerpc-*-linux-musl*)
88 AC_SUBST(NATIVE_ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX -D_POWERPC")
89 ;;
90- powerpc64-*-linux-gnu*|powerpc64-*-linux-uclibc*)
91+ powerpc64-*-linux-gnu*|powerpc64-*-linux-uclibc*|powerpc64-*-linux-musl*)
92 AC_SUBST(NATIVE_ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX -D_POWERPC64")
93 ;;
94- arm*-*-linux-gnu*|arm*-*-linux-uclibc*)
95+ arm*-*-linux-gnu*|arm*-*-linux-uclibc*|arm*-*-linux-musl*)
96 AC_SUBST(NATIVE_ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX")
97 ;;
98 *)
99@@ -33,10 +33,10 @@ esac
100
101 # host detection and setup - this is the target arch
102 case $host in
103- i*86*-linux-gnu*|i*86*-*-linux-uclibc*)
104+ i*86*-linux-gnu*|i*86*-*-linux-uclibc*|i*86*-*-linux-musl*)
105 AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX")
106 ;;
107- x86_64-*-linux-gnu*|x86_64-*-linux-uclibc*)
108+ x86_64-*-linux-gnu*|x86_64-*-linux-uclibc*|x86_64-*-linux-musl*)
109 AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX")
110 ;;
111 i386-*-freebsd*)
112@@ -54,16 +54,16 @@ case $host in
113 powerpc-apple-darwin*)
114 AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_DARWIN -DTARGET_DARWIN_OSX -D_LINUX")
115 ;;
116- powerpc-*-linux-gnu*|powerpc-*-linux-uclibc*)
117+ powerpc-*-linux-gnu*|powerpc-*-linux-uclibc*|powerpc-*-linux-musl*)
118 AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX -D_POWERPC")
119 ;;
120- powerpc64*-*-linux-gnu*|powerpc64*-*-linux-uclibc*)
121+ powerpc64*-*-linux-gnu*|powerpc64*-*-linux-uclibc*|powerpc64*-*-linux-musl*)
122 AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX -D_POWERPC64")
123 ;;
124- arm*-*-linux-gnu*|arm*-*-linux-uclibc*|aarch64*-*-linux-gnu*|aarch64*-*-linux-uclibc*)
125+ arm*-*-linux-gnu*|arm*-*-linux-uclibc*|arm*-*-linux-musl*|aarch64*-*-linux-gnu*|aarch64*-*-linux-uclibc*|aarch64*-*-linux-musl*)
126 AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX")
127 ;;
128- mips*-*-linux-gnu*|mips*-*-linux-uclibc*)
129+ mips*-*-linux-gnu*|mips*-*-linux-uclibc*|mips*-*-linux-musl*)
130 AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX")
131 ;;
132 *-*linux-android*)
133diff --git a/tools/depends/configure.ac b/tools/depends/configure.ac
134index f438e5d..409f4d7 100644
135--- a/tools/depends/configure.ac
136+++ b/tools/depends/configure.ac
137@@ -120,13 +120,13 @@ platform_cc=gcc
138 platform_cxx=g++
139
140 case $build in
141- arm*-*-linux-gnu*|arm*-*-linux-uclibc*)
142+ arm*-*-linux-gnu*|arm*-*-linux-uclibc*|arm*-*-linux-musl*)
143 build_os="linux"
144 ;;
145- *i686*-linux-gnu*|i*86*-*-linux-uclibc*)
146+ *i686*-linux-gnu*|i*86*-*-linux-uclibc*|i*86*-*-linux-musl*)
147 build_os="linux"
148 ;;
149- x86_64*-linux-gnu*|x86_64-*-linux-uclibc*)
150+ x86_64*-linux-gnu*|x86_64-*-linux-uclibc*|x86_64-*-linux-musl*)
151 build_os="linux"
152 ;;
153 *darwin*)
154@@ -186,7 +186,7 @@ case $host in
155 #android builds are always cross
156 cross_compiling="yes"
157 ;;
158- arm*-*-linux-gnu*|arm*-*-linux-uclibc*)
159+ arm*-*-linux-gnu*|arm*-*-linux-uclibc*|arm*-*-linux-musl*)
160 if test "$use_platform" = "auto"; then
161 if test "x$use_cpu" = "xauto"; then
162 use_cpu=$host_cpu
163@@ -210,12 +210,12 @@ case $host in
164 platform_os="linux"
165 fi
166 ;;
167- *i686*-linux-gnu*|i*86*-*-linux-uclibc*)
168+ *i686*-linux-gnu*|i*86*-*-linux-uclibc*|i*86*-*-linux-musl*)
169 use_cpu=$host_cpu
170 use_toolchain="${use_toolchain:-/usr}"
171 platform_os="linux"
172 ;;
173- x86_64*-linux-gnu*|x86_64-*-linux-uclibc*)
174+ x86_64*-linux-gnu*|x86_64-*-linux-uclibc*|x86_64-*-linux-musl*)
175 use_cpu=$host_cpu
176 use_toolchain="${use_toolchain:-/usr}"
177 platform_cflags="-fPIC -DPIC"
178--
1792.10.2
180