[ooo-build-commit] Branch 'ooo-build-3-1-1' - patches/dev300

[Petr Mladek]

 patches/dev300/apply            |    1 +
 patches/dev300/piece-saxon.diff |   11 +++++++++++
 2 files changed, 12 insertions(+)

New commits:
commit 01bbcda85cb32be9eb5334430fb208ec5ca60041
Author: Petr Mladek <pmladek at suse.cz>
Date:   Fri Oct 16 16:38:44 2009 +0200

    Fix split build with the internal saxon
    
    * patches/dev300/piece-saxon.diff:
    * patches/dev300/apply: search jsr173_1.0_api.jar in the piece solver

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 03571df..6d5c5a2 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2922,6 +2922,7 @@ piece-cppuhelper.diff
 piece-cpputools.diff
 piece-connectivity.diff
 piece-bridges.diff
+piece-saxon.diff
 piece-stax.diff
 piece-stoc.diff
 piece-unoil.diff
diff --git a/patches/dev300/piece-saxon.diff b/patches/dev300/piece-saxon.diff
new file mode 100644
index 0000000..544d4d8
--- /dev/null
+++ b/patches/dev300/piece-saxon.diff
@@ -0,0 +1,11 @@
+--- saxon/makefile.mk.old	2008-10-15 11:43:33.000000000 +0200
++++ saxon/makefile.mk	2009-10-16 16:16:27.000000000 +0200
+@@ -54,7 +54,7 @@ TARFILE_ROOTDIR=src
+ 
+ PATCH_FILE_NAME=saxon-9.0.0.7-bj.patch
+ 
+-BUILD_ACTION=$(ANT) $(ANT_FLAGS) -Dsolarbindir=$(SOLARBINDIR) jar-bj 
++BUILD_ACTION=$(ANT) $(ANT_FLAGS) -Dsolar.bin=$(SOLARPIECE)$/$(INPATH)$/bin jar-bj
+ 
+ OUT2CLASS= saxon-build$/9.0.0.7$/bj$/saxon9.jar
+