mirror of
https://github.com/libretro/Lakka-LibreELEC.git
synced 2024-11-27 02:20:29 +00:00
Merge pull request #5276 from arthur-liberman/fix-glib
Update build system for new meson and fix up glib package
This commit is contained in:
commit
4f8d8eabd3
@ -482,12 +482,14 @@ cpu_family = '$TARGET_ARCH'
|
||||
cpu = '$TARGET_SUBARCH'
|
||||
endian = 'little'
|
||||
|
||||
[properties]
|
||||
root = '$TOOLCHAIN'
|
||||
[built-in options]
|
||||
$(python3 -c "import os; print('c_args = {}'.format([x for x in os.getenv('CFLAGS').split()]))")
|
||||
$(python3 -c "import os; print('c_link_args = {}'.format([x for x in os.getenv('LDFLAGS').split()]))")
|
||||
$(python3 -c "import os; print('cpp_args = {}'.format([x for x in os.getenv('CXXFLAGS').split()]))")
|
||||
$(python3 -c "import os; print('cpp_link_args = {}'.format([x for x in os.getenv('LDFLAGS').split()]))")
|
||||
|
||||
[properties]
|
||||
root = '$TOOLCHAIN'
|
||||
${!properties}
|
||||
EOF
|
||||
}
|
||||
@ -512,12 +514,14 @@ cpu_family = '$TARGET_ARCH'
|
||||
cpu = '$TARGET_SUBARCH'
|
||||
endian = 'little'
|
||||
|
||||
[properties]
|
||||
root = '$SYSROOT_PREFIX/usr'
|
||||
[built-in options]
|
||||
$(python3 -c "import os; print('c_args = {}'.format([x for x in os.getenv('TARGET_CFLAGS').split()]))")
|
||||
$(python3 -c "import os; print('c_link_args = {}'.format([x for x in os.getenv('TARGET_LDFLAGS').split()]))")
|
||||
$(python3 -c "import os; print('cpp_args = {}'.format([x for x in os.getenv('TARGET_CXXFLAGS').split()]))")
|
||||
$(python3 -c "import os; print('cpp_link_args = {}'.format([x for x in os.getenv('TARGET_LDFLAGS').split()]))")
|
||||
|
||||
[properties]
|
||||
root = '$SYSROOT_PREFIX/usr'
|
||||
${!properties}
|
||||
EOF
|
||||
}
|
||||
|
@ -33,11 +33,9 @@ PKG_MESON_OPTS_TARGET="-Ddefault_library=shared \
|
||||
-Dforce_posix_threads=true \
|
||||
-Dtests=false"
|
||||
|
||||
PKG_MESON_PROPERTIES_TARGET="
|
||||
have_c99_vsnprintf=false
|
||||
have_c99_snprintf=false
|
||||
growing_stack=false
|
||||
va_val_copy=false"
|
||||
if [ "${MACHINE_HARDWARE_NAME}" = "aarch64" -a "${TARGET_ARCH}" = "arm" ]; then
|
||||
PKG_MESON_PROPERTIES_TARGET="needs_exe_wrapper = true"
|
||||
fi
|
||||
|
||||
post_makeinstall_target() {
|
||||
rm -rf ${INSTALL}/usr/bin
|
||||
|
@ -2,8 +2,8 @@
|
||||
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="meson"
|
||||
PKG_VERSION="0.56.0"
|
||||
PKG_SHA256="291dd38ff1cd55fcfca8fc985181dd39be0d3e5826e5f0013bf867be40117213"
|
||||
PKG_VERSION="0.57.1"
|
||||
PKG_SHA256="72e1c782ba9bda204f4a1ed57f98d027d7b6eb9414c723eebbd6ec7f1955c8a6"
|
||||
PKG_LICENSE="Apache"
|
||||
PKG_SITE="http://mesonbuild.com"
|
||||
PKG_URL="https://github.com/mesonbuild/meson/releases/download/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.gz"
|
||||
|
Loading…
Reference in New Issue
Block a user