diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-03-14 11:48:24 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-03-14 12:29:47 +0100 |
| commit | 64ea9944cfc441504915da37f6b2dff7a394d797 (patch) | |
| tree | 695ccb34f82213ae9df2f51323bea19266c10b49 /external | |
| parent | e759269e373fa02d3e8566d1edc9fb9526de6640 (diff) | |
scp2: move libxml2 to AutoInstall
Change-Id: I62f2f654ac661ebf266b7b5cf70728a616c9b50f
Diffstat (limited to 'external')
| -rw-r--r-- | external/libxml2/ExternalPackage_xml2.mk | 4 | ||||
| -rw-r--r-- | external/libxml2/ExternalPackage_xml2_win32.mk | 26 | ||||
| -rw-r--r-- | external/libxml2/Module_libxml2.mk | 1 |
3 files changed, 27 insertions, 4 deletions
diff --git a/external/libxml2/ExternalPackage_xml2.mk b/external/libxml2/ExternalPackage_xml2.mk index e25a7f8c38e0..a0bf5eb9c244 100644 --- a/external/libxml2/ExternalPackage_xml2.mk +++ b/external/libxml2/ExternalPackage_xml2.mk @@ -17,12 +17,8 @@ $(eval $(call gb_ExternalPackage_add_file,xml2,$(LIBO_URE_LIB_FOLDER)/libxml2.2. else ifeq ($(OS),WNT) ifeq ($(COM),GCC) $(eval $(call gb_ExternalPackage_add_file,xml2,$(LIBO_URE_LIB_FOLDER)/libxml2.dll,.libs/libxml2.dll)) -$(eval $(call gb_ExternalPackage_add_file,xml2,$(LIBO_LIB_FOLDER)/libxml2.dll,.libs/libxml2.dll)) else # COM=MSC $(eval $(call gb_ExternalPackage_add_file,xml2,$(LIBO_URE_LIB_FOLDER)/libxml2.dll,win32/bin.msvc/libxml2.dll)) -# duplicate copy next to executables due to idiotic Win32 DLL search order -# see 5a5dab5167d136c315e81448ea8eca59e60067da -$(eval $(call gb_ExternalPackage_add_file,xml2,$(LIBO_LIB_FOLDER)/libxml2.dll,win32/bin.msvc/libxml2.dll)) endif else # OS!=WNT $(eval $(call gb_ExternalPackage_add_file,xml2,$(LIBO_URE_LIB_FOLDER)/libxml2.so.2,.libs/libxml2.so.2.9.1)) diff --git a/external/libxml2/ExternalPackage_xml2_win32.mk b/external/libxml2/ExternalPackage_xml2_win32.mk new file mode 100644 index 000000000000..c97fd89aa32f --- /dev/null +++ b/external/libxml2/ExternalPackage_xml2_win32.mk @@ -0,0 +1,26 @@ +# -*- 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/. +# + +$(eval $(call gb_ExternalPackage_ExternalPackage,xml2_win32,xml2)) + +$(eval $(call gb_ExternalPackage_use_external_project,xml2_win32,xml2)) + +# duplicate copy next to executables due to stupid Win32 DLL search order +# where a libxml2.dll in C:\Windows is loaded before one in URE lib dir +# see 5a5dab5167d136c315e81448ea8eca59e60067da + +ifeq ($(OS),WNT) +ifeq ($(COM),GCC) +$(eval $(call gb_ExternalPackage_add_file,xml2_win32,$(LIBO_LIB_FOLDER)/libxml2.dll,.libs/libxml2.dll)) +else # COM=MSC +$(eval $(call gb_ExternalPackage_add_file,xml2_win32,$(LIBO_LIB_FOLDER)/libxml2.dll,win32/bin.msvc/libxml2.dll)) +endif +endif # OS=WNT + +# vim: set noet sw=4 ts=4: diff --git a/external/libxml2/Module_libxml2.mk b/external/libxml2/Module_libxml2.mk index f6bca3f80e4f..9efb17c26830 100644 --- a/external/libxml2/Module_libxml2.mk +++ b/external/libxml2/Module_libxml2.mk @@ -11,6 +11,7 @@ $(eval $(call gb_Module_Module,libxml2)) $(eval $(call gb_Module_add_targets,libxml2,\ ExternalPackage_xml2 \ + ExternalPackage_xml2_win32 \ ExternalProject_xml2 \ UnpackedTarball_xml2 \ )) |