RepositoryExternal.mk | 11 +-- boost/prj/build.lst | 3 curl/prj/build.lst | 3 epm/prj/build.lst | 2 expat/Module_expat.mk | 5 - expat/StaticLibrary_ascii_expat_xmlparse.mk | 49 --------------- expat/StaticLibrary_expat.mk | 51 +++++++++++++++ expat/StaticLibrary_expat_utf16.mk | 55 +++++++++++++++++ expat/StaticLibrary_expat_xmlparse.mk | 53 ---------------- expat/StaticLibrary_expat_xmltok.mk | 50 --------------- expat/UnpackedTarball_expat.mk | 2 expat/expat-2.1.0.patch | 90 ---------------------------- fontconfig/fontconfig-2.8.0.patch | 20 ------ fontconfig/prj/build.lst | 3 freetype/prj/build.lst | 2 graphite/prj/build.lst | 3 helpcompiler/Library_helplinker.mk | 2 hunspell/prj/build.lst | 3 hyphen/prj/build.lst | 3 libexttextcat/prj/build.lst | 3 lpsolve/prj/build.lst | 3 mythes/prj/build.lst | 3 openldap/prj/build.lst | 3 postgresql/prj/build.lst | 2 sax/Library_expwrap.mk | 2 solenv/gbuild/UnpackedTarball.mk | 3 zlib/prj/build.lst | 2 27 files changed, 133 insertions(+), 298 deletions(-)
New commits: commit 9c52986f26f4c33bd68d0f73006bd97e9820df7d Author: Michael Stahl <mst...@redhat.com> Date: Wed Nov 14 22:09:31 2012 +0100 Revert "Use different symbol names in the two expat variants we build" This reverts commit 78c7bbc3ce92493ca98c605f92733e31ad87ef70. It is no longer the case that both expat_utf8 and expat_utf16 are linked into the same library: we only use expat_utf16 in shell Explorer extensions, which cannot be linked into libmerged anyway. Conflicts: expat/expat-2.1.0.patch Change-Id: I579c10d405d8a40cafcb2dbe09e967c6079f7b16 diff --git a/expat/expat-2.1.0.patch b/expat/expat-2.1.0.patch index cb85ec5..070dafc 100644 --- a/expat/expat-2.1.0.patch +++ b/expat/expat-2.1.0.patch @@ -1,93 +1,3 @@ ---- misc/expat-2.1.0/lib/expat_external.h -+++ misc/build/expat-2.1.0/lib/expat_external.h -@@ -86,9 +86,11 @@ - typedef unsigned short XML_Char; - typedef char XML_LChar; - #endif /* XML_UNICODE_WCHAR_T */ -+#define EXPAT_CHARTYPE_DECORATE(s) s##_UTF16 - #else /* Information is UTF-8 encoded. */ - typedef char XML_Char; - typedef char XML_LChar; -+#define EXPAT_CHARTYPE_DECORATE(s) s##_UTF8 - #endif /* XML_UNICODE */ - - #ifdef XML_LARGE_SIZE /* Use large integers for file/stream positions. */ ---- misc/expat-2.1.0/lib/expat.h -+++ misc/build/expat-2.1.0/lib/expat.h -@@ -15,6 +15,73 @@ - #include <stdlib.h> - #include "expat_external.h" - -+#define XML_DefaultCurrent EXPAT_CHARTYPE_DECORATE(XML_DefaultCurrent) -+#define XML_ErrorString EXPAT_CHARTYPE_DECORATE(XML_ErrorString) -+#define XML_ExpatVersion EXPAT_CHARTYPE_DECORATE(XML_ExpatVersion) -+#define XML_ExpatVersionInfo EXPAT_CHARTYPE_DECORATE(XML_ExpatVersionInfo) -+#define XML_ExternalEntityParserCreate EXPAT_CHARTYPE_DECORATE(XML_ExternalEntityParserCreate) -+#define XML_FreeContentModel EXPAT_CHARTYPE_DECORATE(XML_FreeContentModel) -+#define XML_GetBase EXPAT_CHARTYPE_DECORATE(XML_GetBase) -+#define XML_GetBuffer EXPAT_CHARTYPE_DECORATE(XML_GetBuffer) -+#define XML_GetCurrentByteCount EXPAT_CHARTYPE_DECORATE(XML_GetCurrentByteCount) -+#define XML_GetCurrentByteIndex EXPAT_CHARTYPE_DECORATE(XML_GetCurrentByteIndex) -+#define XML_GetCurrentColumnNumber EXPAT_CHARTYPE_DECORATE(XML_GetCurrentColumnNumber) -+#define XML_GetCurrentLineNumber EXPAT_CHARTYPE_DECORATE(XML_GetCurrentLineNumber) -+#define XML_GetErrorCode EXPAT_CHARTYPE_DECORATE(XML_GetErrorCode) -+#define XML_GetFeatureList EXPAT_CHARTYPE_DECORATE(XML_GetFeatureList) -+#define XML_GetIdAttributeIndex EXPAT_CHARTYPE_DECORATE(XML_GetIdAttributeIndex) -+#define XML_GetInputContext EXPAT_CHARTYPE_DECORATE(XML_GetInputContext) -+#define XML_GetParsingStatus EXPAT_CHARTYPE_DECORATE(XML_GetParsingStatus) -+#define XML_GetSpecifiedAttributeCount EXPAT_CHARTYPE_DECORATE(XML_GetSpecifiedAttributeCount) -+#define XML_MemFree EXPAT_CHARTYPE_DECORATE(XML_MemFree) -+#define XML_MemMalloc EXPAT_CHARTYPE_DECORATE(XML_MemMalloc) -+#define XML_MemRealloc EXPAT_CHARTYPE_DECORATE(XML_MemRealloc) -+#define XML_Parse EXPAT_CHARTYPE_DECORATE(XML_Parse) -+#define XML_ParseBuffer EXPAT_CHARTYPE_DECORATE(XML_ParseBuffer) -+#define XML_ParserCreate EXPAT_CHARTYPE_DECORATE(XML_ParserCreate) -+#define XML_ParserCreateNS EXPAT_CHARTYPE_DECORATE(XML_ParserCreateNS) -+#define XML_ParserCreate_MM EXPAT_CHARTYPE_DECORATE(XML_ParserCreate_MM) -+#define XML_ParserFree EXPAT_CHARTYPE_DECORATE(XML_ParserFree) -+#define XML_ParserReset EXPAT_CHARTYPE_DECORATE(XML_ParserReset) -+#define XML_ResumeParser EXPAT_CHARTYPE_DECORATE(XML_ResumeParser) -+#define XML_SetAttlistDeclHandler EXPAT_CHARTYPE_DECORATE(XML_SetAttlistDeclHandler) -+#define XML_SetBase EXPAT_CHARTYPE_DECORATE(XML_SetBase) -+#define XML_SetCdataSectionHandler EXPAT_CHARTYPE_DECORATE(XML_SetCdataSectionHandler) -+#define XML_SetCharacterDataHandler EXPAT_CHARTYPE_DECORATE(XML_SetCharacterDataHandler) -+#define XML_SetCommentHandler EXPAT_CHARTYPE_DECORATE(XML_SetCommentHandler) -+#define XML_SetDefaultHandler EXPAT_CHARTYPE_DECORATE(XML_SetDefaultHandler) -+#define XML_SetDefaultHandlerExpand EXPAT_CHARTYPE_DECORATE(XML_SetDefaultHandlerExpand) -+#define XML_SetDoctypeDeclHandler EXPAT_CHARTYPE_DECORATE(XML_SetDoctypeDeclHandler) -+#define XML_SetElementDeclHandler EXPAT_CHARTYPE_DECORATE(XML_SetElementDeclHandler) -+#define XML_SetElementHandler EXPAT_CHARTYPE_DECORATE(XML_SetElementHandler) -+#define XML_SetEncoding EXPAT_CHARTYPE_DECORATE(XML_SetEncoding) -+#define XML_SetEndCdataSectionHandler EXPAT_CHARTYPE_DECORATE(XML_SetEndCdataSectionHandler) -+#define XML_SetEndDoctypeDeclHandler EXPAT_CHARTYPE_DECORATE(XML_SetEndDoctypeDeclHandler) -+#define XML_SetEndElementHandler EXPAT_CHARTYPE_DECORATE(XML_SetEndElementHandler) -+#define XML_SetEndNamespaceDeclHandler EXPAT_CHARTYPE_DECORATE(XML_SetEndNamespaceDeclHandler) -+#define XML_SetEntityDeclHandler EXPAT_CHARTYPE_DECORATE(XML_SetEntityDeclHandler) -+#define XML_SetExternalEntityRefHandler EXPAT_CHARTYPE_DECORATE(XML_SetExternalEntityRefHandler) -+#define XML_SetExternalEntityRefHandlerArg EXPAT_CHARTYPE_DECORATE(XML_SetExternalEntityRefHandlerArg) -+#define XML_SetHashSalt EXPAT_CHARTYPE_DECORATE(XML_SetHashSalt) -+#define XML_SetNamespaceDeclHandler EXPAT_CHARTYPE_DECORATE(XML_SetNamespaceDeclHandler) -+#define XML_SetNotStandaloneHandler EXPAT_CHARTYPE_DECORATE(XML_SetNotStandaloneHandler) -+#define XML_SetNotationDeclHandler EXPAT_CHARTYPE_DECORATE(XML_SetNotationDeclHandler) -+#define XML_SetParamEntityParsing EXPAT_CHARTYPE_DECORATE(XML_SetParamEntityParsing) -+#define XML_SetProcessingInstructionHandler EXPAT_CHARTYPE_DECORATE(XML_SetProcessingInstructionHandler) -+#define XML_SetReturnNSTriplet EXPAT_CHARTYPE_DECORATE(XML_SetReturnNSTriplet) -+#define XML_SetSkippedEntityHandler EXPAT_CHARTYPE_DECORATE(XML_SetSkippedEntityHandler) -+#define XML_SetStartCdataSectionHandler EXPAT_CHARTYPE_DECORATE(XML_SetStartCdataSectionHandler) -+#define XML_SetStartDoctypeDeclHandler EXPAT_CHARTYPE_DECORATE(XML_SetStartDoctypeDeclHandler) -+#define XML_SetStartElementHandler EXPAT_CHARTYPE_DECORATE(XML_SetStartElementHandler) -+#define XML_SetStartNamespaceDeclHandler EXPAT_CHARTYPE_DECORATE(XML_SetStartNamespaceDeclHandler) -+#define XML_SetUnknownEncodingHandler EXPAT_CHARTYPE_DECORATE(XML_SetUnknownEncodingHandler) -+#define XML_SetUnparsedEntityDeclHandler EXPAT_CHARTYPE_DECORATE(XML_SetUnparsedEntityDeclHandler) -+#define XML_SetUserData EXPAT_CHARTYPE_DECORATE(XML_SetUserData) -+#define XML_SetXmlDeclHandler EXPAT_CHARTYPE_DECORATE(XML_SetXmlDeclHandler) -+#define XML_StopParser EXPAT_CHARTYPE_DECORATE(XML_StopParser) -+#define XML_UseForeignDTD EXPAT_CHARTYPE_DECORATE(XML_UseForeignDTD) -+#define XML_UseParserAsHandlerArg EXPAT_CHARTYPE_DECORATE(XML_UseParserAsHandlerArg) -+ - #ifdef __cplusplus - extern "C" { - #endif --- misc/expat-2.1.0/lib/expat_external.h 2009-11-16 08:53:17.375000000 +0000 +++ misc/build/expat-2.1.0/lib/expat_external.h 2009-11-16 08:53:34.703125000 +0000 @@ -7,10 +7,6 @@ diff --git a/fontconfig/fontconfig-2.8.0.patch b/fontconfig/fontconfig-2.8.0.patch index 63511fb..a75648a 100644 --- a/fontconfig/fontconfig-2.8.0.patch +++ b/fontconfig/fontconfig-2.8.0.patch @@ -20,26 +20,6 @@ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ --- misc/build/fontconfig-2.8.0/configure +++ misc/build/fontconfig-2.8.0/configure -@@ -14368,7 +14368,7 @@ - ;; - yes) - --for ac_func in XML_SetDoctypeDeclHandler -+for ac_func in XML_SetDoctypeDeclHandler_UTF8 - do - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` - { $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -@@ -14468,7 +14468,7 @@ - fi - done - -- case "$ac_cv_func_XML_SetDoctypeDeclHandler" in -+ case "$ac_cv_func_XML_SetDoctypeDeclHandler_UTF8" in - yes) - HAVE_EXPAT=1 - ---- misc/build/fontconfig-2.8.0/configure -+++ misc/build/fontconfig-2.8.0/configure @@ -8718,7 +8718,7 @@ *Sun\ F*) # Sun Fortran 8.3 tmp_sharedflag='-G' ;; commit 814b0b45de540f06b51372a8adc43d3a8635258f Author: Michael Stahl <mst...@redhat.com> Date: Wed Nov 14 21:00:43 2012 +0100 gbuild: UnpackedTarball: print which patch failed to apply Change-Id: I5536d92c381a0df425a7d70387f1ebc457e68186 diff --git a/solenv/gbuild/UnpackedTarball.mk b/solenv/gbuild/UnpackedTarball.mk index 55113c2..046c7d1 100644 --- a/solenv/gbuild/UnpackedTarball.mk +++ b/solenv/gbuild/UnpackedTarball.mk @@ -136,7 +136,8 @@ $(call gb_Helper_abbreviate_dirs,\ for p in $(UNPACKED_PATCHES); do \ pl=$(UNPACKED_PATCHLEVEL); \ s=$${p##*.}; case "$$s" in [0-9]$(CLOSE_PAREN) pl="$$s"; ;; esac ; \ - $(GNUPATCH) -s -p$$pl < "$$p" || exit 1;\ + $(GNUPATCH) -s "-p$$pl" < "$$p"; \ + if test "$$?" -ne 0; then echo "Patch FAILED: $$p"; exit 1; fi;\ done && \ ) \ $(foreach file,$(UNPACKED_FIX_EOL),$(call gb_UnpackedTarball_CONVERTTODOS,$(file)) && ) \ commit 40d9a584bbafebd5ef10af4b69cad10e142981bd Author: Michael Stahl <mst...@redhat.com> Date: Wed Nov 14 20:59:23 2012 +0100 helpcompiler: evidently does not care that it uses UTF16 expat ... seeing as there isn't actually a handler in the compileExtensionHelp function; possibly dead code there. Change-Id: I96b3edff6be2d58d0c1852eb1043547c33e97c3a diff --git a/helpcompiler/Library_helplinker.mk b/helpcompiler/Library_helplinker.mk index d22693d..405ad80 100644 --- a/helpcompiler/Library_helplinker.mk +++ b/helpcompiler/Library_helplinker.mk @@ -46,7 +46,7 @@ $(eval $(call gb_Library_use_libraries,helplinker,\ )) $(eval $(call gb_Library_use_externals,helplinker,\ - expat_utf16 \ + expat_utf8 \ libxslt \ libxml2 \ clucene \ commit 9a72eb0fa485359c1c6738f212677d60313fd9ac Author: Michael Stahl <mst...@redhat.com> Date: Wed Nov 14 20:45:51 2012 +0100 sax: no obvious reason why expwrap should use expat_utf16 Change-Id: Id2d476c4fc13ccfb501ef920f75e2a95a7ce3734 diff --git a/sax/Library_expwrap.mk b/sax/Library_expwrap.mk index a6ac2f9..cdd9afa 100644 --- a/sax/Library_expwrap.mk +++ b/sax/Library_expwrap.mk @@ -19,7 +19,7 @@ $(eval $(call gb_Library_set_include,expwrap,\ $(eval $(call gb_Library_use_sdk_api,expwrap)) $(eval $(call gb_Library_use_externals,expwrap,\ - expat_utf16 \ + expat_utf8 \ )) $(eval $(call gb_Library_use_libraries,expwrap,\ commit 70527511fac91d81f59f79b216a391d547f28d1d Author: Michael Stahl <mst...@redhat.com> Date: Wed Nov 14 20:43:57 2012 +0100 expat: get rid of expat_xmltok static library: Just compile those files twice. Also rename the UTF8 library to plain "expat". This allows python to simply use that library and build "pyexpat" succesfully. Change-Id: I7e37ec5b87b70c2cf8c86e06709f0e8d0a67f09d diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 7d56e35..6712055 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -286,9 +286,8 @@ endef else # !SYSTEM_EXPAT $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ - ascii_expat_xmlparse \ - expat_xmlparse \ - expat_xmltok \ + expat \ + expat_utf16 \ expat_x64 \ )) @@ -300,7 +299,7 @@ $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ ) -$(if $(filter-out ascii_expat_xmlparse expat_xmltok,$(2)),\ +$(if $(filter expat_utf16,$(2)),\ $(call gb_LinkTarget_add_defs,$(1),\ -DXML_UNICODE \ )) @@ -315,12 +314,12 @@ endif # SYSTEM_EXPAT # now define 2 wrappers that select which internal static library to use... define gb_LinkTarget__use_expat_utf8 -$(call gb_LinkTarget__use_expat,$(1),ascii_expat_xmlparse expat_xmltok) +$(call gb_LinkTarget__use_expat,$(1),expat) endef define gb_LinkTarget__use_expat_utf16 -$(call gb_LinkTarget__use_expat,$(1),expat_xmlparse expat_xmltok) +$(call gb_LinkTarget__use_expat,$(1),expat_utf16) endef diff --git a/expat/Module_expat.mk b/expat/Module_expat.mk index 3770474..9366538 100644 --- a/expat/Module_expat.mk +++ b/expat/Module_expat.mk @@ -14,9 +14,8 @@ ifeq ($(SYSTEM_EXPAT),NO) $(eval $(call gb_Module_add_targets,expat,\ ExternalPackage_expat \ UnpackedTarball_expat \ - StaticLibrary_ascii_expat_xmlparse \ - StaticLibrary_expat_xmlparse \ - StaticLibrary_expat_xmltok \ + StaticLibrary_expat \ + StaticLibrary_expat_utf16 \ )) # Actually it wasn't that clear if we should diff --git a/expat/StaticLibrary_ascii_expat_xmlparse.mk b/expat/StaticLibrary_ascii_expat_xmlparse.mk deleted file mode 100644 index c0eb924..0000000 --- a/expat/StaticLibrary_ascii_expat_xmlparse.mk +++ /dev/null @@ -1,49 +0,0 @@ -# -*- 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_StaticLibrary_StaticLibrary,ascii_expat_xmlparse)) - -$(eval $(call gb_StaticLibrary_set_warnings_not_errors,ascii_expat_xmlparse)) - -$(eval $(call gb_StaticLibrary_use_unpacked,ascii_expat_xmlparse,expat)) - -# no configure step on windows, no dependency -ifneq ($(OS)$(COM),WNTMSC) -$(eval $(call gb_StaticLibrary_use_external_project,ascii_expat_xmlparse,expat)) -endif - -$(eval $(call gb_StaticLibrary_set_include,ascii_expat_xmlparse,\ - -I$(call gb_UnpackedTarball_get_dir,expat) \ - $$(INCLUDE) \ -)) - -ifeq ($(OS),MACOSX) -ifneq ($(strip $(SYSBASE)),) -$(eval $(call gb_StaticLibrary_add_defs,ascii_expat_xmlparse,\ - -DHAVE_MEMMOVE \ - -DHAVE_BCOPY \ -)) -endif -endif - -ifeq ($(OS),WNT) -$(eval $(call gb_StaticLibrary_add_defs,ascii_expat_xmlparse,\ - -DCOMPILED_FROM_DSP \ -)) -else -$(eval $(call gb_StaticLibrary_add_defs,ascii_expat_xmlparse,\ - -DHAVE_EXPAT_CONFIG_H \ -)) -endif - -$(eval $(call gb_StaticLibrary_add_generated_cobjects,ascii_expat_xmlparse,\ - UnpackedTarball/expat/lib/xmlparse \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/expat/StaticLibrary_expat.mk b/expat/StaticLibrary_expat.mk new file mode 100644 index 0000000..2501d72 --- /dev/null +++ b/expat/StaticLibrary_expat.mk @@ -0,0 +1,51 @@ +# -*- 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_StaticLibrary_StaticLibrary,expat)) + +$(eval $(call gb_StaticLibrary_set_warnings_not_errors,expat)) + +$(eval $(call gb_StaticLibrary_use_unpacked,expat,expat)) + +# no configure step on windows, no dependency +ifneq ($(OS)$(COM),WNTMSC) +$(eval $(call gb_StaticLibrary_use_external_project,expat,expat)) +endif + +$(eval $(call gb_StaticLibrary_set_include,expat,\ + -I$(call gb_UnpackedTarball_get_dir,expat) \ + $$(INCLUDE) \ +)) + +ifeq ($(OS),MACOSX) +ifneq ($(strip $(SYSBASE)),) +$(eval $(call gb_StaticLibrary_add_defs,expat,\ + -DHAVE_MEMMOVE \ + -DHAVE_BCOPY \ +)) +endif +endif + +ifeq ($(OS),WNT) +$(eval $(call gb_StaticLibrary_add_defs,expat,\ + -DCOMPILED_FROM_DSP \ +)) +else +$(eval $(call gb_StaticLibrary_add_defs,expat,\ + -DHAVE_EXPAT_CONFIG_H \ +)) +endif + +$(eval $(call gb_StaticLibrary_add_generated_cobjects,expat,\ + UnpackedTarball/expat/lib/xmlparse \ + UnpackedTarball/expat/lib/xmlrole \ + UnpackedTarball/expat/lib/xmltok \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/expat/StaticLibrary_expat_utf16.mk b/expat/StaticLibrary_expat_utf16.mk new file mode 100644 index 0000000..0ab3d1f --- /dev/null +++ b/expat/StaticLibrary_expat_utf16.mk @@ -0,0 +1,55 @@ +# -*- 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_StaticLibrary_StaticLibrary,expat_utf16)) + +$(eval $(call gb_StaticLibrary_set_warnings_not_errors,expat_utf16)) + +$(eval $(call gb_StaticLibrary_use_unpacked,expat_utf16,expat)) + +# no configure step on windows, no dependency +ifneq ($(OS)$(COM),WNTMSC) +$(eval $(call gb_StaticLibrary_use_external_project,expat_utf16,expat)) +endif + +$(eval $(call gb_StaticLibrary_add_defs,expat_utf16,\ + -DXML_UNICODE \ +)) + +$(eval $(call gb_StaticLibrary_set_include,expat_utf16,\ + -I$(call gb_UnpackedTarball_get_dir,expat) \ + $$(INCLUDE) \ +)) + +ifeq ($(OS),MACOSX) +ifneq ($(strip $(SYSBASE)),) +$(eval $(call gb_StaticLibrary_add_defs,expat_utf16,\ + -DHAVE_MEMMOVE \ + -DHAVE_BCOPY \ +)) +endif +endif + +ifeq ($(OS),WNT) +$(eval $(call gb_StaticLibrary_add_defs,expat_utf16,\ + -DCOMPILED_FROM_DSP \ +)) +else +$(eval $(call gb_StaticLibrary_add_defs,expat_utf16,\ + -DHAVE_EXPAT_CONFIG_H \ +)) +endif + +$(eval $(call gb_StaticLibrary_add_generated_cobjects,expat_utf16,\ + UnpackedTarball/expat/lib/unicode_xmlparse \ + UnpackedTarball/expat/lib/unicode_xmlrole \ + UnpackedTarball/expat/lib/unicode_xmltok \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/expat/StaticLibrary_expat_xmlparse.mk b/expat/StaticLibrary_expat_xmlparse.mk deleted file mode 100644 index 39f79d0..0000000 --- a/expat/StaticLibrary_expat_xmlparse.mk +++ /dev/null @@ -1,53 +0,0 @@ -# -*- 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_StaticLibrary_StaticLibrary,expat_xmlparse)) - -$(eval $(call gb_StaticLibrary_set_warnings_not_errors,expat_xmlparse)) - -$(eval $(call gb_StaticLibrary_use_unpacked,expat_xmlparse,expat)) - -# no configure step on windows, no dependency -ifneq ($(OS)$(COM),WNTMSC) -$(eval $(call gb_StaticLibrary_use_external_project,expat_xmlparse,expat)) -endif - -$(eval $(call gb_StaticLibrary_add_defs,expat_xmlparse,\ - -DXML_UNICODE \ -)) - -$(eval $(call gb_StaticLibrary_set_include,expat_xmlparse,\ - -I$(call gb_UnpackedTarball_get_dir,expat) \ - $$(INCLUDE) \ -)) - -ifeq ($(OS),MACOSX) -ifneq ($(strip $(SYSBASE)),) -$(eval $(call gb_StaticLibrary_add_defs,expat_xmlparse,\ - -DHAVE_MEMMOVE \ - -DHAVE_BCOPY \ -)) -endif -endif - -ifeq ($(OS),WNT) -$(eval $(call gb_StaticLibrary_add_defs,expat_xmlparse,\ - -DCOMPILED_FROM_DSP \ -)) -else -$(eval $(call gb_StaticLibrary_add_defs,expat_xmlparse,\ - -DHAVE_EXPAT_CONFIG_H \ -)) -endif - -$(eval $(call gb_StaticLibrary_add_generated_cobjects,expat_xmlparse,\ - UnpackedTarball/expat/lib/unicode_xmlparse \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/expat/StaticLibrary_expat_xmltok.mk b/expat/StaticLibrary_expat_xmltok.mk deleted file mode 100644 index 6168844..0000000 --- a/expat/StaticLibrary_expat_xmltok.mk +++ /dev/null @@ -1,50 +0,0 @@ -# -*- 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_StaticLibrary_StaticLibrary,expat_xmltok)) - -$(eval $(call gb_StaticLibrary_set_warnings_not_errors,expat_xmltok)) - -$(eval $(call gb_StaticLibrary_use_unpacked,expat_xmltok,expat)) - -# no configure step on windows, no dependency -ifneq ($(OS)$(COM),WNTMSC) -$(eval $(call gb_StaticLibrary_use_external_project,expat_xmltok,expat)) -endif - -$(eval $(call gb_StaticLibrary_set_include,expat_xmltok,\ - -I$(call gb_UnpackedTarball_get_dir,expat) \ - $$(INCLUDE) \ -)) - -ifeq ($(OS),MACOSX) -ifneq ($(strip $(SYSBASE)),) -$(eval $(call gb_StaticLibrary_add_defs,expat_xmltok,\ - -DHAVE_MEMMOVE \ - -DHAVE_BCOPY \ -)) -endif -endif - -ifeq ($(OS),WNT) -$(eval $(call gb_StaticLibrary_add_defs,expat_xmltok,\ - -DCOMPILED_FROM_DSP \ -)) -else -$(eval $(call gb_StaticLibrary_add_defs,expat_xmltok,\ - -DHAVE_EXPAT_CONFIG_H \ -)) -endif - -$(eval $(call gb_StaticLibrary_add_generated_cobjects,expat_xmltok,\ - UnpackedTarball/expat/lib/xmltok \ - UnpackedTarball/expat/lib/xmlrole \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/expat/UnpackedTarball_expat.mk b/expat/UnpackedTarball_expat.mk index d9fb82c..a4daa51 100644 --- a/expat/UnpackedTarball_expat.mk +++ b/expat/UnpackedTarball_expat.mk @@ -23,6 +23,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,expat,\ # on windows 64 bit platform we need to link it twice: # with $(LINK_X64_BINARY) and with $(gb_LINK). $(eval $(call gb_UnpackedTarball_set_post_action,expat,\ + cp lib/xmltok.c lib/unicode_xmltok.c && \ + cp lib/xmlrole.c lib/unicode_xmlrole.c && \ cp lib/xmlparse.c lib/unicode_xmlparse.c \ $(if $(filter $(BUILD_X64),TRUE), && \ cp lib/xmlparse.c lib/xmlparse_x64.c && \ commit e097ec36d7c6488049ba16ec75ec40e0e2bb0789 Author: Michael Stahl <mst...@redhat.com> Date: Sun Nov 11 20:02:47 2012 +0100 tweak some build.lsts... Change-Id: Ia9b5b2775ad91661bf3d130417a1624fa4d855d2 diff --git a/boost/prj/build.lst b/boost/prj/build.lst index 957da00..9d41551 100644 --- a/boost/prj/build.lst +++ b/boost/prj/build.lst @@ -1,3 +1,2 @@ bo boost : solenv soltools NULL -bo boost usr1 - all bo_mkout NULL -bo boost nmake - all bo_boost NULL +bo boost\prj nmake - all bo_boost NULL diff --git a/curl/prj/build.lst b/curl/prj/build.lst index 96e092d..5f8dcb1 100644 --- a/curl/prj/build.lst +++ b/curl/prj/build.lst @@ -1,3 +1,2 @@ xc curl : external NULL -xc curl usr1 - all xc_mkout NULL -xc curl nmake - all xc_curl NULL +xc curl\prj nmake - all xc_curl NULL diff --git a/epm/prj/build.lst b/epm/prj/build.lst index 1086d14..f3b3a94 100644 --- a/epm/prj/build.lst +++ b/epm/prj/build.lst @@ -1,2 +1,2 @@ ep epm : solenv NULL -ep epm nmake - u ep_mkout NULL +ep epm\prj nmake - u ep_mkout NULL diff --git a/fontconfig/prj/build.lst b/fontconfig/prj/build.lst index 3033261..c7ebad0 100644 --- a/fontconfig/prj/build.lst +++ b/fontconfig/prj/build.lst @@ -1,3 +1,2 @@ fc fontconfig : FREETYPE:freetype EXPAT:expat NULL -fc fontconfig usr1 - u fc_mkout NULL -fc fontconfig nmake - u fc_libfontconfig NULL +fc fontconfig\prj nmake - u fc_libfontconfig NULL diff --git a/freetype/prj/build.lst b/freetype/prj/build.lst index c72011f..84ea0df 100644 --- a/freetype/prj/build.lst +++ b/freetype/prj/build.lst @@ -1,2 +1,2 @@ ft freetype : solenv NULL -ft freetype nmake - u ft_libfreetype NULL +ft freetype\prj nmake - u ft_libfreetype NULL diff --git a/graphite/prj/build.lst b/graphite/prj/build.lst index 2f5f881..23e5d40 100644 --- a/graphite/prj/build.lst +++ b/graphite/prj/build.lst @@ -1,3 +1,2 @@ gr graphite : solenv soltools NULL -gr graphite usr1 - all gr_mkout NULL -gr graphite nmake - all gr_graphite NULL +gr graphite\prj nmake - all gr_graphite NULL diff --git a/hunspell/prj/build.lst b/hunspell/prj/build.lst index ea87500..9505cfc 100644 --- a/hunspell/prj/build.lst +++ b/hunspell/prj/build.lst @@ -1,3 +1,2 @@ hun hunspell : solenv ICU:icu NULL -hun hunspell usr1 - all hun_mkout NULL -hun hunspell nmake - all hun_hunspell NULL +hun hunspell\prj nmake - all hun_hunspell NULL diff --git a/hyphen/prj/build.lst b/hyphen/prj/build.lst index c953a57..91fb9cc 100644 --- a/hyphen/prj/build.lst +++ b/hyphen/prj/build.lst @@ -1,3 +1,2 @@ hyp hyphen : soltools solenv NULL -hyp hyphen usr1 - all hyp_mkout NULL -hyp hyphen nmake - all hyp_hyphen NULL +hyp hyphen\prj nmake - all hyp_hyphen NULL diff --git a/libexttextcat/prj/build.lst b/libexttextcat/prj/build.lst index 133bcb7..b52592e 100644 --- a/libexttextcat/prj/build.lst +++ b/libexttextcat/prj/build.lst @@ -1,3 +1,2 @@ ltc libexttextcat : soltools solenv NULL -ltc libexttextcat usr1 - all ltc_mkout NULL -ltc libexttextcat nmake - all ltc_libtextcat NULL +ltc libexttextcat\prj nmake - all ltc_libtextcat NULL diff --git a/lpsolve/prj/build.lst b/lpsolve/prj/build.lst index 68b61bf..6642750 100644 --- a/lpsolve/prj/build.lst +++ b/lpsolve/prj/build.lst @@ -1,3 +1,2 @@ lps lpsolve : solenv NULL -lps lpsolve usr1 - all lps_mkout NULL -lps lpsolve nmake - all lps_lpsolve NULL +lps lpsolve\prj nmake - all lps_lpsolve NULL diff --git a/mythes/prj/build.lst b/mythes/prj/build.lst index 6c3cb80..de7fdc5 100644 --- a/mythes/prj/build.lst +++ b/mythes/prj/build.lst @@ -1,3 +1,2 @@ myt mythes : soltools solenv HUNSPELL:hunspell NULL -myt mythes usr1 - all myt_mkout NULL -myt mythes nmake - all myt_mythes NULL +myt mythes\prj nmake - all myt_mythes NULL diff --git a/openldap/prj/build.lst b/openldap/prj/build.lst index c54f91d..804edb3 100644 --- a/openldap/prj/build.lst +++ b/openldap/prj/build.lst @@ -1,3 +1,2 @@ ol openldap : soltools NSS:nss NULL -ol openldap usr1 - u ol_mkout NULL -ol openldap nmake - u ol_openldap NULL +ol openldap\prj nmake - u ol_openldap NULL diff --git a/postgresql/prj/build.lst b/postgresql/prj/build.lst index abe042e..afa4f7d 100644 --- a/postgresql/prj/build.lst +++ b/postgresql/prj/build.lst @@ -1,3 +1,3 @@ my postgresql : solenv sal OPENLDAP:openldap OPENSSL:openssl NULL -my postgresql nmake - all my_mkout NULL +my postgresql\prj nmake - all my_mkout NULL diff --git a/zlib/prj/build.lst b/zlib/prj/build.lst index 8ef73d9..3ef0a0c 100644 --- a/zlib/prj/build.lst +++ b/zlib/prj/build.lst @@ -1,2 +1,2 @@ zl zlib : soltools NULL -zl zlib nmake - all zl_mkout NULL +zl zlib\prj nmake - all zl_mkout NULL _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits