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

Merge pull request #6660 from HiassofT/le11-uname-fix

Browse Source 
Fix meson.conf generation and rust build
This commit is contained in:
CvH 2022-07-01 17:30:17 +02:00 committed by GitHub
commit 9f8dd8a5ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
config/functions
View File

@ -475,7 +475,7 @@ setup_toolchain() {
export _python_exec_prefix=/
# rust
case "${MACHINE_HARDWARE_CPU}" in
case "${MACHINE_HARDWARE_NAME}" in
"arm")
RUST_HOST="arm-unknown-linux-gnueabihf"
;;
@ -511,13 +511,13 @@ libgcrypt-config = '$SYSROOT_PREFIX/usr/bin/libgcrypt-config'
[build_machine]
system = 'linux'
cpu_family = '${MACHINE_HARDWARE_NAME}'
cpu = '${MACHINE_HARDWARE_CPU}'
cpu = '${MACHINE_HARDWARE_NAME}'
endian = 'little'
[host_machine]
system = 'linux'
cpu_family = '${MACHINE_HARDWARE_NAME}'
cpu = '${MACHINE_HARDWARE_CPU}'
cpu = '${MACHINE_HARDWARE_NAME}'
endian = 'little'
[built-in options]
@ -549,7 +549,7 @@ libgcrypt-config = '$SYSROOT_PREFIX/usr/bin/libgcrypt-config'
[build_machine]
system = 'linux'
cpu_family = '${MACHINE_HARDWARE_NAME}'
cpu = '${MACHINE_HARDWARE_CPU}'
cpu = '${MACHINE_HARDWARE_NAME}'
endian = 'little'
[host_machine]

2
config/optimize
View File

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

2
packages/rust/cargo-snapshot/package.mk
View File

@ -6,6 +6,6 @@ PKG_VERSION="$(get_pkg_version rust)"
PKG_SHA256="9461727d754f865ef2a87479d40bbe4c5176f80963b7c50b7797bc8940d7a0a0"
PKG_LICENSE="MIT"
PKG_SITE="https://www.rust-lang.org"
PKG_URL="https://static.rust-lang.org/dist/cargo-${PKG_VERSION}-${MACHINE_HARDWARE_CPU}-unknown-linux-gnu.tar.xz"
PKG_URL="https://static.rust-lang.org/dist/cargo-${PKG_VERSION}-${MACHINE_HARDWARE_NAME}-unknown-linux-gnu.tar.xz"
PKG_LONGDESC="cargo bootstrap package"
PKG_TOOLCHAIN="manual"

2
packages/rust/rust-std-snapshot/package.mk
View File

@ -6,6 +6,6 @@ PKG_VERSION="$(get_pkg_version rust)"
PKG_SHA256="270b07aa5f2de52255a117e1e587138d77375ce0d09a1d7fead085f29b3977e9"
PKG_LICENSE="MIT"
PKG_SITE="https://www.rust-lang.org"
PKG_URL="https://static.rust-lang.org/dist/rust-std-${PKG_VERSION}-${MACHINE_HARDWARE_CPU}-unknown-linux-gnu.tar.xz"
PKG_URL="https://static.rust-lang.org/dist/rust-std-${PKG_VERSION}-${MACHINE_HARDWARE_NAME}-unknown-linux-gnu.tar.xz"
PKG_LONGDESC="rust std library bootstrap package"
PKG_TOOLCHAIN="manual"

2
packages/rust/rustc-snapshot/package.mk
View File

@ -6,6 +6,6 @@ PKG_VERSION="$(get_pkg_version rust)"
PKG_SHA256="21c4613f389ed130fbaaf88f1e984319f72b5fc10734569a5ba19e22ebb03abd"
PKG_LICENSE="MIT"
PKG_SITE="https://www.rust-lang.org"
PKG_URL="https://static.rust-lang.org/dist/rustc-${PKG_VERSION}-${MACHINE_HARDWARE_CPU}-unknown-linux-gnu.tar.xz"
PKG_URL="https://static.rust-lang.org/dist/rustc-${PKG_VERSION}-${MACHINE_HARDWARE_NAME}-unknown-linux-gnu.tar.xz"
PKG_LONGDESC="rustc bootstrap compiler"
PKG_TOOLCHAIN="manual"