diff options
author | David Ostrovsky <david@ostrovsky.org> | 2012-10-12 12:28:11 -0700 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2012-10-25 17:37:34 +0200 |
commit | 2ffde7b17192f76f815ab451f08164519f69887e (patch) | |
tree | 9ea5145c64e94170e1baf7b1a1e4adb92e772cf7 /expat/expat-2.1.0.patch | |
parent | remove accidentally committed garbage (diff) | |
download | core-2ffde7b17192f76f815ab451f08164519f69887e.tar.gz core-2ffde7b17192f76f815ab451f08164519f69887e.zip |
gbuildification of expat
Two different xmlparse libraries are created: ascii_expat_xmlparse and
expat_xmlparse. One without -DXML_UNICODE and one with. Source file are
duplicated and renamed with gb_UnpackedTarball_set_post_action function
to be able to add artifacts twice to gbuild machinery.
On windows 64 bit additional two librares are created: expat_xmlparse_x64 and
expat_xmltok_x64. That is due the problem with shell/shlxthandler (comment):
------------------------------------------------------
use UNICODE only because shell/shlxthandler
doesn't link against ascii_expat_xmlparse
------------------------------------------------------
Include files are delivered to $(OUTDIR)/inc/external/expat
now and not to $(OUTDIR)/inc/external any more.
set_include call is added in RepositoryExternal.mk.
To define dependency between StaticLibrary and ExternalProject
new function was introduced: gb_StaticLibrary_use_external_project.
Change-Id: I3b3aa40f39ef82c70f6f28790b582c83e48bdf76
Diffstat (limited to 'expat/expat-2.1.0.patch')
-rw-r--r-- | expat/expat-2.1.0.patch | 107 |
1 files changed, 13 insertions, 94 deletions
diff --git a/expat/expat-2.1.0.patch b/expat/expat-2.1.0.patch index 28d6322d3299..cb85ec5cbe2a 100644 --- a/expat/expat-2.1.0.patch +++ b/expat/expat-2.1.0.patch @@ -1,97 +1,3 @@ ---- misc/expat-2.1.0/lib/makefile.mk Wed Aug 20 14:33:55 2008 -+++ misc/build/expat-2.1.0/lib/makefile.mk Wed Aug 20 14:26:42 2008 -@@ -1 +1,90 @@ --dummy -+#************************************************************************* -+# -+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+# -+# Copyright 2000, 2010 Oracle and/or its affiliates. -+# -+# OpenOffice.org - a multi-platform office productivity suite -+# -+# This file is part of OpenOffice.org. -+# -+# OpenOffice.org is free software: you can redistribute it and/or modify -+# it under the terms of the GNU Lesser General Public License version 3 -+# only, as published by the Free Software Foundation. -+# -+# OpenOffice.org is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU Lesser General Public License version 3 for more details -+# (a copy is included in the LICENSE file that accompanied this code). -+# -+# You should have received a copy of the GNU Lesser General Public License -+# version 3 along with OpenOffice.org. If not, see -+# <http://www.openoffice.org/license.html> -+# for a copy of the LGPLv3 License. -+# -+#************************************************************************* -+PRJ=../../../../.. -+ -+PRJNAME=expat -+TARGET=expat -+LIBTARGET=NO -+EXTERNAL_WARNINGS_NOT_ERRORS=TRUE -+VISIBILITY_HIDDEN=TRUE -+ -+# --- Settings ----------------------------------------------------- -+.INCLUDE : settings.mk -+# --- Files -------------------------------------------------------- -+ -+CFLAGS+=-I.. -+ -+.IF "$(OS)"=="WNT" -+CDEFS+=-DCOMPILED_FROM_DSP -+.ELSE -+CDEFS+=-DHAVE_EXPAT_CONFIG_H -+.ENDIF -+ -+.IF "$(OS)"=="MACOSX" && "$(SYSBASE)"!="" -+CDEFS+=-DHAVE_MEMMOVE -DHAVE_BCOPY -+.ENDIF # "$(OS)"=="MACOSX" -+ -+SLOFILES=$(SLO)/xmlparse.obj \ -+ $(SLO)/xmlrole.obj \ -+ $(SLO)/xmltok.obj -+ -+SECOND_BUILD=UNICODE -+UNICODE_SLOFILES=$(SLO)/xmlparse.obj -+UNICODECDEFS+=-DXML_UNICODE -+ -+LIB1ARCHIV=$(LB)/libascii_$(TARGET)_xmlparse.a -+LIB1TARGET=$(SLB)/ascii_$(TARGET)_xmlparse.lib -+LIB1OBJFILES=$(SLO)/xmlparse.obj -+ -+LIB2ARCHIV=$(LB)/lib$(TARGET)_xmlparse.a -+LIB2TARGET=$(SLB)/$(TARGET)_xmlparse.lib -+LIB2OBJFILES =$(REAL_UNICODE_SLOFILES) -+ -+LIB3ARCHIV=$(LB)/lib$(TARGET)_xmltok.a -+LIB3TARGET=$(SLB)/$(TARGET)_xmltok.lib -+LIB3OBJFILES=$(SLO)/xmlrole.obj $(SLO)/xmltok.obj -+ -+.IF "$(BUILD_X64)"!="" -+# ---------------- X64 stuff special --------------------- -+# use UNICODE only because shell/shlxthandler -+# doesn't link against ascii_expat_xmlparse -+#--------------------------------------------------------- -+SLOFILES_X64=$(SLO_X64)/xmlparse.obj \ -+ $(SLO_X64)/xmlrole.obj \ -+ $(SLO_X64)/xmltok.obj -+CDEFS_X64+=-DXML_UNICODE -DCOMPILED_FROM_DSP -+CFLAGS_X64+=-I.. -+LIB1TARGET_X64=$(SLB_X64)/$(TARGET)_xmlparse.lib -+LIB1OBJFILES_X64=$(SLO_X64)/xmlparse.obj -+LIB2TARGET_X64=$(SLB_X64)/$(TARGET)_xmltok.lib -+LIB2OBJFILES_X64=$(SLO_X64)/xmlrole.obj $(SLO_X64)/xmltok.obj -+.ENDIF # "$(BUILD_X64)"!="" -+ -+# --- Targets ------------------------------------------------------ -+.INCLUDE : set_wntx64.mk -+.INCLUDE : target.mk -+.INCLUDE : tg_wntx64.mk --- misc/expat-2.1.0/lib/expat_external.h +++ misc/build/expat-2.1.0/lib/expat_external.h @@ -86,9 +86,11 @@ @@ -182,3 +88,16 @@ #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 @@ + + /* External API definitions */ + +-#if defined(_MSC_EXTENSIONS) && !defined(__BEOS__) && !defined(__CYGWIN__) +-#define XML_USE_MSC_EXTENSIONS 1 +-#endif +- + /* Expat tries very hard to make the API boundary very specifically + defined. There are two macros defined to control this boundary; + each of these can be defined before including this header to |