openjdk-6: Remove
PATCH 1/7 openjdk-6: Remove
--- recipes-core/openjdk/openjdk-6_6b24-1.11.1.bb | 8 -------- recipes-core/openjdk/openjdk-6_6b24_hg.bb | 12 ------------ 2 files changed, 20 deletions(-) delete mode 100644 recipes-core/openjdk/openjdk-6_6b24-1.11.1.bb delete mode 100644 recipes-core/openjdk/openjdk-6_6b24_hg.bb
recipes-core/openjdk/openjdk-6_6b24-1.11.1.bb deleted +0 -8
@@ -1,8 +0,0 @@ -require openjdk-6-release-6b24.inc - -PR = "${INC_PR}.0" - -ICEDTEA = "icedtea6-1.11.1" - -SRC_URI[iced.md5sum] = "e51d9d2f0328cc5aa7a00943abd96ed6" -SRC_URI[iced.sha256sum] = "bafb0e21e1edf5ee22871b13dbc0a8a0d3efd894551fb91d5f59783069b6912c"
recipes-core/openjdk/openjdk-6_6b24_hg.bb deleted +0 -12
@@ -1,12 +0,0 @@ -require openjdk-6-release-6b24.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" - -PR = "${INC_PR}.0" - -ICEDTEA = "icedtea6" - -SRCREV = "54ceda20a02c" -PV = "6b24-1.11.1+1.11.2-devel+hg${SRCPV}" - -ICEDTEA_URI = "hg://icedtea.classpath.org/hg/;module=icedtea6;rev=${SRCREV}"
Signature · 1 line
1.7.9.5
PATCH 2/7 xalan-j: remove the directory before copy stuff to it
From: Henning Heinold <[email protected]>
* when the build process got interrtupted it might happen something is already in build-serializer/ so remove it before creating it again
--- recipes-core/xalan-j/xalan-j_2.7.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-core/xalan-j/xalan-j_2.7.1.bb +1 -1
@@ -12,7 +12,6 @@ DEPENDS_virtclass-native = " \ xerces-j-native regexp-native jlex-native cup-native jaxp1.3-native bcel-native \ " - SRC_URI = "\ http://archive.apache.org/dist/xml/${BPN}/${BPN}_2_7_1-src.tar.gz;name=archive \ http://archive.apache.org/dist/jakarta/bsf/source/bsf-src-2.4.0.tar.gz;name=bsf \
@@ -39,6 +38,7 @@ do_compile() { # Remove BSF classes rm -rf build-xalan/org/apache/bsf + rm -rf build-serializer/ mkdir -p build-serializer/org/apache/xml mv build/org/apache/xml/serializer build-serializer/org/apache/xml
Signature · 1 line
1.7.9.5
PATCH 3/7 llvm2.8: Fix build break discovred by unanchored regexp fix in bitbake
In reply to Khem Rajcommit 23bd5300b4a99218a15f4f6b0ab4091d63a602a5 fixed a bug in bitbake which exposed this latent problem where we were using
EXTRA_OECMAKE_append-arm it was being treated as EXTRA_OECMAKE_append before the above mentioned fix and hence all was fine but after this fix behavior changed and it was just EXTRA_OECMAKE_append-arm and was causing build breaks
| ../../lib/libLLVMTransformUtils.so: undefined reference to llvm::CallGraphNode::removeCallEdgeFor(llvm::CallSite)' | ../../lib/libLLVMTransformUtils.so: undefined reference to llvm::CallGraph::getOrInsertFunction(llvm::Function const*)' | ../../lib/libLLVMTransformUtils.so: undefined reference to `llvm::CallGraphLinkVar'
| ../../lib/libLLVMScalarOpts.so: undefined reference to `llvm::createInstructionCombiningPass()'
| collect2: error: ld returned 1 exit status | make[2]: *** [bin/llc] Error 1 | make[2]: Leaving directory
`/work/yocto/poky/build/tmp/work/x86_64-poky-linux/llvm2.8-2.8-r2.1/llvm-2.8/build' | make[1]: *** [tools/llc/CMakeFiles/llc.dir/all] Error 2
| make[1]: *** Waiting for unfinished jobs....
It also fixes the llvm-mc build for arm architecture
Conflicts:
recipes-core/llvm/llvm2.8_2.8.bb --- recipes-core/llvm/llvm2.8/llvm-mc_disable.patch | 12 ------------ recipes-core/llvm/llvm2.8_2.8.bb | 6 ++---- 2 files changed, 2 insertions(+), 16 deletions(-) delete mode 100644 recipes-core/llvm/llvm2.8/llvm-mc_disable.patch
recipes-core/llvm/llvm2.8/llvm-mc_disable.patch deleted +0 -12
@@ -1,12 +0,0 @@ -Index: llvm-2.8/tools/CMakeLists.txt -=================================================================== ---- llvm-2.8.orig/tools/CMakeLists.txt 2010-08-24 11:16:51.000000000 +0200 -+++ llvm-2.8/tools/CMakeLists.txt 2011-12-21 16:47:47.718508763 +0100 -@@ -14,7 +14,6 @@ - add_subdirectory(opt) - add_subdirectory(llvm-as) - add_subdirectory(llvm-dis) --add_subdirectory(llvm-mc) - - add_subdirectory(llc) - add_subdirectory(llvm-ranlib)
recipes-core/llvm/llvm2.8_2.8.bb +2 -4
@@ -4,7 +4,7 @@ require llvm.inc LICENSE = "NCSA" LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=0ac5f799a2d89477c75b0a378b221855" -PR = "r1" +PR = "r2" SRC_URI += " \ file://30may-llvm2.8-pr399-ppc-arm.patch \
@@ -12,11 +12,9 @@ SRC_URI += " \ file://add-unistd.patch \ " -SRC_URI_append_arm = " file://llvm-mc_disable.patch " - LLVM_RELEASE = "2.8" -EXTRA_OECMAKE_append-arm = " -DBUILD_SHARED_LIBS:BOOL=OFF " +EXTRA_OECMAKE += " -DBUILD_SHARED_LIBS:BOOL=OFF " SRC_URI[md5sum] = "220d361b4d17051ff4bb21c64abe05ba" SRC_URI[sha256sum] = "25addb742f1c6cc12877ed0ee924dda962d848368ee095be8e48342ae613d43b"
Signature · 1 line
1.7.9.5
PATCH 4/7 llvm: Use default PACKAGES var
In reply to Khem Rajavoids packaging errors with oe-core master
--- recipes-core/icedtea/icedtea7-native_2.1.1.bb | 9 +++++++++ recipes-core/llvm/llvm.inc | 2 -- 2 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 recipes-core/icedtea/icedtea7-native_2.1.1.bb
recipes-core/icedtea/icedtea7-native_2.1.1.bb new file +9 -0
@@ -0,0 +1,9 @@ +require openjdk-7-release-03b147.inc + +PR = "${INC_PR}.1" + +ICEDTEA = "icedtea-2.1.1" + +SRC_URI[iced.md5sum] = "32859fa5f7337d58ae848311e2a94761" +SRC_URI[iced.sha256sum] = "4a015cf3fb8fb9aa6b3ce4a41fd9bc5dcb417a1885a10a01e92d0cc7a5ffdc65" +
recipes-core/llvm/llvm.inc +0 -2
@@ -65,8 +65,6 @@ EXTRA_OECMAKE = "\ # We need to reset this to avoid breakage as we build out of tree TOOLCHAIN_OPTIONS = "" -PACKAGES = "${PN}-dbg ${PN}-doc ${PN}-dev ${PN}" - PACKAGES_DYNAMIC = "llvm-*" # the difference to the non-native build is that we do not need
Signature · 1 line
1.7.9.5
PATCH 5/7 llvm: Enable ppc64
In reply to Khem RajThis is needed for building for ppc64 jre
--- recipes-core/llvm/llvm.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-core/llvm/llvm.inc +1 -1
@@ -202,7 +202,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) );
Signature · 1 line
1.7.9.5
PATCH 6/7 icedtea-native: Remove 2.1 recipes and fix python spacing
In reply to Khem RajAlso fix the LICENSE when here
Moved to icedtea 2.1.1
--- recipes-core/icedtea/icedtea7-native.inc | 62 ++++++++------------ recipes-core/icedtea/icedtea7-native_2.1.bb | 8 --- .../icedtea-remove_sparc_compiler_option.patch | 13 ---- recipes-core/icedtea/openjdk-7-release-03b147.inc | 20 +++---- 4 files changed, 35 insertions(+), 68 deletions(-) delete mode 100644 recipes-core/icedtea/icedtea7-native_2.1.bb delete mode 100644 recipes-core/icedtea/openjdk-7-03b147/icedtea-remove_sparc_compiler_option.patch
recipes-core/icedtea/icedtea7-native.inc +26 -36
@@ -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 = "r0" DEPENDS = "virtual/javac-native virtual/java-native classpath-native \
@@ -8,11 +8,13 @@ DEPENDS = "virtual/javac-native virtual/java-native classpath-native \ libx11-native xproto-native libxt-native libxext-native libxrender-native \ giflib-native jpeg-native libpng-native \ glib-2.0-native freetype-native zlib-native \ - fontconfig-native zip-native \ + fontconfig-native zip-native alsa-lib-native \ " inherit native java autotools +JAVA_HOME[unexport] = "1" + SRC_URI = " \ ${ICEDTEA_URI} \ ${OPENJDK_URI} \
@@ -36,33 +38,21 @@ export ALT_FREETYPE_LIB_PATH = "${STAGING_LIBDIR}" # OpenJDK supports parallel compilation but uses a plain number for this. # In OE we have PARALLEL_MAKE which is the actual option passed to make, # e.g. "-j 4". - -def set_jdk7_native_jobs(d): - import bb - - pm = bb.data.getVar('PARALLEL_MAKE', d, 1) - pmi = bb.data.getVar('PARALLEL_MAKE_ICEDTEA', d, 1) - - if not pmi: - pm = pm.split("j"); - if (len(pm) == 2): - bb.data.setVar('PARALLEL_MAKE_ICEDTEA', pm[1], d) - return - -PARALLEL = "${@set_jdk7_native_jobs(d)}" - +ICEDTEA_PARALLEL_MAKE := "${PARALLEL_MAKE}" +PARALLEL_MAKE = "" def get_jdk7_native_jobs(d): - import bb + import bb + + pm = bb.data.getVar('ICEDTEA_PARALLEL_MAKE', d, 1); + if not pm: + return "1" - ret = 1 - pmoo = bb.data.getVar('PARALLEL_MAKE', d, 1) - if pmoo: - bb.data.setVar('PARALLEL_MAKE', "", d) + pm = pm.split("j"); + if (len(pm) == 2): + return pm[1].strip() - pm = bb.data.getVar('PARALLEL_MAKE_ICEDTEA', d, 1) - if pm: - ret = pm - return ret + # Whatever found in PARALLEL_MAKE was not suitable. + return "1" JDK_JOBS = "${@get_jdk7_native_jobs(d)}"
@@ -97,10 +87,10 @@ JDK_DIR = "icedtea7-native" JDK_INSTALL_DIR = "${D}/${libdir_jvm}/${JDK_DIR}" do_configure_prepend() { - echo "Configure with parallel-jobs: ${PARALLEL}" + echo "Configure with parallel-jobs: ${JDK_JOBS}" - case "${TARGET_ARCH}" in - x86_64) + case "${TRANSLATED_TARGET_ARCH}" in + x86-64) libarch=amd64 ;; i386|i486|i586|i686)
@@ -160,7 +150,7 @@ do_configure_append() { } EXTRA_OEMAKE = ' \ - OE_CFLAGS="${CFLAGS}" \ + OE_CFLAGS="${CFLAGS}" \ OE_CPPFLAGS="${CPPFLAGS}" \ OE_CXXFLAGS="${CXXFLAGS}" \ OE_LDFLAGS="${LDFLAGS}" \
@@ -170,8 +160,8 @@ EXTRA_OEMAKE = ' \ do_compile() { # OpenJDK uses slightly different names for certain arches. We need to know # this to create some files which are expected by the build. - case "${TARGET_ARCH}" in - x86_64) + case "${TRANSLATED_TARGET_ARCH}" in + x86-64) arch=amd64 libarch=amd64 ;;
@@ -213,18 +203,18 @@ do_compile() { def jdk_arch(d): import bb - target_arch = bb.data.getVar('TARGET_ARCH', d, 1) + target_arch = bb.data.getVar('TRANSLATED_TARGET_ARCH', d, 1) if target_arch in ['i386', 'i486', 'i586', 'i686']: return "x86" - elif target_arch in ['x86_64']: + elif target_arch in ['x86-64']: return "amd64" return target_arch do_install() { - case "${TARGET_ARCH}" in - x86_64) + case "${TRANSLATED_TARGET_ARCH}" in + x86-64) JDK_ARCH=amd64 ;; i386|i486|i586|i686)
recipes-core/icedtea/icedtea7-native_2.1.bb deleted +0 -8
@@ -1,8 +0,0 @@ -require openjdk-7-release-03b147.inc - -PR = "${INC_PR}.1" - -ICEDTEA = "icedtea-2.1" - -SRC_URI[iced.md5sum] = "60395bbd1e2820c4a35e61c80330df14" -SRC_URI[iced.sha256sum] = "8492920dccae8b76bcb41f91f8d98b2dc619380531a679f1f9ea4e166ad02ec6"
recipes-core/icedtea/openjdk-7-03b147/icedtea-remove_sparc_compiler_option.patch deleted +0 -13
@@ -1,13 +0,0 @@ -Index: openjdk/jdk/make/common/shared/Compiler-gcc.gmk -=================================================================== ---- openjdk/jdk/make/common/shared/Compiler-gcc.gmk 2012-05-26 14:43:49.342875981 +0200 -+++ openjdk/jdk/make/common/shared/Compiler-gcc.gmk 2012-05-26 15:21:25.514903711 +0200 -@@ -133,7 +133,7 @@ - REQUIRED_GCC_VER = 4.0.* - endif - # Option used to create a shared library -- SHARED_LIBRARY_FLAG = -shared -mimpure-text -+ SHARED_LIBRARY_FLAG = -shared - SUN_COMP_VER := $(shell $(CC) --verbose 2>&1 ) - - endif
recipes-core/icedtea/openjdk-7-release-03b147.inc +9 -11
@@ -18,11 +18,11 @@ OPENJDK_URI = "${ICEDTEA_HG_URL}/archive/${OPENJDK_FILE};name=openjdk;unpack=fal SRC_URI[openjdk.md5sum] = "f98b0f7a69f9427a5b3775dddddc89cb" SRC_URI[openjdk.sha256sum] = "758227833982371e3a94def84226a947f8dbbd176517f313b8cb96840bdea41e" -HOTSPOT_CHANGESET = "0e651e004747" +HOTSPOT_CHANGESET = "8b7c4c5f6ba9" HOTSPOT_FILE = "${HOTSPOT_CHANGESET}.tar.gz" HOTSPOT_URI = "${ICEDTEA_HG_URL}/hotspot/archive/${HOTSPOT_FILE};name=hotspot;unpack=false" -SRC_URI[hotspot.md5sum] = "edd627c8781161eb33006ed668d833e0" -SRC_URI[hotspot.sha256sum] = "d68455e5cdb14280cd61155a4e9d531e90b073607f4367e93ead0fcf34476ae1" +SRC_URI[hotspot.md5sum] = "cb45a8f19d77acc1f4f48e75e36a27fe" +SRC_URI[hotspot.sha256sum] = "22866990d143e76ced94b76defa3051e5e5d9a51fd272d63daa0df272d6406a2" CORBA_CHANGESET = "5617f6c5cc94" CORBA_FILE = "${CORBA_CHANGESET}.tar.gz"
@@ -30,11 +30,11 @@ CORBA_URI = "${ICEDTEA_HG_URL}/corba/archive/${CORBA_FILE};name=corba;unpack=fal SRC_URI[corba.md5sum] = "920f1a788a7fdef29a5cd70892331251" SRC_URI[corba.sha256sum] = "963915483530f311ff313635f79ed11ea7ce5a1c0dbee5d1acb1994132857fa3" -JAXP_CHANGESET = "1cf75c0e2c96" +JAXP_CHANGESET = "7a8825b15df6" JAXP_FILE = "${JAXP_CHANGESET}.tar.gz" JAXP_URI = "${ICEDTEA_HG_URL}/jaxp/archive/${JAXP_FILE};name=jaxp;unpack=false" -SRC_URI[jaxp.md5sum] = "56e609548b322149cb84604f232a4602" -SRC_URI[jaxp.sha256sum] = "8ce48c704f38285207ee6dc56c45b2d214083b4d4d36be02901401b594ce701e" +SRC_URI[jaxp.md5sum] = "a0982b6df79739127871e355a40ca5a6" +SRC_URI[jaxp.sha256sum] = "297c8dbeed5afa5395b6be06b17282d53f8a888c2909074dfc1605afc0daf1c2" JAXWS_CHANGESET = "7edfbfe974f2" JAXWS_FILE = "${JAXWS_CHANGESET}.tar.gz"
@@ -42,11 +42,11 @@ JAXWS_URI = "${ICEDTEA_HG_URL}/jaxws/archive/${JAXWS_FILE};name=jaxws;unpack=fal SRC_URI[jaxws.md5sum] = "2deecec809ea8e38835678889c2bc3ac" SRC_URI[jaxws.sha256sum] = "823ca6b8fd780bf1b1565a90cfc8ec6f0ee422a5d25ffb20b1ce0272dc4955aa" -JDK_CHANGESET = "50f6f276a06c" +JDK_CHANGESET = "d5ddeffc4651" JDK_FILE = "${JDK_CHANGESET}.tar.gz" JDK_URI = "${ICEDTEA_HG_URL}/jdk/archive/${JDK_FILE};name=jdk;unpack=false" -SRC_URI[jdk.md5sum] = "7ee77eeeff600c5a4763b4ac76fd62bc" -SRC_URI[jdk.sha256sum] = "5f8b5edbebb358730425e64a31eaa11c346467ba10ffe1848f2d2ad2ea53bc3d" +SRC_URI[jdk.md5sum] = "27c28d6be213df818490e69f12efe475" +SRC_URI[jdk.sha256sum] = "e83e6234842376147a4c32451f23d629ba107e908ebdb0f367657f9cc6c1be98" LANGTOOLS_CHANGESET = "b534c4c6cd9b" LANGTOOLS_FILE = "${LANGTOOLS_CHANGESET}.tar.gz"
@@ -81,7 +81,6 @@ OPENJDK_PATCHES = " \ file://icedtea-hotspot-make-arch-sane-for-x86.patch;apply=no \ file://icedtea-jdk-sane-x86-arch.patch;apply=no \ file://icedtea-flags.patch;apply=no \ - file://icedtea-remove_sparc_compiler_option.patch;apply=no \ " # file://icedtea-disable-desktop-dirs.patch;apply=no \
@@ -94,7 +93,6 @@ export DISTRIBUTION_PATCHES = " \ patches/icedtea-hotspot-make-arch-sane-for-x86.patch \ patches/icedtea-jdk-sane-x86-arch.patch \ patches/icedtea-flags.patch \ - patches/icedtea-remove_sparc_compiler_option.patch \ " # patches/icedtea-disable-desktop-dirs.patch \
Signature · 1 line
1.7.9.5
PATCH 7/7 openjdk-7: Fix various issues in openjdk7 builds
In reply to Khem RajFix parallel build.
Fixed build on ppc/ppc64
Define WITH_ADDITIONAL_VMS variable so
it can be overridden from bbappend
Correct LICENSE
Fixed packaging errors and warnings
Fix python indentation
--- .../icedtea-jdk-nio-use-host-cc.patch | 89 +++++++++++++++++ .../icedtea-jdk-ppc64-jvm-cfg.patch | 41 ++++++++ recipes-core/openjdk/openjdk-7-common.inc | 100 ++++++++++---------- recipes-core/openjdk/openjdk-7-release-03b21.inc | 17 +++- 4 files changed, 195 insertions(+), 52 deletions(-) create mode 100644 recipes-core/openjdk/openjdk-7-03b21/icedtea-jdk-nio-use-host-cc.patch create mode 100644 recipes-core/openjdk/openjdk-7-03b21/icedtea-jdk-ppc64-jvm-cfg.patch
recipes-core/openjdk/openjdk-7-03b21/icedtea-jdk-nio-use-host-cc.patch new file +89 -0
@@ -0,0 +1,89 @@ +diff --git openjdk/jdk/make/java/nio/Makefile openjdk/jdk/make/java/nio/Makefile +index 7906531..afa5d46 100644 +--- openjdk/jdk/make/java/nio/Makefile ++++ openjdk/jdk/make/java/nio/Makefile +@@ -823,7 +823,7 @@ $(TEMPDIR)/$(GENSOR_SRC) : $(GENSOR_SRC) + + $(GENSOR_EXE) : $(TEMPDIR)/$(GENSOR_SRC) + $(prep-target) +- ($(CD) $(TEMPDIR); $(CC) $(CPPFLAGS) $(LDDFLAGS) \ ++ ($(CD) $(TEMPDIR); $(CC_FOR_BUILD) $(CPPFLAGS) $(LDDFLAGS) \ + -o genSocketOptionRegistry$(EXE_SUFFIX) $(GENSOR_SRC)) + + ifdef NIO_PLATFORM_CLASSES_ROOT_DIR +@@ -834,12 +834,8 @@ else + $(SCH_GEN)/SocketOptionRegistry.java: $(GENSOR_EXE) + $(prep-target) + NAWK="$(NAWK)" SH="$(SH)" $(SH) -e addNotices.sh "$(SOR_COPYRIGHT_YEARS)" > $@ +-ifdef CROSS_COMPILE_ARCH +- $(QEMU) $(GENSOR_EXE) >> $@ +-else + $(GENSOR_EXE) >> $@ + endif +-endif + # + # Generated sun.nio.cs SingleByte classes + # +@@ -863,7 +859,7 @@ GENUC_COPYRIGHT_YEARS = $(shell $(CAT) $(GENUC_SRC) | \ + + $(GENUC_EXE) : $(GENUC_SRC) + $(prep-target) +- $(CC) $(CPPFLAGS) -o $@ $(GENUC_SRC) ++ $(CC_FOR_BUILD) $(CPPFLAGS) -o $@ $(GENUC_SRC) + + ifdef NIO_PLATFORM_CLASSES_ROOT_DIR + $(SFS_GEN)/UnixConstants.java: $(NIO_PLATFORM_CLASSES_ROOT_DIR)/sun/nio/fs/UnixConstants-$(PLATFORM)-$(ARCH).java +@@ -873,12 +869,8 @@ else + $(SFS_GEN)/UnixConstants.java: $(GENUC_EXE) + $(prep-target) + NAWK="$(NAWK)" SH="$(SH)" $(SH) -e addNotices.sh "$(GENUC_COPYRIGHT_YEARS)" > $@ +-ifdef CROSS_COMPILE_ARCH +- $(QEMU) $(GENUC_EXE) >> $@ +-else + $(GENUC_EXE) >> $@ + endif +-endif + + GENSC_SRC = $(PLATFORM_SRC)/native/sun/nio/fs/genSolarisConstants.c + +@@ -889,7 +881,7 @@ GENSC_COPYRIGHT_YEARS = $(shell $(CAT) $(GENSC_SRC) | \ + + $(GENSC_EXE) : $(GENSC_SRC) + $(prep-target) +- $(CC) $(CPPFLAGS) -o $@ $(GENSC_SRC) ++ $(CC_FOR_BUILD) $(CPPFLAGS) -o $@ $(GENSC_SRC) + + ifdef NIO_PLATFORM_CLASSES_ROOT_DIR + $(SFS_GEN)/SolarisConstants.java: $(NIO_PLATFORM_CLASSES_ROOT_DIR)/sun/nio/fs/SolarisConstants-$(PLATFORM)-$(ARCH).java +@@ -899,11 +891,7 @@ else + $(SFS_GEN)/SolarisConstants.java: $(GENSC_EXE) + $(prep-target) + NAWK="$(NAWK)" SH="$(SH)" $(SH) -e addNotices.sh "$(GENSC_COPYRIGHT_YEARS)" > $@ +-ifdef CROSS_COMPILE_ARCH +- $(QEMU) $(GENSC_EXE) >> $@ +-else + $(GENSC_EXE) >> $@ + endif +-endif + + .PHONY: sources +--- openjdk/jdk/make/sun/Makefile.khem 2012-08-10 19:32:40.695550897 -0700 ++++ openjdk/jdk/make/sun/Makefile 2012-08-10 19:33:39.195550853 -0700 +@@ -55,7 +55,7 @@ ifneq ($(PLATFORM), windows) + endif + endif + HEADLESS_SUBDIR = headless +- XAWT_SUBDIR = xawt ++ XAWT_SUBDIR = + endif + + ifndef OPENJDK +@@ -79,7 +79,7 @@ else + endif + SUBDIRS_desktop = audio $(RENDER_SUBDIR) image \ + $(DISPLAY_LIBS) $(DGA_SUBDIR) \ +- jawt font jpeg cmm $(DISPLAY_TOOLS) beans ++ font jpeg cmm $(DISPLAY_TOOLS) beans + SUBDIRS_management = management + SUBDIRS_misc = $(ORG_SUBDIR) rmi $(JDBC_SUBDIR) tracing + SUBDIRS_tools = native2ascii serialver tools jconsole
recipes-core/openjdk/openjdk-7-03b21/icedtea-jdk-ppc64-jvm-cfg.patch new file +41 -0
41 lines not on this page · raw message
recipes-core/openjdk/openjdk-7-common.inc +49 -51
166 lines not on this page · raw message
recipes-core/openjdk/openjdk-7-release-03b21.inc +16 -1
@@ -93,7 +93,14 @@ ICEDTEAPATCHES = "\ file://icedtea-corba-parallel-make.patch;apply=no \ file://icedtea-zero-hotspotfix.patch;apply=no \ " - +ICEDTEAPATCHES_append_powerpc = " \ + file://icedtea-jdk-nio-use-host-cc.patch;apply=no \ + file://icedtea-jdk-ppc64-jvm-cfg.patch;apply=no \ + " +ICEDTEAPATCHES_append_powerpc64 = " \ + file://icedtea-jdk-nio-use-host-cc.patch;apply=no \ + file://icedtea-jdk-ppc64-jvm-cfg.patch;apply=no \ + " ICEDTEAPATCHES_append_libc-uclibc = " \ file://icedtea-hotspot-isfinte.patch;apply=no \ file://icedtea-hotspot-glibc-version.patch;apply=no \
@@ -129,4 +136,12 @@ DISTRIBUTION_PATCHES_append_libc-uclibc = "\ patches/icedtea-hotspot-dlvsym-uclibc.patch \ " +DISTRIBUTION_PATCHES_append_powerpc = " \ + patches/icedtea-jdk-nio-use-host-cc.patch \ + patches/icedtea-jdk-ppc64-jvm-cfg.patch \ + " +DISTRIBUTION_PATCHES_append_powerpc64 = " \ + patches/icedtea-jdk-nio-use-host-cc.patch \ + patches/icedtea-jdk-ppc64-jvm-cfg.patch \ + " export DISTRIBUTION_PATCHES
Signature · 1 line
1.7.9.5