From a631a88039d804b8d50c4a40d347d2637cd4d73d Mon Sep 17 00:00:00 2001 From: asava Date: Mon, 23 Sep 2019 19:05:37 +0300 Subject: [PATCH] Work around gettext compilation for Catalina and disable gettext building java prompts --- buildgettext.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/buildgettext.sh b/buildgettext.sh index 2e8ed5f15..4a7e91399 100755 --- a/buildgettext.sh +++ b/buildgettext.sh @@ -167,6 +167,12 @@ fnCompileGettext () rm -rf "$BUILD_GETTEXT_DIR" mkdir -p "$BUILD_GETTEXT_DIR" && cd "$BUILD_GETTEXT_DIR" echo "- ${GETTEXT_VERSION} configure..." + + # With Xcode11, some bug with 'putc' causes a test to fail and makes compilation impossible. Until this is fixed, use 'fwrite' for that test. + # As we already patch configure, also disable the multiple java prompts which pop up. + sed -i '' 's/if (!(putc ('\''!'\'', fp) == '\''!'\''))/if (fwrite (\"!\", 1, 1, fp) < 1)/g; s/java -version/java-disable -version/g; s/javac -version/javac-disable -version/g' "${GETTEXT_DIR}/gettext-tools/configure" + sed -i '' 's/javac -version/javac-disable -version/g' "${GETTEXT_DIR}/gettext-runtime/configure" + cmd="'${GETTEXT_DIR}/configure' $GETTEXT_CONFIG" logfile="$DIR_LOGS/gettext.configure.log.txt" echo "$cmd" > "$logfile"