diff options
Diffstat (limited to 'patches/fontconfig/0001-Only-use-wrapper-script-if-host-is-MinGW.patch')
| -rw-r--r-- | patches/fontconfig/0001-Only-use-wrapper-script-if-host-is-MinGW.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/patches/fontconfig/0001-Only-use-wrapper-script-if-host-is-MinGW.patch b/patches/fontconfig/0001-Only-use-wrapper-script-if-host-is-MinGW.patch new file mode 100644 index 0000000..161c7b0 --- /dev/null +++ b/patches/fontconfig/0001-Only-use-wrapper-script-if-host-is-MinGW.patch @@ -0,0 +1,44 @@ +From c81fc168f3ba3f1878e8a6e86c94a4e64c5391d5 Mon Sep 17 00:00:00 2001 +From: Jon Turney <jon.turney@dronecode.org.uk> +Date: Mon, 15 Apr 2019 20:01:22 +0100 +Subject: [PATCH] Only use wrapper-script if host is MinGW + +Currently it fails if the executable extension is .exe, but wine isn't +available (e.g. on Cygwin) + +Possibly the check to use this wrapper should be even more restrictive +e.g. checking if cross-building and/or if wine is available. +--- + test/Makefile.am | 2 ++ + test/run-test.sh | 1 - + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/test/Makefile.am b/test/Makefile.am +index fc47a50..8176d99 100644 +--- a/test/Makefile.am ++++ b/test/Makefile.am +@@ -11,7 +11,9 @@ AM_TESTS_ENVIRONMENT= \ + BUILT_SOURCES = $(builddir)/out.expected + + SH_LOG_COMPILER = sh ++if OS_WIN32 + LOG_COMPILER = ${srcdir}/wrapper-script.sh ++endif + TESTS=run-test.sh + + TESTDATA = \ +diff --git a/test/run-test.sh b/test/run-test.sh +index b55efcb..12198ff 100644 +--- a/test/run-test.sh ++++ b/test/run-test.sh +@@ -32,7 +32,6 @@ BASEDIR=`mktemp -d --tmpdir fontconfig.XXXXXXXX` + FONTDIR="$BASEDIR"/fonts + CACHEDIR="$BASEDIR"/cache.dir + EXPECTED=${EXPECTED-"out.expected"} +-LOG_COMPILER=${LOG_COMPILER-"$TESTDIR/wrapper-script.sh"} + + ECHO=true + +-- +2.17.0 + |