diff options
| author | David Ostrovsky <david@ostrovsky.org> | 2017-02-15 22:31:00 +0100 |
|---|---|---|
| committer | David Ostrovsky <david@ostrovsky.org> | 2017-02-15 22:44:57 +0000 |
| commit | 3e1e49561bb734475d2b7d1db1beef0d3e9b53cd (patch) | |
| tree | a3a2b2d1af98720e8cb0f821f5912266ea3378ce /external/firebird | |
| parent | Try harder to fix Android tinderbox (diff) | |
| download | core-3e1e49561bb734475d2b7d1db1beef0d3e9b53cd.tar.gz core-3e1e49561bb734475d2b7d1db1beef0d3e9b53cd.zip | |
Fix firebird MSVC 15.0 detection
Change-Id: I9721632c68e6428b03b0368e7802c6eb4f5eb0a2
Reviewed-on: https://gerrit.libreoffice.org/34323
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Ostrovsky <david@ostrovsky.org>
Diffstat (limited to 'external/firebird')
| -rw-r--r-- | external/firebird/UnpackedTarball_firebird.mk | 1 | ||||
| -rw-r--r-- | external/firebird/firebird-vs2017.patch.1 | 12 |
2 files changed, 13 insertions, 0 deletions
diff --git a/external/firebird/UnpackedTarball_firebird.mk b/external/firebird/UnpackedTarball_firebird.mk index 3cd7a42a0772..29395c02561a 100644 --- a/external/firebird/UnpackedTarball_firebird.mk +++ b/external/firebird/UnpackedTarball_firebird.mk @@ -28,6 +28,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,firebird,\ ifeq ($(OS),WNT) $(eval $(call gb_UnpackedTarball_add_patches,firebird,\ external/firebird/firebird-cygwin-msvc.patch \ + external/firebird/firebird-vs2017.patch.1 \ )) endif diff --git a/external/firebird/firebird-vs2017.patch.1 b/external/firebird/firebird-vs2017.patch.1 new file mode 100644 index 000000000000..ba747b3470f4 --- /dev/null +++ b/external/firebird/firebird-vs2017.patch.1 @@ -0,0 +1,12 @@ +diff -ru firebird.orig/src/common/os/win32/mod_loader.cpp firebird/src/common/os/win32/mod_loader.cpp +--- firebird.orig/src/common/os/win32/mod_loader.cpp 2017-02-15 22:11:48.939042400 +0100 ++++ firebird/src/common/os/win32/mod_loader.cpp 2017-02-15 22:12:30.062262700 +0100 +@@ -103,6 +103,8 @@ + "msvcr120.dll", + #elif _MSC_VER == 1900 + "vcruntime140.dll", ++#elif _MSC_VER == 1910 ++ "vcruntime140.dll", + #else + #error Specify CRT DLL name here ! + #endif |