llvm: Accept ppc64
PATCH v2 1/3 llvm: Accept ppc64
--- recipes-core/llvm/llvm.inc | 2 +- recipes-core/openjdk/openjdk-6-common.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
recipes-core/llvm/llvm.inc +1 -1
@@ -203,7 +203,7 @@ def get_llvm_arch(d): arch = "ARM" elif arch == "mipsel" or arch == "mips": arch = "mips" - elif arch == "powerpc": + elif arch == "powerpc" or arch == "powerpc64": arch = "PowerPC" else: bb.error("%s does not support %s yet" % (bb.data.getVar('PN', d, 1), arch) );
recipes-core/openjdk/openjdk-6-common.inc +1 -1
@@ -151,7 +151,7 @@ def get_llvm_configure_arch(d): arch = "arm" elif arch == "mipsel" or arch == "mips": arch = "mips" - elif arch == "powerpc": + elif arch == "powerpc" or arch == "powerpc64": arch = "powerpc" else: bb.error("%s does not support %s yet" % (bb.data.getVar('PN', d, 1), arch) );
Signature · 1 line
1.7.5.4
PATCH v2 2/3 openjdk-6: Fix cross compilation for e5500 machines
This is only way for compile for now since qemu can not run the sizers binary for e5500 machines. It segfaults so we disable generating sizes and also xawt and jawt which depends on sizers, this lets jre to cross compile for ppc/e5500
--- .../icedtea-jdk-sizers-crosscompile-hack.patch | 61 ++++++++++++++++++++ recipes-core/openjdk/openjdk-6-release-6b24.inc | 13 ++++- 2 files changed, 73 insertions(+), 1 deletions(-) create mode 100644 recipes-core/openjdk/openjdk-6-6b24/icedtea-jdk-sizers-crosscompile-hack.patch
recipes-core/openjdk/openjdk-6-6b24/icedtea-jdk-sizers-crosscompile-hack.patch new file +61 -0
@@ -0,0 +1,61 @@ +Disable xawt and jawt along with sizes generation which does not work well if +you cant generated sizes in cross env. So for architectures which dont have +working qemu this is an option + +Signed-off-by: Khem Raj <[email protected]> +Upstream-Status: Inappropriate [Cross-compile specific hack] + +--- openjdk/jdk/make/sun/xawt/Makefile.khem 2012-07-21 23:54:47.396405922 -0700 ++++ openjdk/jdk/make/sun/xawt/Makefile 2012-07-21 23:55:52.032405922 -0700 +@@ -245,18 +245,19 @@ + $(SIZER_DIR) $(XLIBTYPES) "sizer" $(subst .,,$(suffix $(basename $@))) + + $(SIZES): $(SIZERS) +- @if [ "$(DOHACK)$@" = "true$(PREDEFINED_SIZES)" ]; then \ +- $(ECHO) COPYING $(PREDEFINED_SIZES_TMPL) into $@; \ +- $(CP) $(PREDEFINED_SIZES_TMPL) $@; \ +- $(CHMOD) +w $@;\ +- else \ +- $(ECHO) GENERATING $@; \ +- $(QEMU) $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \ +- fi +- @if [ "$(DOCOMPARE)$(suffix $@)" = "true.64" ]; then \ +- $(ECHO) COMPARING $@ and $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \ +- $(DIFF) $@ $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \ +- fi ++ touch $(SIZES) ++# @if [ "$(DOHACK)$@" = "true$(PREDEFINED_SIZES)" ]; then \ ++# $(ECHO) COPYING $(PREDEFINED_SIZES_TMPL) into $@; \ ++# $(CP) $(PREDEFINED_SIZES_TMPL) $@; \ ++# $(CHMOD) +w $@;\ ++# else \ ++# $(ECHO) GENERATING $@; \ ++# $(QEMU) $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \ ++# fi ++# @if [ "$(DOCOMPARE)$(suffix $@)" = "true.64" ]; then \ ++# $(ECHO) COMPARING $@ and $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \ ++# $(DIFF) $@ $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \ ++# fi + + $(TEMPDIR)/.gen.wrappers: $(SIZES) $(WRAPPER_GENERATOR_CLASS) $(XLIBTYPES) + $(BOOT_JAVA_CMD) -cp $(WRAPPER_GENERATOR_TEMPDIR) WrapperGenerator \ +--- openjdk/jdk/make/sun/Makefile.khem 2011-11-14 14:11:40.000000000 -0800 ++++ openjdk/jdk/make/sun/Makefile 2012-07-22 00:42:04.980409296 -0700 +@@ -50,7 +50,7 @@ + MOTIF_SUBDIRS = motif12 motif21 + endif + HEADLESS_SUBDIR = headless +- XAWT_SUBDIR = xawt ++ XAWT_SUBDIR = + endif + + ifndef OPENJDK +@@ -65,7 +65,7 @@ + awt splashscreen $(XAWT_SUBDIR) $(MOTIF_SUBDIRS) \ + $(HEADLESS_SUBDIR) $(DGA_SUBDIR) \ + font jpeg cmm applet rmi beans $(JDBC_SUBDIR) \ +- jawt text nio launcher management $(ORG_SUBDIR) \ ++ text nio launcher management $(ORG_SUBDIR) \ + native2ascii serialver tools jconsole + + all build clean clobber::
recipes-core/openjdk/openjdk-6-release-6b24.inc +12 -1
@@ -83,7 +83,12 @@ ICEDTEAPATCHES = "\ file://icedtea-zero-hotspotfix.patch;apply=no \ file://icedtea-jdk-powerpc-atomic64.patch;apply=no \ " - +ICEDTEAPATCHES_append_e5500-64b = " \ + file://icedtea-jdk-sizers-crosscompile-hack.patch;apply=no \ + " +ICEDTEAPATCHES_append_e5500 = " \ + file://icedtea-jdk-sizers-crosscompile-hack.patch;apply=no \ + " ICEDTEAPATCHES_append_libc-uclibc = " \ file://icedtea-hotspot-isfinte.patch;apply=no \ file://icedtea-hotspot-glibc-version.patch;apply=no \
@@ -119,5 +124,11 @@ DISTRIBUTION_PATCHES_append_libc-uclibc = "\ patches/icedtea-jdk-unpack-uclibc.patch \ patches/icedtea-hotspot-dlvsym-uclibc.patch \ " +DISTRIBUTION_PATCHES_append_e5500-64b = " \ + patches/icedtea-jdk-sizers-crosscompile-hack.patch \ + " +DISTRIBUTION_PATCHES_append_e5500 = " \ + patches/icedtea-jdk-sizers-crosscompile-hack.patch \ + " export DISTRIBUTION_PATCHES
Signature · 1 line
1.7.5.4
Re: [meta-java][PATCH V2 2/3] openjdk-6: Fix cross compilation for e5500 machines
Quoted 112 lines · Khem Raj
This is only way for compile for now since qemu can not run the sizers binary for e5500 machines. It segfaults so we disable generating sizes and also xawt and jawt which depends on sizers, this lets jre to cross compile for ppc/e5500
Signed-off-by Khem Raj <[email protected]>--- .../icedtea-jdk-sizers-crosscompile-hack.patch | 61 ++++++++++++++++++++ recipes-core/openjdk/openjdk-6-release-6b24.inc | 13 ++++- 2 files changed, 73 insertions(+), 1 deletions(-) create mode 100644 recipes-core/openjdk/openjdk-6-6b24/icedtea-jdk-sizers-crosscompile-hack.patchrecipes-core/openjdk/openjdk-6-6b24/icedtea-jdk-sizers-crosscompile-hack.patch new file +61
-0@@ -0,0 +1,61 @@ +Disable xawt and jawt along with sizes generation which does not work well if +you cant generated sizes in cross env. So for architectures which dont have +working qemu this is an option + +Signed-off-by: Khem Raj <[email protected]> +Upstream-Status: Inappropriate [Cross-compile specific hack] + +--- openjdk/jdk/make/sun/xawt/Makefile.khem 2012-07-21 23:54:47.396405922 -0700 ++++ openjdk/jdk/make/sun/xawt/Makefile 2012-07-21 23:55:52.032405922 -0700 +@@ -245,18 +245,19 @@ + $(SIZER_DIR) $(XLIBTYPES) "sizer" $(subst .,,$(suffix $(basename $@))) + + $(SIZES): $(SIZERS) +- @if [ "$(DOHACK)$@" = "true$(PREDEFINED_SIZES)" ]; then \ +- $(ECHO) COPYING $(PREDEFINED_SIZES_TMPL) into $@; \ +- $(CP) $(PREDEFINED_SIZES_TMPL) $@; \ +- $(CHMOD) +w $@;\ +- else \ +- $(ECHO) GENERATING $@; \ +- $(QEMU) $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \ +- fi +- @if [ "$(DOCOMPARE)$(suffix $@)" = "true.64" ]; then \ +- $(ECHO) COMPARING $@ and $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \ +- $(DIFF) $@ $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \ +- fi ++ touch $(SIZES) ++# @if [ "$(DOHACK)$@" = "true$(PREDEFINED_SIZES)" ]; then \ ++# $(ECHO) COPYING $(PREDEFINED_SIZES_TMPL) into $@; \ ++# $(CP) $(PREDEFINED_SIZES_TMPL) $@; \ ++# $(CHMOD) +w $@;\ ++# else \ ++# $(ECHO) GENERATING $@; \ ++# $(QEMU) $(WRAPPER_GENERATOR_DIR)/sizer$(suffix $@) > $@; \ ++# fi ++# @if [ "$(DOCOMPARE)$(suffix $@)" = "true.64" ]; then \ ++# $(ECHO) COMPARING $@ and $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \ ++# $(DIFF) $@ $(STORED_SIZES_TMPL_$(PLATFORM)_$(LIBARCH)); \ ++# fi + + $(TEMPDIR)/.gen.wrappers: $(SIZES) $(WRAPPER_GENERATOR_CLASS) $(XLIBTYPES) + $(BOOT_JAVA_CMD) -cp $(WRAPPER_GENERATOR_TEMPDIR) WrapperGenerator \ +--- openjdk/jdk/make/sun/Makefile.khem 2011-11-14 14:11:40.000000000 -0800 ++++ openjdk/jdk/make/sun/Makefile 2012-07-22 00:42:04.980409296 -0700 +@@ -50,7 +50,7 @@ + MOTIF_SUBDIRS = motif12 motif21 + endif + HEADLESS_SUBDIR = headless +- XAWT_SUBDIR = xawt ++ XAWT_SUBDIR = + endif + + ifndef OPENJDK +@@ -65,7 +65,7 @@ + awt splashscreen $(XAWT_SUBDIR) $(MOTIF_SUBDIRS) \ + $(HEADLESS_SUBDIR) $(DGA_SUBDIR) \ + font jpeg cmm applet rmi beans $(JDBC_SUBDIR) \ +- jawt text nio launcher management $(ORG_SUBDIR) \ ++ text nio launcher management $(ORG_SUBDIR) \ + native2ascii serialver tools jconsole + + all build clean clobber::recipes-core/openjdk/openjdk-6-release-6b24.inc +12
-1@@ -83,7 +83,12 @@ ICEDTEAPATCHES = "\ file://icedtea-zero-hotspotfix.patch;apply=no \ file://icedtea-jdk-powerpc-atomic64.patch;apply=no \ " - +ICEDTEAPATCHES_append_e5500-64b = " \ + file://icedtea-jdk-sizers-crosscompile-hack.patch;apply=no \ + " +ICEDTEAPATCHES_append_e5500 = " \ + file://icedtea-jdk-sizers-crosscompile-hack.patch;apply=no \ + " ICEDTEAPATCHES_append_libc-uclibc = " \ file://icedtea-hotspot-isfinte.patch;apply=no \ file://icedtea-hotspot-glibc-version.patch;apply=no \@@ -119,5 +124,11 @@ DISTRIBUTION_PATCHES_append_libc-uclibc = "\ patches/icedtea-jdk-unpack-uclibc.patch \ patches/icedtea-hotspot-dlvsym-uclibc.patch \ " +DISTRIBUTION_PATCHES_append_e5500-64b = " \ + patches/icedtea-jdk-sizers-crosscompile-hack.patch \ + " +DISTRIBUTION_PATCHES_append_e5500 = " \ + patches/icedtea-jdk-sizers-crosscompile-hack.patch \ + " export DISTRIBUTION_PATCHESSignature · 1 line
1.7.5.4
Patch is applied to master, thanks and do not forget to update patch-work.
Bye Henning
PATCH 3/3 icedtea-native: Fix build on ubuntu 12.04 release
In reply to Khem RajIt conflicts definitions from standard include
so backport a patch from upstream
When here also change the LICENSE field to be more compatible to avoid warnings like
WARNING: icedtea6-native: No generic license file exists for: GPL in any provider
WARNING: icedtea6-native: No generic license file exists for: with in any provider
WARNING: icedtea6-native: No generic license file exists for: Classpath in any provider
WARNING: icedtea6-native: No generic license file exists for: Exception in any provider
xxx
--- .../icedtea-jdk-avoid-cdef-collision.patch | 203 ++++++++++++++++++++ recipes-core/icedtea/icedtea6-native.inc | 2 +- recipes-core/icedtea/icedtea6-native_1.8.11.bb | 4 +- recipes-core/openjdk/openjdk-6-common.inc | 4 +- 4 files changed, 209 insertions(+), 4 deletions(-) create mode 100644 recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-jdk-avoid-cdef-collision.patch
recipes-core/icedtea/icedtea6-native-1.8.11/icedtea-jdk-avoid-cdef-collision.patch new file +203 -0
@@ -0,0 +1,203 @@ +Fixes collisions with standard namespace + +Signed-off-by: Khem Raj <[email protected]> +Upstream-Status: Backport + +Index: openjdk/hotspot/src/share/vm/opto/addnode.cpp +=================================================================== +--- openjdk/hotspot/src/share/vm/opto/addnode.cpp 2010-02-16 19:11:09.000000000 -0800 ++++ openjdk/hotspot/src/share/vm/opto/addnode.cpp 2012-07-30 15:54:25.999551792 -0700 +@@ -27,8 +27,6 @@ + #include "incls/_precompiled.incl" + #include "incls/_addnode.cpp.incl" + +-#define MAXFLOAT ((float)3.40282346638528860e+38) +- + // Classic Add functionality. This covers all the usual 'add' behaviors for + // an algebraic ring. Add-integer, add-float, add-double, and binary-or are + // all inherited from this class. The various identity values are supplied +Index: openjdk/hotspot/src/share/vm/prims/jniCheck.cpp +=================================================================== +--- openjdk/hotspot/src/share/vm/prims/jniCheck.cpp 2010-02-16 19:11:10.000000000 -0800 ++++ openjdk/hotspot/src/share/vm/prims/jniCheck.cpp 2012-07-30 16:05:20.779549364 -0700 +@@ -80,7 +80,7 @@ + if (env != xenv) { \ + NativeReportJNIFatalError(thr, warn_wrong_jnienv); \ + } \ +- __ENTRY(result_type, header, thr) ++ VM_ENTRY_BASE(result_type, header, thr) + + + #define UNCHECKED() (unchecked_jni_NativeInterface) +Index: openjdk/hotspot/src/share/vm/prims/jvmtiEnter.xsl +=================================================================== +--- openjdk/hotspot/src/share/vm/prims/jvmtiEnter.xsl 2010-02-16 19:11:10.000000000 -0800 ++++ openjdk/hotspot/src/share/vm/prims/jvmtiEnter.xsl 2012-07-30 16:03:50.491550815 -0700 +@@ -424,7 +424,7 @@ + <xsl:value-of select="$space"/> + <xsl:text>ThreadInVMfromNative __tiv(current_thread);</xsl:text> + <xsl:value-of select="$space"/> +- <xsl:text>__ENTRY(jvmtiError, </xsl:text> ++ <xsl:text>VM_ENTRY_BASE(jvmtiError, </xsl:text> + <xsl:apply-templates select="." mode="functionid"/> + <xsl:text> , current_thread)</xsl:text> + <xsl:value-of select="$space"/> +Index: openjdk/hotspot/src/share/vm/prims/jvmtiEnv.cpp +=================================================================== +--- openjdk/hotspot/src/share/vm/prims/jvmtiEnv.cpp 2010-02-16 19:11:10.000000000 -0800 ++++ openjdk/hotspot/src/share/vm/prims/jvmtiEnv.cpp 2012-07-30 16:04:03.683550594 -0700 +@@ -126,7 +126,7 @@ + // from native so as to resolve the jthread. + + ThreadInVMfromNative __tiv(current_thread); +- __ENTRY(jvmtiError, JvmtiEnv::GetThreadLocalStorage , current_thread) ++ VM_ENTRY_BASE(jvmtiError, JvmtiEnv::GetThreadLocalStorage , current_thread) + debug_only(VMNativeEntryWrapper __vew;) + + oop thread_oop = JNIHandles::resolve_external_guard(thread); +Index: openjdk/hotspot/src/share/vm/prims/jvmtiExport.cpp +=================================================================== +--- openjdk/hotspot/src/share/vm/prims/jvmtiExport.cpp 2010-02-16 19:11:10.000000000 -0800 ++++ openjdk/hotspot/src/share/vm/prims/jvmtiExport.cpp 2012-07-30 15:59:43.175550785 -0700 +@@ -345,7 +345,7 @@ + JavaThread* current_thread = (JavaThread*) ThreadLocalStorage::thread(); + // transition code: native to VM + ThreadInVMfromNative __tiv(current_thread); +- __ENTRY(jvmtiEnv*, JvmtiExport::get_jvmti_interface, current_thread) ++ VM_ENTRY_BASE(jvmtiEnv*, JvmtiExport::get_jvmti_interface, current_thread) + debug_only(VMNativeEntryWrapper __vew;) + + JvmtiEnv *jvmti_env = JvmtiEnv::create_a_jvmti(version); +Index: openjdk/hotspot/src/share/vm/runtime/interfaceSupport.hpp +=================================================================== +--- openjdk/hotspot/src/share/vm/runtime/interfaceSupport.hpp 2010-02-16 19:11:10.000000000 -0800 ++++ openjdk/hotspot/src/share/vm/runtime/interfaceSupport.hpp 2012-07-30 16:36:53.391544578 -0700 +@@ -46,7 +46,7 @@ + } + }; + +-// InterfaceSupport provides functionality used by the __LEAF and __ENTRY ++// InterfaceSupport provides functionality used by the VM_LEAF_BASE and VM_ENTRY_BASE + // macros. These macros are used to guard entry points into the VM and + // perform checks upon leave of the VM. + +@@ -391,7 +391,7 @@ + + // LEAF routines do not lock, GC or throw exceptions + +-#define __LEAF(result_type, header) \ ++#define VM_LEAF_BASE(result_type, header) \ + TRACE_CALL(result_type, header) \ + debug_only(NoHandleMark __hm;) \ + /* begin of body */ +@@ -399,7 +399,7 @@ + + // ENTRY routines may lock, GC and throw exceptions + +-#define __ENTRY(result_type, header, thread) \ ++#define VM_ENTRY_BASE(result_type, header, thread) \ + TRACE_CALL(result_type, header) \ + HandleMarkCleaner __hm(thread); \ + Thread* THREAD = thread; \ +@@ -421,20 +421,20 @@ + #define IRT_ENTRY(result_type, header) \ + result_type header { \ + ThreadInVMfromJava __tiv(thread); \ +- __ENTRY(result_type, header, thread) \ ++ VM_ENTRY_BASE(result_type, header, thread) \ + debug_only(VMEntryWrapper __vew;) + + + #define IRT_LEAF(result_type, header) \ + result_type header { \ +- __LEAF(result_type, header) \ ++ VM_LEAF_BASE(result_type, header) \ + debug_only(No_Safepoint_Verifier __nspv(true);) + + + #define IRT_ENTRY_NO_ASYNC(result_type, header) \ + result_type header { \ + ThreadInVMfromJavaNoAsyncException __tiv(thread); \ +- __ENTRY(result_type, header, thread) \ ++ VM_ENTRY_BASE(result_type, header, thread) \ + debug_only(VMEntryWrapper __vew;) + + // Another special case for nmethod_entry_point so the nmethod that the +@@ -445,7 +445,7 @@ + result_type header { \ + nmethodLocker _nmlock(nm); \ + ThreadInVMfromJavaNoAsyncException __tiv(thread); \ +- __ENTRY(result_type, header, thread) ++ VM_ENTRY_BASE(result_type, header, thread) + + #define IRT_END } + +@@ -455,20 +455,20 @@ + #define JRT_ENTRY(result_type, header) \ + result_type header { \ + ThreadInVMfromJava __tiv(thread); \ +- __ENTRY(result_type, header, thread) \ ++ VM_ENTRY_BASE(result_type, header, thread) \ + debug_only(VMEntryWrapper __vew;) + + + #define JRT_LEAF(result_type, header) \ + result_type header { \ +- __LEAF(result_type, header) \ ++ VM_LEAF_BASE(result_type, header) \ + debug_only(JRT_Leaf_Verifier __jlv;) + + + #define JRT_ENTRY_NO_ASYNC(result_type, header) \ + result_type header { \ + ThreadInVMfromJavaNoAsyncException __tiv(thread); \ +- __ENTRY(result_type, header, thread) \ ++ VM_ENTRY_BASE(result_type, header, thread) \ + debug_only(VMEntryWrapper __vew;) + + // Same as JRT Entry but allows for return value after the safepoint +@@ -501,7 +501,7 @@ + assert( !VerifyJNIEnvThread || (thread == Thread::current()), "JNIEnv is only valid in same thread"); \ + ThreadInVMfromNative __tiv(thread); \ + debug_only(VMNativeEntryWrapper __vew;) \ +- __ENTRY(result_type, header, thread) ++ VM_ENTRY_BASE(result_type, header, thread) + + + // Ensure that the VMNativeEntryWrapper constructor, which can cause +@@ -521,7 +521,7 @@ + result_type JNICALL header { \ + JavaThread* thread=JavaThread::thread_from_jni_environment(env); \ + assert( !VerifyJNIEnvThread || (thread == Thread::current()), "JNIEnv is only valid in same thread"); \ +- __LEAF(result_type, header) ++ VM_LEAF_BASE(result_type, header) + + + // Close the routine and the extern "C" +@@ -537,7 +537,7 @@ + JavaThread* thread=JavaThread::thread_from_jni_environment(env); \ + ThreadInVMfromNative __tiv(thread); \ + debug_only(VMNativeEntryWrapper __vew;) \ +- __ENTRY(result_type, header, thread) ++ VM_ENTRY_BASE(result_type, header, thread) + + + #define JVM_ENTRY_NO_ENV(result_type, header) \ +@@ -546,7 +546,7 @@ + JavaThread* thread = (JavaThread*)ThreadLocalStorage::thread(); \ + ThreadInVMfromNative __tiv(thread); \ + debug_only(VMNativeEntryWrapper __vew;) \ +- __ENTRY(result_type, header, thread) ++ VM_ENTRY_BASE(result_type, header, thread) + + + #define JVM_QUICK_ENTRY(result_type, header) \ +@@ -562,7 +562,7 @@ + extern "C" { \ + result_type JNICALL header { \ + VM_Exit::block_if_vm_exited(); \ +- __LEAF(result_type, header) ++ VM_LEAF_BASE(result_type, header) + + + #define JVM_END } }
recipes-core/icedtea/icedtea6-native.inc +1 -1
@@ -1,6 +1,6 @@ DESCRIPTION = "Harness to build the source code from OpenJDK using Free Software build tools" HOMEPAGE = "http://icedtea.classpath.org" -LICENSE = "GPL with Classpath Exception" +LICENSE = "GPL-2.0-with-classpath-exception" INC_PR = "r5" DEPENDS = "virtual/javac-native virtual/java-native classpath-native \
recipes-core/icedtea/icedtea6-native_1.8.11.bb +3 -1
@@ -4,7 +4,7 @@ require ${PN}.inc LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" -PR = "${INC_PR}.1" +PR = "${INC_PR}.2" SRC_URI = "\ http://icedtea.classpath.org/download/source/icedtea6-${PV}.tar.gz;name=iced \
@@ -43,6 +43,7 @@ ICEDTEA_PATCHES = "\ file://icedtea-hotspot-make-arch-sane-for-x86.patch;apply=no \ file://icedtea-jdk-sane-x86-arch.patch;apply=no \ file://icedtea-unbreak-float.patch;apply=no \ + file://icedtea-jdk-avoid-cdef-collision.patch;apply=no \ " export DISTRIBUTION_PATCHES = "\
@@ -52,6 +53,7 @@ export DISTRIBUTION_PATCHES = "\ patches/icedtea-hotspot-make-arch-sane-for-x86.patch \ patches/icedtea-jdk-sane-x86-arch.patch \ patches/icedtea-unbreak-float.patch \ + patches/icedtea-jdk-avoid-cdef-collision.patch \ " EXTRA_OECONF += " --with-jaxws-drop-zip=${DL_DIR}/jdk6-jaxws-2009_10_27.zip \
recipes-core/openjdk/openjdk-6-common.inc +2 -2
@@ -1,6 +1,6 @@ DESCRIPTION = "Java runtime based upon the OpenJDK- and Icedtea Project" HOMEPAGE = "http://icedtea.classpath.org" -LICENSE = "GPL with Classpath Exception" +LICENSE = "GPL-2.0-with-classpath-exception" PRIORITY = "optional" SECTION = "libs"
@@ -10,7 +10,7 @@ ICEDTEA = "NEEDS TO BE SET" S = "${WORKDIR}/${ICEDTEA}" B = "${S}/build" -INC_PR = "r19" +INC_PR = "r20" SRC_URI = "\ ${ICEDTEA_URI} \
Signature · 1 line
1.7.5.4
Quoted 25 lines · Khem Raj
Signed-off-by Khem Raj <[email protected]>--- recipes-core/llvm/llvm.inc | 2 +- recipes-core/openjdk/openjdk-6-common.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)recipes-core/llvm/llvm.inc +1
-1@@ -203,7 +203,7 @@ def get_llvm_arch(d): arch = "ARM" elif arch == "mipsel" or arch == "mips": arch = "mips" - elif arch == "powerpc": + elif arch == "powerpc" or arch == "powerpc64": arch = "PowerPC" else: bb.error("%s does not support %s yet" % (bb.data.getVar('PN', d, 1), arch) );recipes-core/openjdk/openjdk-6-common.inc +0
-0
recipes-core/openjdk/openjdk-6-common.inc def get_llvm_configure_arch(d): · line 157
Quoted 8 lines
recipes-core/openjdk/openjdk-6-common.inc +1
-1@@ -151,7 +151,7 @@ def get_llvm_configure_arch(d): arch = "arm" elif arch == "mipsel" or arch == "mips": arch = "mips" - elif arch == "powerpc": + elif arch == "powerpc" or arch == "powerpc64": arch = "powerpc" else: bb.error("%s does not support %s yet" % (bb.data.getVar('PN', d, 1), arch) );
Patch is applied to master, thanks and do not forget to update patch-work.
Bye Henning