diff options
| author | sb <sb@openoffice.org> | 2010-09-16 16:45:57 +0200 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-09-16 16:45:57 +0200 |
| commit | 6bc2155fd37574fbb2301326c96b8530b9c28d96 (patch) | |
| tree | 4a1baf30b6d4d2c92a2a2fe280d321a388cb4ea9 /libxml2 | |
| parent | da1320efe152132d088042ae8857571113fad5e3 (diff) | |
| parent | 52dce173df6bbcc79126c63a7736ef3f6c21a706 (diff) | |
sb126: merged in DEV300_m87
Diffstat (limited to 'libxml2')
| -rw-r--r-- | libxml2/libxml2-global-symbols.patch | 59 | ||||
| -rw-r--r-- | libxml2/libxml2-gnome602728.patch | 12 | ||||
| -rw-r--r-- | libxml2/makefile.mk | 5 |
3 files changed, 63 insertions, 13 deletions
diff --git a/libxml2/libxml2-global-symbols.patch b/libxml2/libxml2-global-symbols.patch new file mode 100644 index 000000000000..20cd273d745c --- /dev/null +++ b/libxml2/libxml2-global-symbols.patch @@ -0,0 +1,59 @@ +--- misc/libxml2-2.7.6/libxml2.syms Tue Oct 6 18:31:35 2009 ++++ misc/build/libxml2-2.7.6/libxml2.syms Wed Jul 7 15:43:17 2010 +@@ -2184,10 +2184,10 @@ + } LIBXML2_2.6.27; + + LIBXML2_2.6.29 { +- global: ++# global: + + # threads +- xmlDllMain; ++#WIN32 only! xmlDllMain; + } LIBXML2_2.6.28; + + LIBXML2_2.6.32 { +@@ -2231,3 +2231,43 @@ + xmlXIncludeProcessTreeFlagsData; + } LIBXML2_2.7.3; + ++# HACK: export global variable accessor functions (globals.h) ++LIBXML2_GLOBAL_VARIABLES { ++ global: ++# __xmlMalloc; ++# __xmlMallocAtomic; ++# __xmlRealloc; ++# __xmlFree; ++# __xmlMemStrdup; ++ __docbDefaultSAXHandler; ++ __htmlDefaultSAXHandler; ++ __xmlLastError; ++ __oldXMLWDcompatibility; ++ __xmlBufferAllocScheme; ++ __xmlDefaultBufferSize; ++ __xmlDefaultSAXHandler; ++ __xmlDefaultSAXLocator; ++ __xmlDoValidityCheckingDefaultValue; ++ __xmlGenericError; ++ __xmlStructuredError; ++ __xmlGenericErrorContext; ++ __xmlStructuredErrorContext; ++ __xmlGetWarningsDefaultValue; ++ __xmlIndentTreeOutput; ++ __xmlTreeIndentString; ++ __xmlKeepBlanksDefaultValue; ++ __xmlLineNumbersDefaultValue; ++ __xmlLoadExtDtdDefaultValue; ++ __xmlParserDebugEntities; ++ __xmlParserVersion; ++ __xmlPedanticParserDefaultValue; ++ __xmlSaveNoEmptyTags; ++ __xmlSubstituteEntitiesDefaultValue; ++ __xmlRegisterNodeDefaultValue; ++ __xmlDeregisterNodeDefaultValue; ++ __xmlParserInputBufferCreateFilenameValue; ++ __xmlOutputBufferCreateFilenameValue; ++# Solaris ld needs explicit auto-reduction (or, alternatively, "-B local") ++ local: ++ *; ++} LIBXML2_2.7.4; diff --git a/libxml2/libxml2-gnome602728.patch b/libxml2/libxml2-gnome602728.patch deleted file mode 100644 index b284d457a751..000000000000 --- a/libxml2/libxml2-gnome602728.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- misc/libxml2-2.7.6/configure 2009-12-18 12:12:08.000000000 +0000 -+++ misc/build/libxml2-2.7.6/configure 2009-12-18 12:20:40.000000000 +0000 -@@ -12150,7 +12150,7 @@ - $(/usr/bin/ld --help 2>&1 | grep -- --version-script >/dev/null) && \ - VERSION_SCRIPT_FLAGS=-Wl,--version-script= - test "`uname`" == "SunOS" && \ -- VERSION_SCRIPT_FLAGS="-Wl,-M -Wl," -+ VERSION_SCRIPT_FLAGS="" - - if test -n "$VERSION_SCRIPT_FLAGS"; then - USE_VERSION_SCRIPT_TRUE= - diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk index 2c80066ccec1..453ba3a68406 100644 --- a/libxml2/makefile.mk +++ b/libxml2/makefile.mk @@ -46,10 +46,13 @@ LIBXML2VERSION=2.7.6 TARFILE_NAME=$(PRJNAME)-$(LIBXML2VERSION) TARFILE_MD5=7740a8ec23878a2f50120e1faa2730f2 + +# libxml2-global-symbols: #i112480#: Solaris ld won't export non-listed symbols PATCH_FILES=libxml2-configure.patch \ libxml2-mingw.patch \ libxml2-gnome599717.patch \ - libxml2-gnome602728.patch + libxml2-global-symbols.patch \ + # This is only for UNX environment now |