From be887356d94ad813acdf56108ad02fd5e33f803b Mon Sep 17 00:00:00 2001 From: Julien Nabet Date: Sat, 26 Jan 2019 12:42:07 +0100 Subject: Could not determine MSC version with French UI Fix regexp for cl.exe This command returns some special characters preventing regexp to work. For more details, see: http://document-foundation-mail-archive.969070.n3.nabble.com/Could-not-determine-MSC-version-Visual-Studio-2017-td4256538.html Change-Id: I734dcd533b0f38430d1be8852f1e4f721221e580 Reviewed-on: https://gerrit.libreoffice.org/66959 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- external/nss/UnpackedTarball_nss.mk | 1 + external/nss/nss.bzmozilla1238154.patch | 12 ++++++++++++ 2 files changed, 13 insertions(+) create mode 100644 external/nss/nss.bzmozilla1238154.patch (limited to 'external/nss') diff --git a/external/nss/UnpackedTarball_nss.mk b/external/nss/UnpackedTarball_nss.mk index e20598f4ae01..8abcb867318e 100644 --- a/external/nss/UnpackedTarball_nss.mk +++ b/external/nss/UnpackedTarball_nss.mk @@ -34,6 +34,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\ external/nss/nss.utf8bom.patch.1) \ $(if $(filter ANDROID,$(OS)), \ external/nss/nss-android.patch.1) \ + external/nss/nss.bzmozilla1238154.patch \ )) ifeq ($(COM_IS_CLANG),TRUE) diff --git a/external/nss/nss.bzmozilla1238154.patch b/external/nss/nss.bzmozilla1238154.patch new file mode 100644 index 000000000000..468ff810b9ca --- /dev/null +++ b/external/nss/nss.bzmozilla1238154.patch @@ -0,0 +1,12 @@ +diff -ru a/nspr/configure b/nspr/configure +--- a/a/nspr/configure 2019-01-26 12:23:06.589389910 +0100 ++++ b/b/nspr/configure 2019-01-26 12:26:56.566222293 +0100 +@@ -7127,7 +7127,7 @@ + + # Determine compiler version + +- _MSVC_VER_FILTER='s|.* \([0-9]\+\.[0-9]\+\.[0-9]\+\(\.[0-9]\+\)\?\).*|\1|p' ++ _MSVC_VER_FILTER='s|.*[^!-~]\([0-9]\+\.[0-9]\+\.[0-9]\+\(\.[0-9]\+\)\?\).*|\1|p' + + CC_VERSION=`${CC} -v 2>&1 | sed -ne "$_MSVC_VER_FILTER"` + if test -z "$CC_VERSION"; then -- cgit