glib: fix build on an aarch64 system for ARCH=arm

This commit is contained in:
Arthur Liberman 2021-03-27 14:56:27 +03:00
parent ffaff3013a
commit f5e7a83c88
No known key found for this signature in database
GPG Key ID: 8894632E36AF1866
2 changed files with 11 additions and 9 deletions

View File

@ -482,12 +482,14 @@ cpu_family = '$TARGET_ARCH'
cpu = '$TARGET_SUBARCH' cpu = '$TARGET_SUBARCH'
endian = 'little' endian = 'little'
[properties] [built-in options]
root = '$TOOLCHAIN'
$(python3 -c "import os; print('c_args = {}'.format([x for x in os.getenv('CFLAGS').split()]))") $(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('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_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()]))") $(python3 -c "import os; print('cpp_link_args = {}'.format([x for x in os.getenv('LDFLAGS').split()]))")
[properties]
root = '$TOOLCHAIN'
${!properties} ${!properties}
EOF EOF
} }
@ -512,12 +514,14 @@ cpu_family = '$TARGET_ARCH'
cpu = '$TARGET_SUBARCH' cpu = '$TARGET_SUBARCH'
endian = 'little' endian = 'little'
[properties] [built-in options]
root = '$SYSROOT_PREFIX/usr'
$(python3 -c "import os; print('c_args = {}'.format([x for x in os.getenv('TARGET_CFLAGS').split()]))") $(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('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_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()]))") $(python3 -c "import os; print('cpp_link_args = {}'.format([x for x in os.getenv('TARGET_LDFLAGS').split()]))")
[properties]
root = '$SYSROOT_PREFIX/usr'
${!properties} ${!properties}
EOF EOF
} }

View File

@ -33,11 +33,9 @@ PKG_MESON_OPTS_TARGET="-Ddefault_library=shared \
-Dforce_posix_threads=true \ -Dforce_posix_threads=true \
-Dtests=false" -Dtests=false"
PKG_MESON_PROPERTIES_TARGET=" if [ "${MACHINE_HARDWARE_NAME}" = "aarch64" -a "${TARGET_ARCH}" = "arm" ]; then
have_c99_vsnprintf=false PKG_MESON_PROPERTIES_TARGET="needs_exe_wrapper = true"
have_c99_snprintf=false fi
growing_stack=false
va_val_copy=false"
post_makeinstall_target() { post_makeinstall_target() {
rm -rf ${INSTALL}/usr/bin rm -rf ${INSTALL}/usr/bin