diff options
| author | Guido Günther <agx@sigxcpu.org> | 2013-05-08 12:52:58 +0200 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2013-05-08 12:52:58 +0200 |
| commit | 9a8e56049ebf9f0878c7fe3efc0921df8aa6a0ba (patch) | |
| tree | 7d61a00fa8d6ec4667663370cc42b04be03ec569 /patches/boot/jaxws-jdk-dependency.patch | |
Imported Upstream version 7u21-2.3.9upstream/7u21-2.3.9upstream
Diffstat (limited to 'patches/boot/jaxws-jdk-dependency.patch')
| -rw-r--r-- | patches/boot/jaxws-jdk-dependency.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/patches/boot/jaxws-jdk-dependency.patch b/patches/boot/jaxws-jdk-dependency.patch new file mode 100644 index 0000000..8e36886 --- /dev/null +++ b/patches/boot/jaxws-jdk-dependency.patch @@ -0,0 +1,47 @@ +diff -Nru openjdk-boot.orig/jaxws/build.properties openjdk-boot/jaxws/build.properties +--- openjdk-boot.orig/jaxws/build.properties 2012-06-11 14:30:27.904723311 +0100 ++++ openjdk-boot/jaxws/build.properties 2012-06-11 14:38:13.847981281 +0100 +@@ -62,6 +62,10 @@ + # JAXP built files + jaxp.classes.dir=${output.dir}/../jaxp/build/classes + ++# JDK sources ++ ++jdk.sources=${jdk.topdir}/src/share/classes:${jdk.topdir}/src/solaris/classes ++ + # Distributed results + dist.dir=${output.dir}/dist + dist.lib.dir=${dist.dir}/lib +@@ -92,6 +96,7 @@ + output.dir=${output.dir}${line.separator}\ + build.dir=${build.dir}${line.separator}\ + dist.dir=${dist.dir}${line.separator}\ ++ jdk.topdir=${jdk.topdir}${line.separator}\ + ${line.separator} + + #------------------------------------------------------------ +diff -Nru openjdk-boot.orig/jaxws/build.xml openjdk-boot/jaxws/build.xml +--- openjdk-boot.orig/jaxws/build.xml 2012-06-11 14:30:27.904723311 +0100 ++++ openjdk-boot/jaxws/build.xml 2012-06-11 14:36:04.005990816 +0100 +@@ -138,6 +138,7 @@ + <javac + includeAntRuntime="false" + classpath="${jaxp.classes.dir}:${build.classes.dir}:${langtools.jar}" ++ sourcepath="${jdk.sources}" + fork="true" + destdir="${build.classes.dir}" + memoryInitialSize="${javac.memoryInitialSize}" +diff -Nru openjdk-boot.orig/jaxws/make/Makefile openjdk-boot/jaxws/make/Makefile +--- openjdk-boot.orig/jaxws/make/Makefile 2012-06-11 14:30:27.904723311 +0100 ++++ openjdk-boot/jaxws/make/Makefile 2012-06-11 14:36:04.005990816 +0100 +@@ -123,6 +123,10 @@ + endif + endif + ++ifdef JDK_TOPDIR ++ ANT_OPTIONS += -Djdk.topdir=$(JDK_TOPDIR) ++endif ++ + # Default target and expected 'do everything' target + default: all + |