summaryrefslogtreecommitdiff
path: root/libxslt
diff options
context:
space:
mode:
Diffstat (limited to 'libxslt')
-rw-r--r--libxslt/libxslt-configure.patch79
-rw-r--r--libxslt/libxslt-internal-symbols.patch66
-rw-r--r--libxslt/libxslt-mingw.patch36
-rw-r--r--libxslt/libxslt-win_manifest.patch11
-rw-r--r--libxslt/libxsltversion.mk33
-rw-r--r--libxslt/makefile.mk154
-rw-r--r--libxslt/prj/build.lst3
-rw-r--r--libxslt/prj/d.lst11
8 files changed, 393 insertions, 0 deletions
diff --git a/libxslt/libxslt-configure.patch b/libxslt/libxslt-configure.patch
new file mode 100644
index 000000000000..bfa0b512824e
--- /dev/null
+++ b/libxslt/libxslt-configure.patch
@@ -0,0 +1,79 @@
+--- misc/libxslt-1.1.26/ltmain.sh Wed Aug 29 14:28:46 2007
++++ misc/build/libxslt-1.1.26/ltmain.sh Wed Jun 25 13:06:05 2008
+@@ -6195,9 +6195,9 @@
+ revision="$number_revision"
+ ;;
+ freebsd-aout|freebsd-elf|sunos)
+- current="$number_major"
+- revision="$number_minor"
+- age="0"
++ current=`expr $number_major + $number_minor`
++ age="$number_minor"
++ revision="$number_revision"
+ ;;
+ irix|nonstopux)
+ func_arith $number_major + $number_minor
+@@ -6271,8 +6271,8 @@
+ ;;
+
+ freebsd-elf)
+- major=".$current"
+- versuffix=".$current"
++ major=.`expr $current - $age`
++ versuffix="$major.$age.$revision"
+ ;;
+
+ irix | nonstopux)
+--- misc/libxslt-1.1.26/xslt-config.in Wed Jan 17 14:18:26 2007
++++ misc/build/libxslt-1.1.26/xslt-config.in Wed Jun 25 13:06:05 2008
+@@ -1,10 +1,16 @@
+ #! /bin/sh
+
+-prefix=@prefix@
+-exec_prefix=@exec_prefix@
++#prefix=@prefix@
++#exec_prefix=@exec_prefix@
++#exec_prefix_set=no
++#includedir=@includedir@
++#libdir=@libdir@
++
++prefix=${SOLARVERSION}/${INPATH}
++exec_prefix=${SOLARVERSION}/${INPATH}
+ exec_prefix_set=no
+-includedir=@includedir@
+-libdir=@libdir@
++includedir=${SOLARVERSION}/${INPATH}/inc${UPDMINOREXT}/external
++libdir=${SOLARVERSION}/${INPATH}/lib${UPDMINOREXT}
+
+ usage()
+ {
+@@ -89,7 +95,8 @@
+ shift
+ done
+
+-the_libs="@XSLT_LIBDIR@ @XSLT_LIBS@"
++#the_libs="@XSLT_LIBDIR@ @XSLT_LIBS@"
++the_libs="-L${libdir} ${XSLTLIB} -lm"
+ if test "$includedir" != "/usr/include"; then
+ the_flags="$the_flags -I$includedir `@XML_CONFIG@ --cflags`"
+ else
+--- misc/libxslt-1.1.26/configure 2008-05-14 00:40:54.000000000 +0900
++++ misc/build/libxslt-1.1.26/configure 2008-07-17 22:12:38.097000000 +0900
+@@ -7437,7 +7437,7 @@
+
+ cygwin*)
+ # func_win32_libid is a shell function defined in ltmain.sh
+- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
++ lt_cv_deplibs_check_method='file_magic ^x86 archive|^x86 DLL'
+ lt_cv_file_magic_cmd='func_win32_libid'
+ ;;
+
+@@ -7446,7 +7446,7 @@
+ # func_win32_libid shell function, so use a weaker test based on 'objdump',
+ # unless we find 'file', for example because we are cross-compiling.
+ if ( file / ) >/dev/null 2>&1; then
+- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
++ lt_cv_deplibs_check_method='file_magic ^x86 archive|^x86 DLL'
+ lt_cv_file_magic_cmd='func_win32_libid'
+ else
+ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
diff --git a/libxslt/libxslt-internal-symbols.patch b/libxslt/libxslt-internal-symbols.patch
new file mode 100644
index 000000000000..813c34f0386a
--- /dev/null
+++ b/libxslt/libxslt-internal-symbols.patch
@@ -0,0 +1,66 @@
+--- misc/libxslt-1.1.26/libxslt/libxslt.syms Thu Sep 24 16:28:46 2009
++++ misc/build/libxslt-1.1.26/libxslt/libxslt.syms Thu Jul 8 12:22:14 2010
+@@ -107,7 +107,7 @@
+ xsltFreeCompMatchList;
+ xsltFreeTemplateHashes;
+ xsltGetTemplate;
+- xsltMatchPattern;
++#NOT_IMPLEMENTED xsltMatchPattern;
+ xsltTestCompMatchList;
+
+ # preproc
+@@ -406,7 +406,7 @@
+ global:
+
+ # xsltInternals
+- xsltConstNamespaceNameXSLT; # variable
++#XSLT_REFACTORED_XSLT_NSCOMP xsltConstNamespaceNameXSLT; # variable
+ xsltExtensionInstructionResultFinalize;
+ xsltExtensionInstructionResultRegister;
+ xsltInitCtxtKey;
+@@ -415,24 +415,24 @@
+ xsltInit;
+
+ # xsltInternals
+- xsltParseAnyXSLTElem;
+- xsltParseSequenceConstructor;
+- xsltPointerListAddSize;
+- xsltPointerListClear;
+- xsltPointerListCreate;
+- xsltPointerListFree;
++#XSLT_REFACTORED xsltParseAnyXSLTElem;
++#XSLT_REFACTORED xsltParseSequenceConstructor;
++#XSLT_REFACTORED xsltPointerListAddSize;
++#XSLT_REFACTORED xsltPointerListClear;
++#XSLT_REFACTORED xsltPointerListCreate;
++#XSLT_REFACTORED xsltPointerListFree;
+ xsltRegisterLocalRVT;
+ xsltReleaseRVT;
+- xsltRestoreDocumentNamespaces;
++#XSLT_REFACTORED_XSLT_NSCOMP xsltRestoreDocumentNamespaces;
+
+ # extensions
+- xsltStyleStylesheetLevelGetExtData;
++#XSLT_REFACTORED xsltStyleStylesheetLevelGetExtData;
+
+ # xsltInternals
+- xsltTransStorageAdd;
+- xsltTransStorageRemove;
++#NOT_IMPLEMENTED xsltTransStorageAdd;
++#NOT_IMPLEMENTED xsltTransStorageRemove;
+ xsltUninit;
+- xsltXSLTAttrMarker; # variable
++#XSLT_REFACTORED xsltXSLTAttrMarker; # variable
+ } LIBXML2_1.1.9;
+
+ LIBXML2_1.1.20 {
+@@ -475,5 +475,9 @@
+
+ # transform
+ xsltProcessOneNode;
++
++# Solaris ld needs explicit auto-reduction (or, alternatively, "-B local")
++ local:
++ *;
+ } LIBXML2_1.1.25;
+
diff --git a/libxslt/libxslt-mingw.patch b/libxslt/libxslt-mingw.patch
new file mode 100644
index 000000000000..da8eee3b1098
--- /dev/null
+++ b/libxslt/libxslt-mingw.patch
@@ -0,0 +1,36 @@
+--- misc/libxslt-1.1.26/ltmain.sh 2010-06-06 14:43:28.785750000 +0900
++++ misc/build/libxslt-1.1.26/ltmain.sh 2010-06-06 15:14:26.176375000 +0900
+@@ -2983,15 +2983,7 @@
+ *mingw* )
+ lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
+ case $build in
+- *mingw* ) # actually, msys
+- # awkward: cmd appends spaces to result
+- lt_sed_strip_trailing_spaces="s/[ ]*\$//"
+- func_to_host_path_tmp1=`( cmd //c echo "$1" |\
+- $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
+- func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
+- $SED -e "$lt_sed_naive_backslashify"`
+- ;;
+- *cygwin* )
++ *cygwin* | *mingw* )
+ func_to_host_path_tmp1=`cygpath -w "$1"`
+ func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
+ $SED -e "$lt_sed_naive_backslashify"`
+@@ -3062,15 +3054,7 @@
+ func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\
+ $SED -e 's|^:*||' -e 's|:*$||'`
+ case $build in
+- *mingw* ) # Actually, msys.
+- # Awkward: cmd appends spaces to result.
+- lt_sed_strip_trailing_spaces="s/[ ]*\$//"
+- func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\
+- $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
+- func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
+- $SED -e "$lt_sed_naive_backslashify"`
+- ;;
+- *cygwin* )
++ *cygwin* | *mingw* )
+ func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"`
+ func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
+ $SED -e "$lt_sed_naive_backslashify"`
diff --git a/libxslt/libxslt-win_manifest.patch b/libxslt/libxslt-win_manifest.patch
new file mode 100644
index 000000000000..43c14eb70b8b
--- /dev/null
+++ b/libxslt/libxslt-win_manifest.patch
@@ -0,0 +1,11 @@
+--- misc/libxslt-1.1.26/win32/configure.js 2007-08-03 15:41:02.000000000 +0200
++++ misc/build/libxslt-1.1.26/win32/configure.js 2009-05-07 13:09:42.294993200 +0200
+@@ -52,7 +52,7 @@
+ var dirSep = "\\";
+ var compiler = "msvc";
+ var cruntime = "/MD";
+-var vcmanifest = false;
++var vcmanifest = true;
+ var buildDebug = 0;
+ var buildStatic = 0;
+ var buildPrefix = ".";
diff --git a/libxslt/libxsltversion.mk b/libxslt/libxsltversion.mk
new file mode 100644
index 000000000000..c80c0e9535b0
--- /dev/null
+++ b/libxslt/libxsltversion.mk
@@ -0,0 +1,33 @@
+#*************************************************************************
+#
+# 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.
+#
+#*************************************************************************
+# major
+LIBXSLT_MAJOR=1
+# minor
+LIBXSLT_MINOR=1
+# micro
+LIBXSLT_MICRO=26
+
diff --git a/libxslt/makefile.mk b/libxslt/makefile.mk
new file mode 100644
index 000000000000..fd7273b0c6b9
--- /dev/null
+++ b/libxslt/makefile.mk
@@ -0,0 +1,154 @@
+#*************************************************************************
+#
+# 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=libxslt
+TARGET=so_libxslt
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE : settings.mk
+
+.IF "$(SYSTEM_LIBXSLT)" == "YES"
+all:
+ @echo "An already available installation of libxslt should exist on your system."
+ @echo "Therefore the version provided here does not need to be built in addition."
+.ENDIF
+
+# --- Files --------------------------------------------------------
+
+.IF "$(L10N_framework)"==""
+
+.INCLUDE : libxsltversion.mk
+
+LIBXSLTVERSION=$(LIBXSLT_MAJOR).$(LIBXSLT_MINOR).$(LIBXSLT_MICRO)
+
+TARFILE_NAME=$(PRJNAME)-$(LIBXSLTVERSION)
+TARFILE_MD5=e61d0364a30146aaa3001296f853b2b9
+
+# libxslt-internal-symbols: #i112480#: Solaris ld requires symbols to be defined
+PATCH_FILES=libxslt-configure.patch \
+ libxslt-win_manifest.patch \
+ libxslt-mingw.patch \
+ libxslt-internal-symbols.patch
+
+
+# This is only for UNX environment now
+.IF "$(OS)"=="WNT"
+.IF "$(COM)"=="GCC"
+xslt_CC=$(CC) -mthreads
+.IF "$(MINGW_SHARED_GCCLIB)"=="YES"
+xslt_CC+=-shared-libgcc
+.ENDIF
+xslt_LIBS=
+.IF "$(MINGW_SHARED_GXXLIB)"=="YES"
+xslt_LIBS+=-lstdc++_s
+.ENDIF
+CONFIGURE_DIR=
+CONFIGURE_ACTION=.$/configure
+CONFIGURE_FLAGS=--without-crypto --without-python --enable-static=no --build=i586-pc-mingw32 --host=i586-pc-mingw32 CC="$(xslt_CC)" CFLAGS="$(xslt_CFLAGS)" LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc-v2 -L$(ILIB:s/;/ -L/)" LIBS="$(xslt_LIBS)" LIBXML2LIB=$(LIBXML2LIB) OBJDUMP=objdump
+BUILD_ACTION=chmod 777 xslt-config && $(GNUMAKE)
+BUILD_FLAGS+= -j$(EXTMAXPROCESS)
+BUILD_DIR=$(CONFIGURE_DIR)
+.IF "$(GUI)$(COM)"=="WNTGCC"
+.EXPORT : PWD
+.ENDIF
+.ELSE
+CONFIGURE_DIR=win32
+CONFIGURE_ACTION=cscript configure.js
+#CONFIGURE_FLAGS=iconv=no sax1=yes
+.IF "$(debug)"!=""
+CONFIGURE_FLAGS+=debug=yes
+.ENDIF
+BUILD_ACTION=nmake
+BUILD_DIR=$(CONFIGURE_DIR)
+.ENDIF
+.ELSE
+
+.IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC"
+LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec -Wl,-z,noexecstack
+.ENDIF # "$(OS)$(COM)"=="LINUXGCC"
+.IF "$(OS)$(COM)"=="SOLARISC52"
+LDFLAGS:=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib'
+.ENDIF # "$(OS)$(COM)"=="SOLARISC52"
+
+.IF "$(SYSBASE)"!=""
+CPPFLAGS+:=-I$(SOLARINCDIR)$/external -I$(SYSBASE)$/usr$/include $(EXTRA_CFLAGS)
+.IF "$(OS)"=="SOLARIS" || "$(OS)"=="LINUX"
+LDFLAGS+:=-L$(SOLARLIBDIR) -L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -lpthread -ldl
+.ENDIF
+.ENDIF # "$(SYSBASE)"!=""
+
+.EXPORT: CPPFLAGS
+.EXPORT: LDFLAGS
+.EXPORT: LIBXML2LIB
+
+.IF "$(COMNAME)"=="sunpro5"
+CPPFLAGS+:=$(ARCH_FLAGS) -xc99=none
+.ENDIF # "$(COMNAME)"=="sunpro5"
+CONFIGURE_DIR=
+CONFIGURE_ACTION=.$/configure
+CONFIGURE_FLAGS=--enable-ipv6=no --without-crypto --without-python --enable-static=no --with-sax1=yes
+BUILD_ACTION=chmod 777 xslt-config && $(GNUMAKE)
+BUILD_FLAGS+= -j$(EXTMAXPROCESS)
+BUILD_DIR=$(CONFIGURE_DIR)
+.ENDIF
+
+OUT2INC=libxslt$/*.h
+
+.IF "$(OS)"=="MACOSX"
+OUT2LIB+=libxslt$/.libs$/libxslt.*.dylib
+OUT2LIB+=libexslt$/.libs$/libexslt.*.dylib
+OUT2BIN+=xsltproc$/.libs$/xsltproc
+OUT2BIN+=xslt-config
+.ELIF "$(OS)"=="WNT"
+.IF "$(COM)"=="GCC"
+OUT2LIB+=libxslt$/.libs$/*.a
+OUT2LIB+=libexslt$/.libs$/*.a
+OUT2BIN+=libxslt$/.libs$/*.dll
+OUT2BIN+=libexslt$/.libs$/*.dll
+OUT2BIN+=xsltproc$/.libs$/*.exe*
+OUT2BIN+=xslt-config
+.ELSE
+OUT2LIB+=win32$/bin.msvc$/*.lib
+OUT2BIN+=win32$/bin.msvc$/*.dll
+OUT2BIN+=win32$/bin.msvc$/*.exe
+.ENDIF
+.ELSE
+OUT2LIB+=libxslt$/.libs$/libxslt.so*
+OUT2LIB+=libexslt$/.libs$/libexslt.so*
+OUT2BIN+=xsltproc$/.libs$/xsltproc
+OUT2BIN+=xslt-config
+.ENDIF
+
+# --- Targets ------------------------------------------------------
+.ENDIF # L10N_framework
+.INCLUDE : set_ext.mk
+.INCLUDE : target.mk
+.INCLUDE : tg_ext.mk
+
diff --git a/libxslt/prj/build.lst b/libxslt/prj/build.lst
new file mode 100644
index 000000000000..f6e9eb049704
--- /dev/null
+++ b/libxslt/prj/build.lst
@@ -0,0 +1,3 @@
+lxslt libxslt : soltools LIBXML2:libxml2 NULL
+lxslt libxslt usr1 - all lxslt_mkout NULL
+lxslt libxslt nmake - all lxslt_libxslt NULL
diff --git a/libxslt/prj/d.lst b/libxslt/prj/d.lst
new file mode 100644
index 000000000000..cdb1c1d7dd2e
--- /dev/null
+++ b/libxslt/prj/d.lst
@@ -0,0 +1,11 @@
+mkdir: %_DEST%\inc%_EXT%\external\libxslt
+..\%__SRC%\inc\*.h %_DEST%\inc%_EXT%\external\libxslt\*.h
+..\%__SRC%\lib\libxslt.so.1 %_DEST%\lib%_EXT%\libxslt.so.1
+symlink: %_DEST%\lib%_EXT%\libxslt.so.1 %_DEST%\lib%_EXT%\libxslt.so
+..\%__SRC%\lib\libexslt.so.0 %_DEST%\lib%_EXT%\libexslt.so.0
+..\%__SRC%\lib\libxslt*.lib %_DEST%\lib%_EXT%
+..\%__SRC%\lib\lib*.dll.a %_DEST%\lib%_EXT%\*.a
+..\%__SRC%\bin\lib*.dll %_DEST%\bin%_EXT%
+..\%__SRC%\bin\xsltproc* %_DEST%\bin%_EXT%
+..\%__SRC%\bin\xslt-config* %_DEST%\bin%_EXT%
+..\libxsltversion.mk %_DEST%\inc%_EXT%\libxsltversion.mk