diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-07-24 00:22:51 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-07-24 00:36:14 +0200 |
| commit | 057613c6864204ac5c09260e93a8f14cc9768b90 (patch) | |
| tree | 86a0bdf1a784ed589558f5636a6d16fa1950d35f /external/icu/ExternalPackage_icu_ure.mk | |
| parent | 73b2ef39fc5e748e80dca72268b67e5a0d6da8ff (diff) | |
icu: un-break installation of Java extensions on Windows (rel. fdo#63756)
Linking libxml2 against ICU libraries has a nasty side effect:
The URE library javavm.dll links against URE libxml2.dll, which
is now linked against OOO icuuc53.dll; when a URE program, like
uno.exe, tries to load javavm.dll it fails because the OOO layer
"program" dir is not on PATH; this breaks the installation of Java
extensions.
Fix that by splitting up ICU libraries and putting the required ones
into URE layer.
(regression from 7515b1a90fac9e31733c0fdcc1156adadf0e6f99)
Change-Id: If98dd0357162cb632d9762cd2d20162de5eb1a52
Diffstat (limited to 'external/icu/ExternalPackage_icu_ure.mk')
| -rw-r--r-- | external/icu/ExternalPackage_icu_ure.mk | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/external/icu/ExternalPackage_icu_ure.mk b/external/icu/ExternalPackage_icu_ure.mk new file mode 100644 index 000000000000..a016c8c0e27d --- /dev/null +++ b/external/icu/ExternalPackage_icu_ure.mk @@ -0,0 +1,33 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +# libxml2 is in URE and depends on icuuc*.dll on Windows - extra package needed +$(eval $(call gb_ExternalPackage_ExternalPackage,icu_ure,icu)) + +$(eval $(call gb_ExternalPackage_use_external_project,icu_ure,icu)) + +ifneq ($(DISABLE_DYNLOADING),TRUE) +ifeq ($(OS),WNT) + +ifeq ($(COM),GCC) +$(eval $(call gb_ExternalPackage_add_files,icu_ure,$(LIBO_URE_LIB_FOLDER),\ + source/lib/icudt$(ICU_MAJOR).dll \ + source/lib/icuuc$(ICU_MAJOR).dll \ +)) +else +$(eval $(call gb_ExternalPackage_add_files,icu_ure,$(LIBO_URE_LIB_FOLDER),\ + source/lib/icudt$(if $(MSVC_USE_DEBUG_RUNTIME),d)$(ICU_MAJOR).dll \ + source/lib/icuuc$(if $(MSVC_USE_DEBUG_RUNTIME),d)$(ICU_MAJOR).dll \ +)) +endif # $(COM) + +endif # $(OS) +endif # DISABLE_DYNLOADING + +# vim: set noet sw=4 ts=4: |