diff options
author | 2006-08-05 20:15:51 +0000 | |
---|---|---|
committer | 2006-08-05 20:15:51 +0000 | |
commit | 3536adf6879dc29654600c17123449edb1a17fc5 (patch) | |
tree | 80081515e6ed5044a7570151871b8f7665b0344f /dev-java/xjavac/files | |
parent | Adding perl dep; fixed DEPEND (diff) | |
download | gentoo-2-3536adf6879dc29654600c17123449edb1a17fc5.tar.gz gentoo-2-3536adf6879dc29654600c17123449edb1a17fc5.tar.bz2 gentoo-2-3536adf6879dc29654600c17123449edb1a17fc5.zip |
Apply a patch for IBM JDK, see bug #142692.
(Portage version: 2.1.1_pre4-r3)
Diffstat (limited to 'dev-java/xjavac/files')
-rw-r--r-- | dev-java/xjavac/files/digest-xjavac-20041208-r3 | 3 | ||||
-rw-r--r-- | dev-java/xjavac/files/xjavac-20041208-build.xml | 1 | ||||
-rw-r--r-- | dev-java/xjavac/files/xjavac-ibm-1_5.patch | 20 |
3 files changed, 24 insertions, 0 deletions
diff --git a/dev-java/xjavac/files/digest-xjavac-20041208-r3 b/dev-java/xjavac/files/digest-xjavac-20041208-r3 new file mode 100644 index 000000000000..b7075055b4c2 --- /dev/null +++ b/dev-java/xjavac/files/digest-xjavac-20041208-r3 @@ -0,0 +1,3 @@ +MD5 47e450883782e191e0e91c31a6dc2caf xjavac-20041208.tar.gz 1971 +RMD160 bdee4c165275dedcfaf42fd38962a85b668d259e xjavac-20041208.tar.gz 1971 +SHA256 ae54e392bfe3ff5d33bc58a7e122bdae863531e235c2a553dee024e045694781 xjavac-20041208.tar.gz 1971 diff --git a/dev-java/xjavac/files/xjavac-20041208-build.xml b/dev-java/xjavac/files/xjavac-20041208-build.xml index efd5f6f0ae47..5c9a466ca8e8 100644 --- a/dev-java/xjavac/files/xjavac-20041208-build.xml +++ b/dev-java/xjavac/files/xjavac-20041208-build.xml @@ -22,6 +22,7 @@ <mkdir dir="${build.dir}" /> <javac srcdir="${src.dir}" destdir="${build.dir}" + classpath="${classpath}" source="${target.jdk}" target="${target.jdk}"/> </target> diff --git a/dev-java/xjavac/files/xjavac-ibm-1_5.patch b/dev-java/xjavac/files/xjavac-ibm-1_5.patch new file mode 100644 index 000000000000..9a4148f233e0 --- /dev/null +++ b/dev-java/xjavac/files/xjavac-ibm-1_5.patch @@ -0,0 +1,20 @@ +--- XJavac.java.vanilla 2006-08-05 21:43:45.000000000 +0200 ++++ XJavac.java 2006-08-05 21:45:27.000000000 +0200 +@@ -57,7 +57,7 @@ + } + // this is supposed to be provided by all JVM's from time immemorial + String vendor = ((String)props.get("java.vendor")).toUpperCase(Locale.ENGLISH); +- if(vendor.indexOf("IBM") >= 0){ ++ if((vendor.indexOf("IBM") >= 0) && (isJDK14())){ + // we're on an IBM 1.4; fiddle with the bootclasspath. + Path bcp = createBootclasspath(); + String javaHome = System.getProperty("java.home"); +@@ -131,4 +131,8 @@ + !version.equals(JavaEnvUtils.JAVA_1_1) && + !version.equals(JavaEnvUtils.JAVA_1_0)); + } ++ private boolean isJDK14() { ++ final String version = JavaEnvUtils.getJavaVersion(); ++ return version.equals(JavaEnvUtils.JAVA_1_4); ++ } + } |