diff options
author | Rüdiger Timm <rt@openoffice.org> | 2008-07-11 09:24:35 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2008-07-11 09:24:35 +0000 |
commit | 9d5e120d8c23545ac8c90b92ee1e5b7a3dd03cae (patch) | |
tree | f5716b4064a0c1dd235998a7a6d32dd9aaf0c6c1 /libxslt | |
parent | 79eb267e833085e57b6dc31067997d3612668932 (diff) |
INTEGRATION: CWS mst01 (1.1.2); FILE ADDED
2008/06/27 11:37:13 mst 1.1.2.1: upgrade libxslt to version 1.1.24
- libxslt/download/libxslt-1.1.16.tar.gz, libxslt/libxslt-1.1.16.patch:
+ removed
- libxslt/download/libxslt-1.1.24.tar.gz, libxslt/libxslt-1.1.24.patch:
+ added
- libxslt/libxsltversion.mk, libxslt/prj/d.lst:
+ add new include makefile for soname versioning
- libxslt/makefile.mk:
+ update, and refactor a bit
Diffstat (limited to 'libxslt')
-rw-r--r-- | libxslt/libxslt-1.1.24.patch | 59 | ||||
-rw-r--r-- | libxslt/libxsltversion.mk | 37 |
2 files changed, 96 insertions, 0 deletions
diff --git a/libxslt/libxslt-1.1.24.patch b/libxslt/libxslt-1.1.24.patch new file mode 100644 index 000000000000..d5075803cba1 --- /dev/null +++ b/libxslt/libxslt-1.1.24.patch @@ -0,0 +1,59 @@ +--- misc/libxslt-1.1.24/ltmain.sh Wed Aug 29 14:28:46 2007 ++++ misc/build/libxslt-1.1.24/ltmain.sh Wed Jun 25 13:06:05 2008 +@@ -3234,9 +3234,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) + current=`expr $number_major + $number_minor` +@@ -3311,8 +3311,8 @@ + ;; + + freebsd-elf) +- major=".$current" +- versuffix=".$current"; ++ major=.`expr $current - $age` ++ versuffix="$major.$age.$revision" + ;; + + irix | nonstopux) +--- misc/libxslt-1.1.24/xslt-config.in Wed Jan 17 14:18:26 2007 ++++ misc/build/libxslt-1.1.24/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 diff --git a/libxslt/libxsltversion.mk b/libxslt/libxsltversion.mk new file mode 100644 index 000000000000..6e91e1f8b915 --- /dev/null +++ b/libxslt/libxsltversion.mk @@ -0,0 +1,37 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2008 by Sun Microsystems, Inc. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# $RCSfile: libxsltversion.mk,v $ +# +# $Revision: 1.2 $ +# +# 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=24 + |