jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-24 19:26:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5916 from SupervisedThinking/meson_native_build

Browse Source 
[le11] use Meson native build for package:host
This commit is contained in:
CvH 2021-12-08 12:04:13 +01:00 committed by GitHub
commit 4e16eba336
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
config/functions
View File

@ -485,10 +485,16 @@ pkgconfig = '$PKG_CONFIG'
llvm-config = '$TOOLCHAIN/bin/llvm-config-host' llvm-config = '$TOOLCHAIN/bin/llvm-config-host'
libgcrypt-config = '$SYSROOT_PREFIX/usr/bin/libgcrypt-config' libgcrypt-config = '$SYSROOT_PREFIX/usr/bin/libgcrypt-config'
[build_machine]
system = 'linux'
cpu_family = '${MACHINE_HARDWARE_NAME}'
cpu = '${MACHINE_HARDWARE_CPU}'
endian = 'little'
[host_machine] [host_machine]
system = 'linux' system = 'linux'
cpu_family = '$TARGET_ARCH' cpu_family = '${MACHINE_HARDWARE_NAME}'
cpu = '$TARGET_SUBARCH' cpu = '${MACHINE_HARDWARE_CPU}'
endian = 'little' endian = 'little'
[built-in options] [built-in options]
@ -517,6 +523,12 @@ pkgconfig = '$PKG_CONFIG'
llvm-config = '$TOOLCHAIN/bin/llvm-config-host' llvm-config = '$TOOLCHAIN/bin/llvm-config-host'
libgcrypt-config = '$SYSROOT_PREFIX/usr/bin/libgcrypt-config' libgcrypt-config = '$SYSROOT_PREFIX/usr/bin/libgcrypt-config'
[build_machine]
system = 'linux'
cpu_family = '${MACHINE_HARDWARE_NAME}'
cpu = '${MACHINE_HARDWARE_CPU}'
endian = 'little'
[host_machine] [host_machine]
system = 'linux' system = 'linux'
cpu_family = '$TARGET_ARCH' cpu_family = '$TARGET_ARCH'

1
config/optimize
View File

@ -65,6 +65,7 @@ if [ -z "$HOST_LIBDIR" ]; then
HOST_LIBDIR="$TOOLCHAIN/lib" HOST_LIBDIR="$TOOLCHAIN/lib"
# ubuntu/debian specific "multiarch support" # ubuntu/debian specific "multiarch support"
export MACHINE_HARDWARE_CPU="$(uname -p)"
export MACHINE_HARDWARE_NAME="$(uname -m)" export MACHINE_HARDWARE_NAME="$(uname -m)"
export MACHINE_HARDWARE_PLATFORM="$(uname -i)" export MACHINE_HARDWARE_PLATFORM="$(uname -i)"
FAMILY_TRIPLET=$($LOCAL_CC -print-multiarch) FAMILY_TRIPLET=$($LOCAL_CC -print-multiarch)

8
scripts/build
View File

@ -264,8 +264,8 @@ else
;; ;;
"meson:host") "meson:host")
create_meson_conf_host ${TARGET} ${MESON_CONF} create_meson_conf_host ${TARGET} ${MESON_CONF}
echo "Executing (host): meson ${HOST_MESON_OPTS} --cross-file=${MESON_CONF} ${PKG_MESON_OPTS_HOST} ${PKG_MESON_SCRIPT%/*}" | tr -s " " echo "Executing (host): meson ${HOST_MESON_OPTS} --native-file=${MESON_CONF} ${PKG_MESON_OPTS_HOST} ${PKG_MESON_SCRIPT%/*}" | tr -s " "
meson ${HOST_MESON_OPTS} --cross-file=${MESON_CONF} ${PKG_MESON_OPTS_HOST} ${PKG_MESON_SCRIPT%/*} meson ${HOST_MESON_OPTS} --native-file=${MESON_CONF} ${PKG_MESON_OPTS_HOST} ${PKG_MESON_SCRIPT%/*}
;; ;;
"meson:init") "meson:init")
create_meson_conf_target ${TARGET} ${MESON_CONF} create_meson_conf_target ${TARGET} ${MESON_CONF}
@ -274,8 +274,8 @@ else
;; ;;
"meson:bootstrap") "meson:bootstrap")
create_meson_conf_host ${TARGET} ${MESON_CONF} create_meson_conf_host ${TARGET} ${MESON_CONF}
echo "Executing (bootstrap): meson ${BOOTSTRAP_MESON_OPTS} --cross-file=${MESON_CONF} ${PKG_MESON_OPTS_BOOTSTRAP} ${PKG_MESON_SCRIPT%/*}" | tr -s " " echo "Executing (bootstrap): meson ${BOOTSTRAP_MESON_OPTS} ----native-file=${MESON_CONF} ${PKG_MESON_OPTS_BOOTSTRAP} ${PKG_MESON_SCRIPT%/*}" | tr -s " "
meson ${BOOTSTRAP_MESON_OPTS} --cross-file=${MESON_CONF} ${PKG_MESON_OPTS_BOOTSTRAP} ${PKG_MESON_SCRIPT%/*} meson ${BOOTSTRAP_MESON_OPTS} --native-file=${MESON_CONF} ${PKG_MESON_OPTS_BOOTSTRAP} ${PKG_MESON_SCRIPT%/*}
;; ;;
# cmake builds with ninja # cmake builds with ninja