diff options
| author | Lukas Elsner <open@mindrunner.de> | 2014-11-03 11:37:41 +1000 |
|---|---|---|
| committer | Lukas Elsner <open@mindrunner.de> | 2014-11-03 11:37:41 +1000 |
| commit | 6c164718856e63c8ddad539528792ce16b177d33 (patch) | |
| tree | 32796cc067ca7a14088224c2a4613ecdeb6d8c08 /recipes-core/openjdk/openjdk-6-6b32/icedtea-jdk-rmi-crosscompile.patch | |
| parent | d2b75b615e4612f9fa05950c1d76d4a719e573d4 (diff) | |
| parent | d031686fedd1f88fb628a8a87916477208377146 (diff) | |
| download | meta-java-6c164718856e63c8ddad539528792ce16b177d33.tar.gz | |
Merge remote-tracking branch 'woglinde/dora' into test
Conflicts:
recipes-core/cacao/cacao_1.6.1.bb
Diffstat (limited to 'recipes-core/openjdk/openjdk-6-6b32/icedtea-jdk-rmi-crosscompile.patch')
| -rw-r--r-- | recipes-core/openjdk/openjdk-6-6b32/icedtea-jdk-rmi-crosscompile.patch | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/recipes-core/openjdk/openjdk-6-6b32/icedtea-jdk-rmi-crosscompile.patch b/recipes-core/openjdk/openjdk-6-6b32/icedtea-jdk-rmi-crosscompile.patch new file mode 100644 index 0000000..55f1f9c --- /dev/null +++ b/recipes-core/openjdk/openjdk-6-6b32/icedtea-jdk-rmi-crosscompile.patch | |||
| @@ -0,0 +1,13 @@ | |||
| 1 | diff --git openjdk/jdk/make/com/sun/jmx/Makefile openjdk/jdk/make/com/sun/jmx/Makefile | ||
| 2 | index eaf8a6e..4938613 100644 | ||
| 3 | --- openjdk/jdk/make/com/sun/jmx/Makefile | ||
| 4 | +++ openjdk/jdk/make/com/sun/jmx/Makefile | ||
| 5 | @@ -102,7 +102,7 @@ FILES_ties = $(subst javax/management/remote/rmi/,javax/management/remote/rmi/ | ||
| 6 | # when available, we need to run with latest rmic version available. rmic | ||
| 7 | # launch tool not built at this stage but we can invoke via rmi class. | ||
| 8 | |||
| 9 | -RMIC_JAVA = $(OUTPUTDIR)/bin/java | ||
| 10 | +RMIC_JAVA = $(BOOTDIR)/bin/java | ||
| 11 | # need to treat 64bit solaris differently | ||
| 12 | ifeq ($(PLATFORM)-$(LIBARCH), solaris-amd64) | ||
| 13 | RMIC_JAVA = $(OUTPUTDIR)/bin/amd64/java | ||