From 88b2808dcd3a01ced02079bf381f204e10b7946b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= Date: Wed, 25 Aug 2021 19:12:45 +0200 Subject: [PATCH] meson: run generate_version.sh in a C locale MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Previously, only the date command inside the script was run with LC_TIME=C. But there’s no reason to be that conservative; we absolutely do not want _anything_ in that script to generate locale dependent output. --- generate-version.sh | 2 +- meson.build | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/generate-version.sh b/generate-version.sh index e088170b..3ea55ba9 100755 --- a/generate-version.sh +++ b/generate-version.sh @@ -17,7 +17,7 @@ if [ -d "${src_dir}/.git" ] && command -v git > /dev/null; then git_branch=$(git rev-parse --abbrev-ref HEAD) cd "${workdir}" - new_version="${git_version} ($(env LC_TIME=C date "+%b %d %Y"), branch '${git_branch}')" + new_version="${git_version} ($(date "+%b %d %Y"), branch '${git_branch}')" else new_version="${default_version}" extra="" diff --git a/meson.build b/meson.build index 778568e7..52ce2dc5 100644 --- a/meson.build +++ b/meson.build @@ -130,12 +130,13 @@ foreach prot : wl_proto_xml command: [wscanner_prog, 'private-code', '@INPUT@', '@OUTPUT@']) endforeach +env = find_program('env', native: true) generate_version_sh = files('generate-version.sh') version = custom_target( 'generate_version', build_always_stale: true, output: 'version.h', - command: [generate_version_sh, meson.project_version(), '@SOURCE_ROOT@', '@OUTPUT@']) + command: [env, 'LC_ALL=C', generate_version_sh, meson.project_version(), '@SOURCE_ROOT@', '@OUTPUT@']) common = static_library( 'common',