diff options
| author |   isaackwy <isaacyu@protonmail.com> | 2024-03-22 22:12:12 -0700 |
|---|---|---|
| committer |   Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2024-03-23 20:25:24 +0700 |
| commit | 07ea90f807ccf04f10db313d071c91c9ab64e0c3 (patch) | |
| tree | 88663301b0f0ade345ba4b21cc0aec125fb2188e | |
| parent | 0631972705a8c73dfbc55fd7bc84444c31f5bacd (diff) | |
| download | slackbuilds-07ea90f80.tar.gz slackbuilds-07ea90f80.tar.xz | |
system/jq: Fix build test failures associated with non-English modules
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
| -rw-r--r-- | system/jq/jq.SlackBuild | 5 | ||||
| -rw-r--r-- | system/jq/run_tests_in_C_locale.patch | 15 |
2 files changed, 19 insertions, 1 deletions
diff --git a/system/jq/jq.SlackBuild b/system/jq/jq.SlackBuild index 5c0ac10f05..174989f237 100644 --- a/system/jq/jq.SlackBuild +++ b/system/jq/jq.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=jq VERSION=${VERSION:-1.7.1} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -77,6 +77,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# Fix build test failures if LANG is not C or en_US.UTF-8 +patch -p1 < $CWD/run_tests_in_C_locale.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/system/jq/run_tests_in_C_locale.patch b/system/jq/run_tests_in_C_locale.patch new file mode 100644 index 0000000000..5d1d36b0b1 --- /dev/null +++ b/system/jq/run_tests_in_C_locale.patch @@ -0,0 +1,15 @@ +The following patch is taken from this pull request: +https://github.com/jqlang/jq/pull/3039 +--- a/tests/setup ++++ b/tests/setup +@@ -12,6 +12,10 @@ + JQBASEDIR=$JQTESTDIR/.. + JQ=${JQ:-$JQBASEDIR/jq} + ++# Some tests have locale-dependent output; use C locale. Fixes #3038 ++LC_ALL=C ++export LC_ALL ++ + if [ -z "${NO_VALGRIND-}" ] && which valgrind > /dev/null; then + VALGRIND="valgrind --error-exitcode=1 --leak-check=full \ + --suppressions=$JQTESTDIR/onig.supp \ |