From 7dbdd2420d3888d8b7e4e1418ba1bbfe0b1f687c Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Thu, 22 Nov 2012 18:47:13 +0100 Subject: icedtea7-native: simple copy over from openjdk-7 branch --- recipes-core/icedtea/icedtea7-native.inc | 249 ++++++ recipes-core/icedtea/icedtea7-native_2.1.1.bb | 9 + .../openjdk-7-03b147/build-hacks-native.patch | 41 + .../openjdk-7-03b147/disable-library-checks.patch | 115 +++ .../icedtea/openjdk-7-03b147/fix-checksums.patch | 13 + .../icedtea-corba-parallel-make.patch | 31 + .../icedtea-disable-desktop-dirs.patch | 91 +++ .../icedtea-ecj-disable-compilation.patch | 840 +++++++++++++++++++++ .../icedtea/openjdk-7-03b147/icedtea-flags.patch | 153 ++++ .../icedtea-hotspot-make-arch-sane-for-x86.patch | 622 +++++++++++++++ .../icedtea-jdk-sane-x86-arch.patch | 204 +++++ .../icedtea-sane-x86-arch-name.patch | 35 + .../openjdk-7-03b147/icedtea-unbreak-float.patch | 16 + recipes-core/icedtea/openjdk-7-release-03b147.inc | 99 +++ 14 files changed, 2518 insertions(+) create mode 100644 recipes-core/icedtea/icedtea7-native.inc create mode 100644 recipes-core/icedtea/icedtea7-native_2.1.1.bb create mode 100644 recipes-core/icedtea/openjdk-7-03b147/build-hacks-native.patch create mode 100644 recipes-core/icedtea/openjdk-7-03b147/disable-library-checks.patch create mode 100644 recipes-core/icedtea/openjdk-7-03b147/fix-checksums.patch create mode 100644 recipes-core/icedtea/openjdk-7-03b147/icedtea-corba-parallel-make.patch create mode 100644 recipes-core/icedtea/openjdk-7-03b147/icedtea-disable-desktop-dirs.patch create mode 100644 recipes-core/icedtea/openjdk-7-03b147/icedtea-ecj-disable-compilation.patch create mode 100644 recipes-core/icedtea/openjdk-7-03b147/icedtea-flags.patch create mode 100644 recipes-core/icedtea/openjdk-7-03b147/icedtea-hotspot-make-arch-sane-for-x86.patch create mode 100644 recipes-core/icedtea/openjdk-7-03b147/icedtea-jdk-sane-x86-arch.patch create mode 100644 recipes-core/icedtea/openjdk-7-03b147/icedtea-sane-x86-arch-name.patch create mode 100644 recipes-core/icedtea/openjdk-7-03b147/icedtea-unbreak-float.patch create mode 100644 recipes-core/icedtea/openjdk-7-release-03b147.inc diff --git a/recipes-core/icedtea/icedtea7-native.inc b/recipes-core/icedtea/icedtea7-native.inc new file mode 100644 index 0000000..e209a68 --- /dev/null +++ b/recipes-core/icedtea/icedtea7-native.inc @@ -0,0 +1,249 @@ +DESCRIPTION = "Harness to build the source code from OpenJDK using Free Software build tools" +HOMEPAGE = "http://icedtea.classpath.org" +LICENSE = "GPL-2.0-with-classpath-exception" +INC_PR = "r0" + +DEPENDS = "virtual/javac-native virtual/java-native classpath-native \ + rhino-native ant-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 alsa-lib-native \ + " + +inherit native java autotools + +JAVA_HOME[unexport] = "1" + +SRC_URI = " \ + ${ICEDTEA_URI} \ + ${OPENJDK_URI} \ + ${HOTSPOT_URI} \ + ${CORBA_URI} \ + ${JAXP_URI} \ + ${JAXWS_URI} \ + ${JDK_URI} \ + ${LANGTOOLS_URI} \ + ${ICEDTEA_PATCHES} \ + ${OPENJDK_PATCHES} \ + " + +S = "${WORKDIR}/${ICEDTEA}" +B = "${S}/build" + +# openjdk looks in /usr/include and /usr/lib for freetype by default. +export ALT_FREETYPE_HEADERS_PATH = "${STAGING_INCDIR}/freetype2" +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". +ICEDTEA_PARALLEL_MAKE := "${PARALLEL_MAKE}" +PARALLEL_MAKE = "" +def get_jdk7_native_jobs(d): + import bb + + pm = bb.data.getVar('ICEDTEA_PARALLEL_MAKE', d, 1); + if not pm: + return "1" + + pm = pm.split("j"); + if (len(pm) == 2): + return pm[1].strip() + + # Whatever found in PARALLEL_MAKE was not suitable. + return "1" + +JDK_JOBS = "${@get_jdk7_native_jobs(d)}" + +EXTRA_OECONF = "\ + --with-parallel-jobs=${JDK_JOBS} \ + \ + --disable-tests \ + --disable-hotspot-tests \ + --disable-langtools-tests \ + --disable-jdk-tests \ + --disable-pulse-java \ + --disable-docs \ + --disable-nss \ + --disable-system-lcms \ + --disable-system-gtk \ + \ + --with-jdk-home=${WORKDIR}/fake-jdk \ + --with-javac=${STAGING_BINDIR_NATIVE}/javac \ + --with-rhino=${STAGING_DATADIR_NATIVE}/java/rhino.jar \ + \ + --with-openjdk-src-zip=${DL_DIR}/${OPENJDK_FILE} \ + --with-hotspot-src-zip=${DL_DIR}/${HOTSPOT_FILE} \ + --with-corba-src-zip=${DL_DIR}/${CORBA_FILE} \ + --with-jaxp-src-zip=${DL_DIR}/${JAXP_FILE} \ + --with-jaxws-src-zip=${DL_DIR}/${JAXWS_FILE} \ + --with-jdk-src-zip=${DL_DIR}/${JDK_FILE} \ + --with-langtools-src-zip=${DL_DIR}/${LANGTOOLS_FILE} \ + " + +JDK_DIR = "icedtea7-native" + +JDK_INSTALL_DIR = "${D}/${libdir_jvm}/${JDK_DIR}" + +do_configure_prepend() { + echo "Configure with parallel-jobs: ${JDK_JOBS}" + + case "${TRANSLATED_TARGET_ARCH}" in + x86-64) + libarch=amd64 + ;; + i386|i486|i586|i686) + libarch=x86 + ;; + *) + arch=${TARGET_ARCH} + libarch=${TARGET_ARCH} + ;; + esac + + # Automatically copy everything that starts with "icedtea" and ends with + # ".patch" into the patches directory. + find ${WORKDIR} -maxdepth 1 -name "icedtea*.patch" -exec cp {} ${S}/patches \; + + # Prepare JDK-like directory with Classpath' files which we can treat as a + # SYSTEM_GCJ_DIR afterwards. + mkdir -p ${WORKDIR}/fake-jdk/jre/lib/ + ln -sf ${STAGING_DATADIR_NATIVE}/classpath/glibj.zip ${WORKDIR}/fake-jdk/jre/lib/rt.jar + + mkdir -p ${WORKDIR}/fake-jdk/bin + ln -sf ${STAGING_BINDIR_NATIVE}/java ${WORKDIR}/fake-jdk/bin/java + #ln -sf ${STAGING_BINDIR_NATIVE}/javac ${WORKDIR}/fake-jdk/bin/javac + ln -sf ${STAGING_BINDIR_NATIVE}/gjavah ${WORKDIR}/fake-jdk/bin/javah + ln -sf ${STAGING_BINDIR_NATIVE}/gjar ${WORKDIR}/fake-jdk/bin/jar + ln -sf ${STAGING_BINDIR_NATIVE}/grmic ${WORKDIR}/fake-jdk/bin/rmic + ln -sf ${STAGING_BINDIR_NATIVE}/gnative2ascii ${WORKDIR}/fake-jdk/bin/native2ascii + + mkdir -p ${WORKDIR}/fake-jdk/include + for i in ${STAGING_INCDIR_NATIVE}/classpath/* ;do + test -r $i | continue; + bn=`basename $i` + ln -sf $i ${WORKDIR}/fake-jdk/include/$bn; + done +} + +do_configure_append() { + oe_runmake patch-fsg + + for F in openjdk/jdk/make/common/shared/Compiler-gcc.gmk ; + do + sed -i \ + -e"s|\$(COMPILER_PATH)gcc\$(GCC_SUFFIX)|${CC}|" \ + -e"s|\$(COMPILER_PATH)gcc\$(GCC_SUFFIX) -E|${CPP}|" \ + -e"s|\$(COMPILER_PATH)g++\$(GCC_SUFFIX)|${CXX}|" \ + $F + done + + for F in openjdk/hotspot/make/linux/makefiles/gcc.make openjdk/hotspot/agent/src/os/linux/Makefile ; + do + sed -i \ + -e"s|gcc\$(GCC_SUFFIX)|${CC}|" \ + -e"s|g++\$(GCC_SUFFIX)|${CXX}|" \ + $F + done + oe_runmake patch-boot +} + +EXTRA_OEMAKE = ' \ + OE_CFLAGS="${CFLAGS}" \ + OE_CPPFLAGS="${CPPFLAGS}" \ + OE_CXXFLAGS="${CXXFLAGS}" \ + OE_LDFLAGS="${LDFLAGS}" \ + ZIPEXE="${STAGING_BINDIR_NATIVE}/zip" \ + ' + +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 "${TRANSLATED_TARGET_ARCH}" in + x86-64) + arch=amd64 + libarch=amd64 + ;; + i386|i486|i586|i686) + arch=x86 + libarch=x86 + ;; + *) + arch=${TARGET_ARCH} + libarch=${TARGET_ARCH} + ;; + esac + + install -d openjdk-boot/control/build/linux-$arch/hotspot/import/jre/lib + if [ $libarch != $arch ]; then + # Something is strange with the directoy naming. OpenJDK uses both variants. + ln -sf $libarch openjdk-boot/control/build/linux-$arch/hotspot/import/jre/lib/$arch + fi + + common_dirs="openjdk.build-boot/tmp/sun openjdk.build/tmp/sun" + for CM in ${common_dirs} + do + for DM in javax.sound/jsoundalsa sun.awt.X11/xawt sun.awt/jawt; + do + bbnote "creating ${CM}/${DM}/obj64/.files_compiled" + install -d ${CM}/${DM}/obj64 + touch ${CM}/${DM}/obj64/.files_compiled + + bbnote "creating ${CM}/${DM}/obj/.files_compiled" + install -d ${CM}/${DM}/obj + touch ${CM}/${DM}/obj/.files_compiled + done + done + + # Now cross-compile bootstrap JDK + oe_runmake icedtea +} + +def jdk_arch(d): + import bb + + 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']: + return "amd64" + + return target_arch + +do_install() { + case "${TRANSLATED_TARGET_ARCH}" in + x86-64) + JDK_ARCH=amd64 + ;; + i386|i486|i586|i686) + JDK_ARCH=x86 + ;; + *) + JDK_ARCH=${TARGET_ARCH} + ;; + esac + + install -d ${JDK_INSTALL_DIR} + + SDKDIR=openjdk.build/j2sdk-image + for F in ${SDKDIR}/bin ${SDKDIR}/include ${SDKDIR}/jre ${SDKDIR}/lib + do + cp -RL $F ${JDK_INSTALL_DIR} + done + + #cp openjdk-boot/jdk/src/solaris/hpi/export/*.h ${JDK_INSTALL_DIR}/include/hpi + #cp openjdk-boot/jdk/src/share/hpi/export/*.h ${JDK_INSTALL_DIR}/include/hpi + + install -d ${JDK_INSTALL_DIR}/include/javavm + cp openjdk-boot/jdk/src/share/javavm/export/*.h ${JDK_INSTALL_DIR}/include/javavm + cp openjdk-boot/jdk/src/solaris/javavm/export/*.h ${JDK_INSTALL_DIR}/include/javavm + + # Fix libjvm.so dependency of libfontmanager.so + ln -sf server/libjvm.so ${JDK_INSTALL_DIR}/jre/lib/${JDK_ARCH}/libjvm.so + ln -sf server/libjvm.so ${JDK_INSTALL_DIR}/jre/lib/${JDK_ARCH}/libjvm.so.0 + + # Fix missing write permissions on the files. + chmod ug+w -R ${JDK_INSTALL_DIR} +} diff --git a/recipes-core/icedtea/icedtea7-native_2.1.1.bb b/recipes-core/icedtea/icedtea7-native_2.1.1.bb new file mode 100644 index 0000000..9fff461 --- /dev/null +++ b/recipes-core/icedtea/icedtea7-native_2.1.1.bb @@ -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" + diff --git a/recipes-core/icedtea/openjdk-7-03b147/build-hacks-native.patch b/recipes-core/icedtea/openjdk-7-03b147/build-hacks-native.patch new file mode 100644 index 0000000..cc8e8b1 --- /dev/null +++ b/recipes-core/icedtea/openjdk-7-03b147/build-hacks-native.patch @@ -0,0 +1,41 @@ +Index: icedtea-2.1/Makefile.am +=================================================================== +--- icedtea-2.1.orig/Makefile.am ++++ icedtea-2.1/Makefile.am +@@ -413,6 +413,10 @@ ICEDTEA_ENV = \ + FT2_LIBS="$(FREETYPE2_LIBS)" \ + ALT_PARALLEL_COMPILE_JOBS="$(PARALLEL_JOBS)" \ + HOTSPOT_BUILD_JOBS="$(PARALLEL_JOBS)" \ ++ OE_CFLAGS="$(OE_CFLAGS)" \ ++ OE_CPPFLAGS="$(OE_CPPFLAGS)" \ ++ OE_CXXFLAGS="$(OE_CXXFLAGS)" \ ++ OE_LDFLAGS="$(OE_LDFLAGS)" \ + JAVAC="" \ + JAVA_HOME="" \ + JDK_HOME="" \ +@@ -428,10 +432,7 @@ ICEDTEA_ENV = \ + VERBOSE="$(VERBOSE)" \ + STATIC_CXX="false" \ + BUILD_GCC="$(CC)" \ +- BUILD_CPP="$(CXX)" \ +- USE_SYSTEM_CUPS="true" \ +- CUPS_LIBS="${CUPS_LIBS}" \ +- CUPS_CFLAGS="${CUPS_CFLAGS}" ++ BUILD_CPP="$(CXX)" + + if ENABLE_CACAO + ICEDTEA_ENV += \ +@@ -504,12 +505,8 @@ ICEDTEA_ENV += \ + GIF_CFLAGS="${GIF_CFLAGS}" + endif + +-if USE_SYSTEM_GTK + ICEDTEA_ENV += \ +- USE_SYSTEM_GTK="true" \ +- GTK_LIBS="${GTK_LIBS}" \ +- GTK_CFLAGS="${GTK_CFLAGS}" +-endif ++ USE_SYSTEM_GTK="false" + + if USE_SYSTEM_GIO + ICEDTEA_ENV += \ diff --git a/recipes-core/icedtea/openjdk-7-03b147/disable-library-checks.patch b/recipes-core/icedtea/openjdk-7-03b147/disable-library-checks.patch new file mode 100644 index 0000000..cd26990 --- /dev/null +++ b/recipes-core/icedtea/openjdk-7-03b147/disable-library-checks.patch @@ -0,0 +1,115 @@ +Index: icedtea-2.1/configure.ac +=================================================================== +--- icedtea-2.1.orig/configure.ac ++++ icedtea-2.1/configure.ac +@@ -171,71 +171,19 @@ IT_CHECK_FOR_LCMS + IT_CHECK_FOR_GTK + IT_CHECK_FOR_GIO + IT_CHECK_FOR_FONTCONFIG +-IT_CHECK_FOR_CUPS + IT_CHECK_FOR_SYSCALLS + AC_CONFIG_FILES([remove-intree-libraries.sh]) + +-dnl Check for Xproto headers and libraries. +-PKG_CHECK_MODULES(XPROTO, xproto,[XPROTO_FOUND=yes],[XPROTO_FOUND=no]) +-if test "x${XPROTO_FOUND}" = xno +-then +- AC_MSG_ERROR([Could not find Xproto headers - \ +- Try installing xorg-x11-proto-devel.]) +-fi +-AC_SUBST(XT_CFLAGS) +-AC_SUBST(XT_LIBS) +- +-dnl Check for libXt headers and libraries. +-PKG_CHECK_MODULES(XT, xt,[XT_FOUND=yes],[XT_FOUND=no]) +-if test "x${XT_FOUND}" = xno +-then +- AC_MSG_ERROR([Could not find Xt - \ +- Try installing libXt-devel.]) +-fi +-AC_SUBST(XT_CFLAGS) +-AC_SUBST(XT_LIBS) +- +-dnl Check for libXp headers and libraries. +-PKG_CHECK_MODULES(XP, xp,[XP_FOUND=yes],[XP_FOUND=no]) +-if test "x${XP_FOUND}" = xno +-then +- AC_MSG_ERROR([Could not find Xp - \ +- Try installing libXp-devel.]) +-fi +-AC_SUBST(XP_CFLAGS) +-AC_SUBST(XP_LIBS) +- + dnl Check for libX11 headers and libraries. + PKG_CHECK_MODULES(X11, x11,[X11_FOUND=yes],[X11_FOUND=no]) + if test "x${X11_FOUND}" = xno + then +- AC_MSG_ERROR([Could not find x11 - \ +- Try installing libX11-devel.]) ++ AC_MSG_ERROR([Could not find x11 - \ ++ Try installing libX11-devel.]) + fi + AC_SUBST(X11_CFLAGS) + AC_SUBST(X11_LIBS) + +-dnl Check for libXinerama headers and libraries. +-PKG_CHECK_MODULES(XINERAMA, xinerama,[XINERAMA_FOUND=yes] +- ,[XINERAMA_FOUND=no]) +-if test "x${XINERAMA_FOUND}" = xno +-then +- AC_MSG_ERROR([Could not find Xinerama - \ +- Try installing libXinerama-devel.]) +-fi +-AC_SUBST(XINERAMA_CFLAGS) +-AC_SUBST(XINERAMA_LIBS) +- +-if test "x${ENABLE_XRENDER}" = "xyes" +-then +- PKG_CHECK_MODULES(XRENDER, xrender, [XRENDER_FOUND=yes], [XRENDER_FOUND=no]) +- if test "x${XRENDER_FOUND}" = xno +- then +- AC_MSG_ERROR([Could not find Xrender extension - \ +-Try installing libXrender-devel or configure --disable-xrender.]) +- fi +-fi +- + if test "x${ENABLE_SYSTEMTAP}" = xyes; then + AC_CHECK_HEADER([sys/sdt.h], [SDT_H_FOUND='yes'], + [SDT_H_FOUND='no'; +@@ -297,16 +245,6 @@ public: + AC_CONFIG_FILES([tapset/jstack.stp]) + fi + +-dnl Check for libXtst headers and libraries. +-PKG_CHECK_MODULES(XTST, xtst,[XTST_FOUND=yes],[XTST_FOUND=no]) +-if test "x${XTST_FOUND}" = xno +-then +- AC_MSG_ERROR([Could not find Xtst - \ +- Try installing libXtst-devel.]) +-fi +-AC_SUBST(XTST_CFLAGS) +-AC_SUBST(XTST_LIBS) +- + dnl Check for freetype2 headers and libraries. + PKG_CHECK_MODULES(FREETYPE2, freetype2,[FREETYPE2_FOUND=yes] + ,[FREETYPE2_FOUND=no]) +@@ -318,19 +256,6 @@ fi + AC_SUBST(FREETYPE2_CFLAGS) + AC_SUBST(FREETYPE2_LIBS) + +-dnl Check for alsa headers and libraries (only required for Linux). +-if test "x${BUILD_OS_DIR}" = "xlinux" +-then +- PKG_CHECK_MODULES(ALSA, alsa,[ALSA_FOUND=yes],[ALSA_FOUND=no]) +- if test "x${ALSA_FOUND}" = xno +- then +- AC_MSG_ERROR([Could not find alsa - \ +- Try installing alsa-lib-devel.]) +- fi +-AC_SUBST(ALSA_CFLAGS) +-AC_SUBST(ALSA_LIBS) +-fi +- + if test "x${enable_pulse_java}" = "xyes" + then + dnl Check for pulseaudio libraries. diff --git a/recipes-core/icedtea/openjdk-7-03b147/fix-checksums.patch b/recipes-core/icedtea/openjdk-7-03b147/fix-checksums.patch new file mode 100644 index 0000000..1999170 --- /dev/null +++ b/recipes-core/icedtea/openjdk-7-03b147/fix-checksums.patch @@ -0,0 +1,13 @@ +Index: icedtea-2.1/Makefile.am +=================================================================== +--- icedtea-2.1.orig/Makefile.am ++++ icedtea-2.1/Makefile.am +@@ -18,7 +18,7 @@ JAXP_SHA256SUM = 8ce48c704f38285207ee6dc + JAXWS_SHA256SUM = 823ca6b8fd780bf1b1565a90cfc8ec6f0ee422a5d25ffb20b1ce0272dc4955aa + JDK_SHA256SUM = 5f8b5edbebb358730425e64a31eaa11c346467ba10ffe1848f2d2ad2ea53bc3d + LANGTOOLS_SHA256SUM = c77dd42d83f06d18fa8aa65c93d137608a2e02cf24b68fc10d7b1c0bcc12a93c +-OPENJDK_SHA256SUM = ada790b4754f521ebfad0dd909ea29b92b2b3c1b84b2e99d32673343727d95d7 ++OPENJDK_SHA256SUM = 758227833982371e3a94def84226a947f8dbbd176517f313b8cb96840bdea41e + + CACAO_VERSION = a567bcb7f589 + CACAO_SHA256SUM = d49f79debc131a5694cae6ab3ba2864e7f3249ee8d9dc09aae8afdd4dc6b09f9 diff --git a/recipes-core/icedtea/openjdk-7-03b147/icedtea-corba-parallel-make.patch b/recipes-core/icedtea/openjdk-7-03b147/icedtea-corba-parallel-make.patch new file mode 100644 index 0000000..09f7511 --- /dev/null +++ b/recipes-core/icedtea/openjdk-7-03b147/icedtea-corba-parallel-make.patch @@ -0,0 +1,31 @@ +diff --git openjdk/corba/make/Makefile openjdk/corba/make/Makefile +index aef5c1b..62e2216 100644 +--- openjdk/corba/make/Makefile ++++ openjdk/corba/make/Makefile +@@ -134,7 +134,7 @@ default: all + #----- classes.jar + + CLASSES_JAR = $(LIB_DIR)/classes.jar +-$(CLASSES_JAR): ++$(CLASSES_JAR): build + $(MKDIR) -p $(@D) + $(BOOT_JAR_CMD) -cf $@ -C $(CLASSES_DIR) . + +@@ -144,6 +144,7 @@ SRC_ZIP_FILES = $(shell $(FIND) $(SRC_CLASSES_DIR) \( -name \*-template \) -prun + + SRC_ZIP = $(LIB_DIR)/src.zip + $(SRC_ZIP): $(SRC_ZIP_FILES) ++ $(MKDIR) -p $(@D) + abs_src_zip=`cd $(@D) ; pwd`/$(@F) ; \ + ( cd $(SRC_CLASSES_DIR) ; $(FIND) . \( -name \*-template \) -prune -o -type f -print | $(ZIP) -q $$abs_src_zip -@ ) ; \ + ( cd $(GENSRC_DIR) ; $(FIND) . -type f -print | $(ZIP) -q $$abs_src_zip -@ ) ; +@@ -153,7 +154,8 @@ $(SRC_ZIP): $(SRC_ZIP_FILES) + BIN_ZIP_FILES = $(BUILD_DIR/lib/orb.idl $(BUILD_DIR)/lib/ir.idl + + BIN_ZIP = $(LIB_DIR)/bin.zip +-$(BIN_ZIP): $(BIN_ZIP_FILES) ++$(BIN_ZIP): build $(BIN_ZIP_FILES) ++ $(MKDIR) -p $(@D) + abs_bin_zip=`cd $(@D) ; pwd`/$(@F) ; \ + ( cd $(BUILD_DIR) ; $(FIND) lib -name "*.idl" -print | $(ZIP) -q $$abs_bin_zip -@ ) ; + diff --git a/recipes-core/icedtea/openjdk-7-03b147/icedtea-disable-desktop-dirs.patch b/recipes-core/icedtea/openjdk-7-03b147/icedtea-disable-desktop-dirs.patch new file mode 100644 index 0000000..739804a --- /dev/null +++ b/recipes-core/icedtea/openjdk-7-03b147/icedtea-disable-desktop-dirs.patch @@ -0,0 +1,91 @@ +diff --git openjdk/jdk/make/common/Subdirs.gmk openjdk/jdk/make/common/Subdirs.gmk +index f212d50..da6e9e1 100644 +--- openjdk/jdk/make/common/Subdirs.gmk ++++ openjdk/jdk/make/common/Subdirs.gmk +@@ -88,28 +88,6 @@ done + @$(ECHO) "Done Processing OTHERSUBDIRS: $(OTHERSUBDIRS)" + endef + +-# +-# Iterate the list specified in SUBDIRS_ only if +-# SUBDIRS_ is set. +-# +-ifdef SUBDIRS_desktop +- define subdirs-desktop-loop +- @$(call subdirs-group-loop,SUBDIRS_desktop) +- endef +-else +- define subdirs-desktop-loop +- endef +-endif # SUBDIRS_desktop +- +-ifdef SUBDIRS_enterprise +- define subdirs-enterprise-loop +- @$(call subdirs-group-loop,SUBDIRS_enterprise) +- endef +-else +-define subdirs-enterprise-loop +-endef +-endif # SUBDIRS_enterprise +- + ifdef SUBDIRS_management + define subdirs-management-loop + @$(call subdirs-group-loop,SUBDIRS_management) +@@ -140,7 +118,7 @@ endif # SUBDIRS_tools + # + # If BUILD_MODULES is not set or it's set to "all", + # iterate all groups. +-SUBDIRS_all = $(SUBDIRS) $(SUBDIRS_desktop) $(SUBDIRS_enterprise) \ ++SUBDIRS_all = $(SUBDIRS) $(SUBDIRS_enterprise) \ + $(SUBDIRS_management) $(SUBDIRS_misc) $(SUBDIRS_tools) + + define SUBDIRS-loop +diff --git a/jdk/src/solaris/native/sun/java2d/x11/XRSurfaceData.c b/jdk/src/solaris/native/sun/java2d/x11/XRSurfaceData.c +index 5de53ca..b598a22 100644 +--- a/jdk/src/solaris/native/sun/java2d/x11/XRSurfaceData.c ++++ b/jdk/src/solaris/native/sun/java2d/x11/XRSurfaceData.c +@@ -29,7 +29,7 @@ + #include "X11SurfaceData.h" + + /*#include */ +-#include ++#include + + #ifndef RepeatNone /* added in 0.10 */ + #define RepeatNone 0 +diff --git a/jdk/make/sun/xawt/FILES_c_unix.gmk b/jdk/make/sun/xawt/FILES_c_unix.gmk +index 57b34c3..c629f78 100644 +--- a/jdk/make/sun/xawt/FILES_c_unix.gmk ++++ b/jdk/make/sun/xawt/FILES_c_unix.gmk +@@ -84,15 +84,8 @@ FILES_c = \ + XRSurfaceData.c \ + XRBackendNative.c + +-ifndef USE_SYSTEM_GTK + FILES_c += \ + gtk_fp.c +-endif +- +-ifndef USE_SYSTEM_CUPS +-FILES_c += \ +- cups_fp.c +-endif + + ifndef USE_SYSTEM_FONTCONFIG + FILES_c += \ +diff --git a/jdk/make/sun/awt/FILES_c_unix.gmk b/jdk/make/sun/awt/FILES_c_unix.gmk +index dc1f61e..489abc1 100644 +--- a/jdk/make/sun/awt/FILES_c_unix.gmk ++++ b/jdk/make/sun/awt/FILES_c_unix.gmk +@@ -230,11 +230,6 @@ FILES_NO_MOTIF_c = \ + AccelGlyphCache.c \ + CUPSfuncs.c + +-ifndef USE_SYSTEM_CUPS +-FILES_NO_MOTIF_c += \ +- cups_fp.c +-endif +- + ifndef USE_SYSTEM_FONTCONFIG + FILES_NO_MOTIF_c += \ + fontconfig_fp.c diff --git a/recipes-core/icedtea/openjdk-7-03b147/icedtea-ecj-disable-compilation.patch b/recipes-core/icedtea/openjdk-7-03b147/icedtea-ecj-disable-compilation.patch new file mode 100644 index 0000000..a9ee96c --- /dev/null +++ b/recipes-core/icedtea/openjdk-7-03b147/icedtea-ecj-disable-compilation.patch @@ -0,0 +1,840 @@ +diff --git openjdk/jdk/make/common/Sanity.gmk openjdk/jdk/make/common/Sanity.gmk +index 27fe5bd..97ad549 100644 +--- openjdk/jdk/make/common/Sanity.gmk ++++ openjdk/jdk/make/common/Sanity.gmk +@@ -91,19 +91,7 @@ sanity-all:: sanity-base \ + sane-ld_run_path \ + sane-alt_bootdir \ + sane-bootdir \ +- sane-local-bootdir \ +- sane-alsa-headers +- +-ifdef OPENJDK +-sanity-all:: sane-freetype +-endif +- +- +-# Always check cups header paths on solaris & linux +-ifneq ($(PLATFORM), windows) +-sanity-all:: \ +- sane-cups +-endif ++ sane-local-bootdir + + # Always check hotspot binary paths even if we are building them from scratch + HOTSPOT_IMPORT_CHECK=true +diff --git openjdk/jdk/make/common/shared/Defs-java.gmk openjdk/jdk/make/common/shared/Defs-java.gmk +index 401f7db..bbd1157 100644 +--- openjdk/jdk/make/common/shared/Defs-java.gmk ++++ openjdk/jdk/make/common/shared/Defs-java.gmk +@@ -36,14 +36,6 @@ + # Memory related -J flags that all uses of java tools should use. + # + JAVA_MEM_FLAGS = -Xmx$(MAX_VM_MEMORY)m +-ifeq ($(ARCH), ia64) +- # Special flags for javac on ia64 to work around a VM problem with +- # bad code generation during inlining (what version had this problem?): +- # Suspect this may not be needed anymore. +- JAVA_MEM_FLAGS += -Xms$(MAX_VM_MEMORY)m -XX:-Inline +-else +- JAVA_MEM_FLAGS += -Xms$(MIN_VM_MEMORY)m -XX:PermSize=32m -XX:MaxPermSize=160m +-endif + + # + # All java tools (javac, javah, and javadoc) run faster with certain java +diff --git openjdk/jdk/make/common/shared/Sanity.gmk openjdk/jdk/make/common/shared/Sanity.gmk +index a566d07..25ca978 100644 +--- openjdk/jdk/make/common/shared/Sanity.gmk ++++ openjdk/jdk/make/common/shared/Sanity.gmk +@@ -200,7 +200,6 @@ include $(JDK_MAKE_SHARED_DIR)/Sanity-Settings.gmk + sane-alt_bootdir \ + sane-bootdir \ + sane-local-bootdir \ +- sane-cups \ + sane-devtools_path \ + sane-compiler_path \ + sane-unixcommand_path \ +@@ -218,12 +217,10 @@ include $(JDK_MAKE_SHARED_DIR)/Sanity-Settings.gmk + sane-compiler \ + sane-link \ + sane-cacerts \ +- sane-alsa-headers \ + sane-ant_version \ + sane-zip_version \ + sane-unzip_version \ +- sane-msvcrt_path \ +- sane-freetype ++ sane-msvcrt_path + + ###################################################### + # check for COPYRIGHT_YEAR variable +diff --git openjdk/jdk/make/javax/sound/jsoundalsa/Makefile openjdk/jdk/make/javax/sound/jsoundalsa/Makefile +index 5fa0124..e56be17 100644 +--- openjdk/jdk/make/javax/sound/jsoundalsa/Makefile ++++ openjdk/jdk/make/javax/sound/jsoundalsa/Makefile +@@ -44,34 +44,11 @@ include $(BUILDDIR)/common/Mapfile-vers.gmk + # Files + # + +-FILES_c = \ +- Utilities.c \ +- $(DAUDIOFILES_c) \ +- $(MIDIFILES_c) \ +- $(PORTFILES_c) +- +-# platform dependent files +-FILES_c += \ +- PLATFORM_API_LinuxOS_ALSA_CommonUtils.c \ +- PLATFORM_API_LinuxOS_ALSA_PCM.c \ +- PLATFORM_API_LinuxOS_ALSA_PCMUtils.c \ +- PLATFORM_API_LinuxOS_ALSA_MidiIn.c \ +- PLATFORM_API_LinuxOS_ALSA_MidiOut.c \ +- PLATFORM_API_LinuxOS_ALSA_MidiUtils.c \ +- PLATFORM_API_LinuxOS_ALSA_Ports.c +- +-FILES_export = \ +- $(DAUDIOFILES_export) \ +- $(MIDIFILES_export) \ +- $(PORTFILES_export) +- +-OTHER_LDLIBS += -lasound +- + CPPFLAGS += \ +- -DUSE_DAUDIO=TRUE \ +- -DUSE_PORTS=TRUE \ +- -DUSE_PLATFORM_MIDI_OUT=TRUE \ +- -DUSE_PLATFORM_MIDI_IN=TRUE \ ++ -DUSE_DAUDIO=FALSE \ ++ -DUSE_PORTS=FALSE \ ++ -DUSE_PLATFORM_MIDI_OUT=FALSE \ ++ -DUSE_PLATFORM_MIDI_IN=FALSE \ + -I$(SHARE_SRC)/native/com/sun/media/sound + + # +diff --git openjdk/jdk/make/launchers/Makefile openjdk/jdk/make/launchers/Makefile +index cc07bbe..bdd7b1f 100644 +--- openjdk/jdk/make/launchers/Makefile ++++ openjdk/jdk/make/launchers/Makefile +@@ -43,18 +43,7 @@ $(MAKE) -f Makefile.launcher \ + MAIN_ARGS="$(strip $4)" + endef + +-# Run MAKE $@ for all generic launchers +-ifndef BUILD_HEADLESS_ONLY +-define make-appletviewer +-$(call make-launcher, appletviewer, sun.applet.Main, , ) +-endef +-else +-define make-appletviewer +-endef +-endif +- + define make-all-launchers +-$(make-appletviewer) + $(call make-launcher, apt, com.sun.tools.apt.Main, , ) + $(call make-launcher, extcheck, com.sun.tools.extcheck.Main, , ) + $(call make-launcher, idlj, com.sun.tools.corba.se.idl.toJavaPortable.Compile, , ) +diff --git openjdk/jdk/make/sun/awt/Makefile openjdk/jdk/make/sun/awt/Makefile +index 43c9ad2..c29c167 100644 +--- openjdk/jdk/make/sun/awt/Makefile ++++ openjdk/jdk/make/sun/awt/Makefile +@@ -178,7 +178,7 @@ COMPILEFONTCONFIG_FLAGS = + ifdef ALT_COMPILEFONTCONFIG_FLAGS + COMPILEFONTCONFIG_FLAGS += $(ALT_COMPILEFONTCONFIG_FLAGS) + endif +-build: fontconfigs ++build: + + + ifeq ($(PLATFORM), windows) +@@ -503,10 +503,6 @@ CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \ + -I$(PLATFORM_SRC)/native/$(PKGDIR) \ + $(EVENT_MODEL) + +-ifeq ($(PLATFORM), linux) +-LDFLAGS += -L$(OPENWIN_LIB) +-endif +- + LDFLAGS += -L$(LIBDIR)/$(LIBARCH)/$(TSOBJDIR) \ + $(AWT_RUNPATH) + +diff --git openjdk/jdk/make/sun/jawt/Makefile openjdk/jdk/make/sun/jawt/Makefile +index afbce78..ed6a1c3 100644 +--- openjdk/jdk/make/sun/jawt/Makefile ++++ openjdk/jdk/make/sun/jawt/Makefile +@@ -36,7 +36,7 @@ include $(BUILDDIR)/common/Defs.gmk + ifeq ($(PLATFORM), windows) + FILES_cpp = jawt.cpp + else # PLATFORM +-FILES_c = jawt.c ++FILES_c = + endif # PLATFORM + + FILES_h = $(INCLUDEDIR)/jawt.h \ +diff --git openjdk/jdk/src/share/classes/java/awt/GraphicsEnvironment.java openjdk/jdk/src/share/classes/java/awt/GraphicsEnvironment.java +index cf3f1e5..657716a 100644 +--- openjdk/jdk/src/share/classes/java/awt/GraphicsEnvironment.java ++++ openjdk/jdk/src/share/classes/java/awt/GraphicsEnvironment.java +@@ -137,7 +137,7 @@ public abstract class GraphicsEnvironment { + * @since 1.4 + */ + public static boolean isHeadless() { +- return getHeadlessProperty(); ++ return true; + } + + /** +diff --git openjdk/jdk/src/solaris/native/sun/awt/CUPSfuncs.c openjdk/jdk/src/solaris/native/sun/awt/CUPSfuncs.c +index 483f6f7..90812ee 100644 +--- openjdk/jdk/src/solaris/native/sun/awt/CUPSfuncs.c ++++ openjdk/jdk/src/solaris/native/sun/awt/CUPSfuncs.c +@@ -25,12 +25,6 @@ + + #include + #include +-#include +-#include +- +-#ifndef USE_SYSTEM_CUPS +-#include +-#endif + + //#define CUPS_DEBUG + +@@ -47,11 +41,7 @@ + JNIEXPORT jboolean JNICALL + Java_sun_print_CUPSPrinter_initIDs(JNIEnv *env, + jobject printObj) { +-#ifndef USE_SYSTEM_CUPS +- return cups_init(); +-#else + return JNI_TRUE; +-#endif + } + + /* +@@ -62,17 +52,7 @@ JNIEXPORT jstring JNICALL + Java_sun_print_CUPSPrinter_getCupsServer(JNIEnv *env, + jobject printObj) + { +- jstring cServer = NULL; +- const char* server = cupsServer(); +- if (server != NULL) { +- // Is this a local domain socket? +- if (strncmp(server, "/", 1) == 0) { +- cServer = JNU_NewStringPlatform(env, "localhost"); +- } else { +- cServer = JNU_NewStringPlatform(env, server); +- } +- } +- return cServer; ++ return NULL; + } + + /* +@@ -83,8 +63,7 @@ JNIEXPORT jint JNICALL + Java_sun_print_CUPSPrinter_getCupsPort(JNIEnv *env, + jobject printObj) + { +- int port = ippPort(); +- return (jint) port; ++ return 8080; + } + + +@@ -98,16 +77,6 @@ Java_sun_print_CUPSPrinter_canConnect(JNIEnv *env, + jstring server, + jint port) + { +- const char *serverName; +- serverName = (*env)->GetStringUTFChars(env, server, NULL); +- if (serverName != NULL) { +- http_t *http = httpConnect(serverName, (int)port); +- (*env)->ReleaseStringUTFChars(env, server, serverName); +- if (http != NULL) { +- httpClose(http); +- return JNI_TRUE; +- } +- } + return JNI_FALSE; + } + +@@ -120,111 +89,7 @@ Java_sun_print_CUPSPrinter_getMedia(JNIEnv *env, + jobject printObj, + jstring printer) + { +- ppd_file_t *ppd; +- ppd_option_t *optionTray, *optionPage; +- ppd_choice_t *choice; +- const char *name; +- const char *filename; +- int i, nTrays=0, nPages=0, nTotal=0; +- jstring utf_str; +- jclass cls; +- jobjectArray nameArray = NULL; +- +- name = (*env)->GetStringUTFChars(env, printer, NULL); +- if (name == NULL) { +- return NULL; +- } +- +- // NOTE: cupsGetPPD returns a pointer to a filename of a temporary file. +- // unlink() must be caled to remove the file when finished using it. +- filename = cupsGetPPD(name); +- (*env)->ReleaseStringUTFChars(env, printer, name); +- +- cls = (*env)->FindClass(env, "java/lang/String"); +- +- if (filename == NULL) { +- return NULL; +- } +- +- if ((ppd = ppdOpenFile(filename)) == NULL) { +- unlink(filename); +- DPRINTF("CUPSfuncs::unable to open PPD %s\n", filename); +- return NULL; +- } +- +- optionPage = ppdFindOption(ppd, "PageSize"); +- if (optionPage != NULL) { +- nPages = optionPage->num_choices; +- } +- +- optionTray = ppdFindOption(ppd, "InputSlot"); +- if (optionTray != NULL) { +- nTrays = optionTray->num_choices; +- } +- +- if ((nTotal = (nPages+nTrays) *2) > 0) { +- nameArray = (*env)->NewObjectArray(env, nTotal, cls, NULL); +- if (nameArray == NULL) { +- unlink(filename); +- ppdClose(ppd); +- DPRINTF("CUPSfuncs::bad alloc new array\n", "") +- JNU_ThrowOutOfMemoryError(env, "OutOfMemoryError"); +- return NULL; +- } +- +- for (i = 0; optionPage!=NULL && ichoices)+i; +- utf_str = JNU_NewStringPlatform(env, choice->text); +- if (utf_str == NULL) { +- unlink(filename); +- ppdClose(ppd); +- DPRINTF("CUPSfuncs::bad alloc new string ->text\n", "") +- JNU_ThrowOutOfMemoryError(env, "OutOfMemoryError"); +- return NULL; +- } +- (*env)->SetObjectArrayElement(env, nameArray, i*2, utf_str); +- (*env)->DeleteLocalRef(env, utf_str); +- utf_str = JNU_NewStringPlatform(env, choice->choice); +- if (utf_str == NULL) { +- unlink(filename); +- ppdClose(ppd); +- DPRINTF("CUPSfuncs::bad alloc new string ->choice\n", "") +- JNU_ThrowOutOfMemoryError(env, "OutOfMemoryError"); +- return NULL; +- } +- (*env)->SetObjectArrayElement(env, nameArray, i*2+1, utf_str); +- (*env)->DeleteLocalRef(env, utf_str); +- } +- +- for (i = 0; optionTray!=NULL && ichoices)+i; +- utf_str = JNU_NewStringPlatform(env, choice->text); +- if (utf_str == NULL) { +- unlink(filename); +- ppdClose(ppd); +- DPRINTF("CUPSfuncs::bad alloc new string text\n", "") +- JNU_ThrowOutOfMemoryError(env, "OutOfMemoryError"); +- return NULL; +- } +- (*env)->SetObjectArrayElement(env, nameArray, +- (nPages+i)*2, utf_str); +- (*env)->DeleteLocalRef(env, utf_str); +- utf_str = JNU_NewStringPlatform(env, choice->choice); +- if (utf_str == NULL) { +- unlink(filename); +- ppdClose(ppd); +- DPRINTF("CUPSfuncs::bad alloc new string choice\n", "") +- JNU_ThrowOutOfMemoryError(env, "OutOfMemoryError"); +- return NULL; +- } +- (*env)->SetObjectArrayElement(env, nameArray, +- (nPages+i)*2+1, utf_str); +- (*env)->DeleteLocalRef(env, utf_str); +- } +- } +- ppdClose(ppd); +- unlink(filename); +- return nameArray; ++ return NULL; + } + + +@@ -236,63 +101,5 @@ Java_sun_print_CUPSPrinter_getPageSizes(JNIEnv *env, + jobject printObj, + jstring printer) + { +- ppd_file_t *ppd; +- ppd_option_t *option; +- ppd_choice_t *choice; +- ppd_size_t *size; +- +- const char *name = (*env)->GetStringUTFChars(env, printer, NULL); +- const char *filename; +- int i; +- jobjectArray sizeArray = NULL; +- jfloat *dims; +- +- // NOTE: cupsGetPPD returns a pointer to a filename of a temporary file. +- // unlink() must be called to remove the file after using it. +- filename = cupsGetPPD(name); +- (*env)->ReleaseStringUTFChars(env, printer, name); +- if (filename == NULL) { +- return NULL; +- } +- if ((ppd = ppdOpenFile(filename)) == NULL) { +- unlink(filename); +- DPRINTF("unable to open PPD %s\n", filename) +- return NULL; +- } +- option = ppdFindOption(ppd, "PageSize"); +- if (option != NULL && option->num_choices > 0) { +- // create array of dimensions - (num_choices * 6) +- //to cover length & height +- DPRINTF( "CUPSfuncs::option->num_choices %d\n", option->num_choices) +- sizeArray = (*env)->NewFloatArray(env, option->num_choices*6); +- if (sizeArray == NULL) { +- unlink(filename); +- ppdClose(ppd); +- DPRINTF("CUPSfuncs::bad alloc new float array\n", "") +- JNU_ThrowOutOfMemoryError(env, "OutOfMemoryError"); +- return NULL; +- } +- +- dims = (*env)->GetFloatArrayElements(env, sizeArray, NULL); +- for (i = 0; inum_choices; i++) { +- choice = (option->choices)+i; +- size = ppdPageSize(ppd, choice->choice); +- if (size != NULL) { +- // paper width and height +- dims[i*6] = size->width; +- dims[(i*6)+1] = size->length; +- // paper printable area +- dims[(i*6)+2] = size->left; +- dims[(i*6)+3] = size->top; +- dims[(i*6)+4] = size->right; +- dims[(i*6)+5] = size->bottom; +- } +- } +- +- (*env)->ReleaseFloatArrayElements(env, sizeArray, dims, 0); +- } +- +- ppdClose(ppd); +- unlink(filename); +- return sizeArray; ++ return NULL; + } +diff --git openjdk/jdk/make/sun/Makefile openjdk/jdk/make/sun/Makefile +index 4c19f4e..ef0e8be 100644 +--- openjdk/jdk/make/sun/Makefile ++++ openjdk/jdk/make/sun/Makefile +@@ -74,7 +74,7 @@ ifdef BUILD_HEADLESS_ONLY + DISPLAY_LIBS = awt $(HEADLESS_SUBDIR) + DISPLAY_TOOLS = + else +- DISPLAY_LIBS = awt splashscreen $(XAWT_SUBDIR) $(HEADLESS_SUBDIR) ++ DISPLAY_LIBS = awt $(XAWT_SUBDIR) $(HEADLESS_SUBDIR) + DISPLAY_TOOLS = applet + endif + SUBDIRS_desktop = audio $(RENDER_SUBDIR) image \ +diff --git openjdk/jdk/make/sun/xawt/Makefile openjdk/jdk/make/sun/xawt/Makefile +index e7d54e2..de23453 100644 +--- openjdk/jdk/make/sun/xawt/Makefile ++++ openjdk/jdk/make/sun/xawt/Makefile +@@ -46,15 +46,12 @@ include FILES_export_unix.gmk + AUTO_FILES_JAVA_DIRS = sun/awt/X11 + AUTO_JAVA_PRUNE = WrapperGenerator.java + +-LDFLAGS += -L$(OPENWIN_LIB) +- + # For Xrender extension. + ifeq ($(PLATFORM), solaris) + LDFLAGS += -L/usr/openwin/sfw/lib$(ISA_DIR) -R/usr/openwin/sfw/lib$(ISA_DIR) + endif + + ifeq ($(PLATFORM), linux) +-LDFLAGS += -lpthread + dummy := $(shell $(MKDIR) -p $(LIB_LOCATION)) + endif + +@@ -96,9 +93,7 @@ ifndef USE_SYSTEM_GIO + vpath %.c $(PLATFORM_SRC)/native/common/deps/glib2 + endif + +-ifndef USE_SYSTEM_GTK + vpath %.c $(PLATFORM_SRC)/native/common/deps/gtk2 +-endif + + ifndef USE_SYSTEM_CUPS + vpath %.c $(PLATFORM_SRC)/native/common/deps +@@ -109,15 +104,7 @@ vpath %.c $(PLATFORM_SRC)/native/common/deps/fontconfig2 + endif + + OTHER_LDLIBS = $(LIBM) -lawt -lXext -lX11 -lXrender -ldl \ +- $(LDFLAGS_COMMON) $(AWT_RUNPATH) $(OTHER_LDFLAGS) -lXtst -lXi +- +-ifdef USE_SYSTEM_GTK +- OTHER_LDLIBS += $(GTK_LIBS) +-endif +- +-ifdef USE_SYSTEM_CUPS +- OTHER_LDLIBS += $(CUPS_LIBS) +-endif ++ $(LDFLAGS_COMMON) $(AWT_RUNPATH) $(OTHER_LDFLAGS) + + ifdef USE_SYSTEM_FONTCONFIG + OTHER_LDLIBS += $(FONTCONFIG_LIBS) +@@ -132,12 +119,6 @@ CPPFLAGS += -DFUNCPROTO=15 + dummy := $(shell $(MKDIR) -p $(LIB_LOCATION)) + endif + +-ifdef CUPS_CFLAGS +- CPPFLAGS += $(CUPS_CFLAGS) +-else +- CPPFLAGS += -I$(CUPS_HEADERS_PATH) +-endif +- + CPPFLAGS += -DXAWT -DXAWT_HACK \ + -I$(TEMPDIR)/../../sun.awt/awt/CClassHeaders \ + -I$(PLATFORM_SRC)/native/sun/awt \ +@@ -164,17 +145,7 @@ CPPFLAGS += -DXAWT -DXAWT_HACK \ + -I$(SHARE_SRC)/native/sun/awt \ + -I$(PLATFORM_SRC)/native/sun/awt + +-ifdef USE_SYSTEM_GTK +- CPPFLAGS += $(GTK_CFLAGS) -DUSE_SYSTEM_GTK +-else +- CPPFLAGS += -I$(PLATFORM_SRC)/native/common/deps/gtk2 +-endif +- +-ifdef USE_SYSTEM_CUPS +- CPPFLAGS += -DUSE_SYSTEM_CUPS +-else +- CPPFLAGS += -I$(PLATFORM_SRC)/native/common/deps +-endif ++CPPFLAGS += -I$(PLATFORM_SRC)/native/common/deps/gtk2 + + ifdef USE_SYSTEM_FONTCONFIG + CPPFLAGS += $(FONTCONFIG_CFLAGS) -DUSE_SYSTEM_FONTCONFIG +@@ -188,20 +159,6 @@ else + CPPFLAGS += -I$(PLATFORM_SRC)/native/common/deps/glib2 + endif + +-ifeq ($(PLATFORM), linux) +- ifndef CROSS_COMPILE_ARCH +- # Allows for builds on Debian GNU Linux, X11 is in a different place +- # This should really be handled at a higher-level so we don't have to +- # work-around this when cross-compiling +- CPPFLAGS += -I/usr/X11R6/include/X11/extensions \ +- -I/usr/include/X11/extensions \ +- -I$(OPENWIN_HOME)/include +- else +- CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions \ +- -I$(OPENWIN_HOME)/include +- endif +-endif +- + # We have some odd logic here because some Solaris 10 updates + # have a render.h file that suggests gradients are supported, but + # the Xrender.h doesn't have the corresponding type definitions. +diff --git openjdk/jdk/make/sun/xawt/FILES_c_unix.gmk openjdk/jdk/make/sun/xawt/FILES_c_unix.gmk +index 57b34c3..c629f78 100644 +--- openjdk/jdk/make/sun/xawt/FILES_c_unix.gmk ++++ openjdk/jdk/make/sun/xawt/FILES_c_unix.gmk +@@ -84,15 +84,8 @@ FILES_c = \ + XRSurfaceData.c \ + XRBackendNative.c + +-ifndef USE_SYSTEM_GTK + FILES_c += \ + gtk_fp.c +-endif +- +-ifndef USE_SYSTEM_CUPS +-FILES_c += \ +- cups_fp.c +-endif + + ifndef USE_SYSTEM_FONTCONFIG + FILES_c += \ +diff --git openjdk/jdk/make/sun/awt/FILES_c_unix.gmk openjdk/jdk/make/sun/awt/FILES_c_unix.gmk +index dc1f61e..489abc1 100644 +--- openjdk/jdk/make/sun/awt/FILES_c_unix.gmk ++++ openjdk/jdk/make/sun/awt/FILES_c_unix.gmk +@@ -230,11 +230,6 @@ FILES_NO_MOTIF_c = \ + AccelGlyphCache.c \ + CUPSfuncs.c + +-ifndef USE_SYSTEM_CUPS +-FILES_NO_MOTIF_c += \ +- cups_fp.c +-endif +- + ifndef USE_SYSTEM_FONTCONFIG + FILES_NO_MOTIF_c += \ + fontconfig_fp.c +diff --git openjdk/jdk/src/solaris/native/sun/java2d/x11/XRSurfaceData.c openjdk/jdk/src/solaris/native/sun/java2d/x11/XRSurfaceData.c +index 5de53ca..b598a22 100644 +--- openjdk/jdk/src/solaris/native/sun/java2d/x11/XRSurfaceData.c ++++ openjdk/jdk/src/solaris/native/sun/java2d/x11/XRSurfaceData.c +@@ -29,7 +29,7 @@ + #include "X11SurfaceData.h" + + /*#include */ +-#include ++#include + + #ifndef RepeatNone /* added in 0.10 */ + #define RepeatNone 0 +diff --git openjdk/jdk/src/solaris/native/sun/awt/awt_Robot.c openjdk/jdk/src/solaris/native/sun/awt/awt_Robot.c +index c3384b2..867e40f 100644 +--- openjdk/jdk/src/solaris/native/sun/awt/awt_Robot.c ++++ openjdk/jdk/src/solaris/native/sun/awt/awt_Robot.c +@@ -35,10 +35,6 @@ + #include + #include + #include +-#include +-#include +-#include +-#include + #include + #include "robot_common.h" + #include "canvas.h" +@@ -55,37 +51,7 @@ static jint * masks; + static jint num_buttons; + + static int32_t isXTestAvailable() { +- int32_t major_opcode, first_event, first_error; +- int32_t event_basep, error_basep, majorp, minorp; +- int32_t isXTestAvailable; +- +- /* check if XTest is available */ +- isXTestAvailable = XQueryExtension(awt_display, XTestExtensionName, &major_opcode, &first_event, &first_error); +- DTRACE_PRINTLN3("RobotPeer: XQueryExtension(XTEST) returns major_opcode = %d, first_event = %d, first_error = %d", +- major_opcode, first_event, first_error); +- if (isXTestAvailable) { +- /* check if XTest version is OK */ +- XTestQueryExtension(awt_display, &event_basep, &error_basep, &majorp, &minorp); +- DTRACE_PRINTLN4("RobotPeer: XTestQueryExtension returns event_basep = %d, error_basep = %d, majorp = %d, minorp = %d", +- event_basep, error_basep, majorp, minorp); +- if (majorp < 2 || (majorp == 2 && minorp < 2)) { +- /* bad version*/ +- DTRACE_PRINTLN2("XRobotPeer: XTEST version is %d.%d \n", majorp, minorp); +- if (majorp == 2 && minorp == 1) { +- DTRACE_PRINTLN("XRobotPeer: XTEST is 2.1 - no grab is available\n"); +- } else { +- isXTestAvailable = False; +- } +- } else { +- /* allow XTest calls even if someone else has the grab; e.g. during +- * a window resize operation. Works only with XTEST2.2*/ +- XTestGrabControl(awt_display, True); +- } +- } else { +- DTRACE_PRINTLN("RobotPeer: XTEST extension is unavailable"); +- } +- +- return isXTestAvailable; ++ return False; + } + + +@@ -265,37 +231,12 @@ Java_sun_awt_X11_XRobotPeer_keyPressImpl (JNIEnv *env, + jclass cls, + jint keycode) { + +- AWT_LOCK(); +- +- DTRACE_PRINTLN1("RobotPeer: keyPressImpl(%i)", keycode); +- +- XTestFakeKeyEvent(awt_display, +- XKeysymToKeycode(awt_display, awt_getX11KeySym(keycode)), +- True, +- CurrentTime); +- +- XSync(awt_display, False); +- +- AWT_UNLOCK(); +- + } + + JNIEXPORT void JNICALL + Java_sun_awt_X11_XRobotPeer_keyReleaseImpl (JNIEnv *env, + jclass cls, + jint keycode) { +- AWT_LOCK(); +- +- DTRACE_PRINTLN1("RobotPeer: keyReleaseImpl(%i)", keycode); +- +- XTestFakeKeyEvent(awt_display, +- XKeysymToKeycode(awt_display, awt_getX11KeySym(keycode)), +- False, +- CurrentTime); +- +- XSync(awt_display, False); +- +- AWT_UNLOCK(); + } + + JNIEXPORT void JNICALL +@@ -328,43 +269,6 @@ void mouseAction(JNIEnv *env, + jint buttonMask, + Bool isMousePress) + { +- AWT_LOCK(); +- +- DTRACE_PRINTLN1("RobotPeer: mouseAction(%i)", buttonMask); +- DTRACE_PRINTLN1("RobotPeer: mouseAction, press = %d", isMousePress); +- +- if (buttonMask & java_awt_event_InputEvent_BUTTON1_MASK || +- buttonMask & java_awt_event_InputEvent_BUTTON1_DOWN_MASK ) +- { +- XTestFakeButtonEvent(awt_display, 1, isMousePress, CurrentTime); +- } +- if ((buttonMask & java_awt_event_InputEvent_BUTTON2_MASK || +- buttonMask & java_awt_event_InputEvent_BUTTON2_DOWN_MASK) && +- (num_buttons >= 2)) { +- XTestFakeButtonEvent(awt_display, 2, isMousePress, CurrentTime); +- } +- if ((buttonMask & java_awt_event_InputEvent_BUTTON3_MASK || +- buttonMask & java_awt_event_InputEvent_BUTTON3_DOWN_MASK) && +- (num_buttons >= 3)) { +- XTestFakeButtonEvent(awt_display, 3, isMousePress, CurrentTime); +- } +- +- if (num_buttons > 3){ +- int32_t i; +- int32_t button = 0; +- for (i = 3; i +1 +- // users wants to affect 4 or 5 button but they are assigned +- // to the wheel so => we have to shift it to the right by 2. +- button = i + 3; +- XTestFakeButtonEvent(awt_display, button, isMousePress, CurrentTime); +- } +- } +- } +- +- XSync(awt_display, False); +- AWT_UNLOCK(); + } + + JNIEXPORT void JNICALL +@@ -389,22 +293,4 @@ Java_sun_awt_X11_XRobotPeer_mouseWheelImpl (JNIEnv *env, + /* probably could have been hacked into robot_mouseButtonEvent, but it's */ + /* cleaner to give it its own command type, in case the implementation */ + /* needs to be changed later. -bchristi, 6/20/01 */ +- +- int32_t repeat = abs(wheelAmt); +- int32_t button = wheelAmt < 0 ? 4 : 5; /* wheel up: button 4 */ +- /* wheel down: button 5 */ +- int32_t loopIdx; +- +- AWT_LOCK(); +- +- DTRACE_PRINTLN1("RobotPeer: mouseWheelImpl(%i)", wheelAmt); +- +- for (loopIdx = 0; loopIdx < repeat; loopIdx++) { /* do nothing for */ +- /* wheelAmt == 0 */ +- XTestFakeButtonEvent(awt_display, button, True, CurrentTime); +- XTestFakeButtonEvent(awt_display, button, False, CurrentTime); +- } +- XSync(awt_display, False); +- +- AWT_UNLOCK(); + } +diff --git openjdk/jdk/src/solaris/native/sun/xawt/XToolkit.c openjdk/jdk/src/solaris/native/sun/xawt/XToolkit.c +index 0e6d021..7dc1c5d 100644 +--- openjdk/jdk/src/solaris/native/sun/xawt/XToolkit.c ++++ openjdk/jdk/src/solaris/native/sun/xawt/XToolkit.c +@@ -45,7 +45,6 @@ + #include "sun_awt_X11_XToolkit.h" + #include "java_awt_SystemColor.h" + #include "java_awt_TrayIcon.h" +-#include + + #include + +@@ -1028,66 +1027,7 @@ JNIEXPORT jint JNICALL Java_sun_awt_X11_XToolkit_getNumberOfButtonsImpl + } + + int32_t getNumButtons() { +- int32_t major_opcode, first_event, first_error; +- int32_t xinputAvailable; +- int32_t numDevices, devIdx, clsIdx; +- XDeviceInfo* devices; +- XDeviceInfo* aDevice; +- XButtonInfo* bInfo; +- int32_t local_num_buttons = 0; +- +- /* 4700242: +- * If XTest is asked to press a non-existant mouse button +- * (i.e. press Button3 on a system configured with a 2-button mouse), +- * then a crash may happen. To avoid this, we use the XInput +- * extension to query for the number of buttons on the XPointer, and check +- * before calling XTestFakeButtonEvent(). +- */ +- xinputAvailable = XQueryExtension(awt_display, INAME, &major_opcode, &first_event, &first_error); +- DTRACE_PRINTLN3("RobotPeer: XQueryExtension(XINPUT) returns major_opcode = %d, first_event = %d, first_error = %d", +- major_opcode, first_event, first_error); +- if (xinputAvailable) { +- devices = XListInputDevices(awt_display, &numDevices); +- for (devIdx = 0; devIdx < numDevices; devIdx++) { +- aDevice = &(devices[devIdx]); +-#ifdef IsXExtensionPointer +- if (aDevice->use == IsXExtensionPointer) { +- for (clsIdx = 0; clsIdx < aDevice->num_classes; clsIdx++) { +- if (aDevice->inputclassinfo[clsIdx].class == ButtonClass) { +- bInfo = (XButtonInfo*)(&(aDevice->inputclassinfo[clsIdx])); +- local_num_buttons = bInfo->num_buttons; +- DTRACE_PRINTLN1("RobotPeer: XPointer has %d buttons", num_buttons); +- break; +- } +- } +- break; +- } +-#endif +- if (local_num_buttons <= 0 ) { +- if (aDevice->use == IsXPointer) { +- for (clsIdx = 0; clsIdx < aDevice->num_classes; clsIdx++) { +- if (aDevice->inputclassinfo[clsIdx].class == ButtonClass) { +- bInfo = (XButtonInfo*)(&(aDevice->inputclassinfo[clsIdx])); +- local_num_buttons = bInfo->num_buttons; +- DTRACE_PRINTLN1("RobotPeer: XPointer has %d buttons", num_buttons); +- break; +- } +- } +- break; +- } +- } +- } +- +- XFreeDeviceList(devices); +- } +- else { +- DTRACE_PRINTLN1("RobotPeer: XINPUT extension is unavailable, assuming %d mouse buttons", num_buttons); +- } +- if (local_num_buttons == 0 ) { +- local_num_buttons = 3; +- } +- +- return local_num_buttons; ++ return 3; + } + + /* diff --git a/recipes-core/icedtea/openjdk-7-03b147/icedtea-flags.patch b/recipes-core/icedtea/openjdk-7-03b147/icedtea-flags.patch new file mode 100644 index 0000000..bc6ee5d --- /dev/null +++ b/recipes-core/icedtea/openjdk-7-03b147/icedtea-flags.patch @@ -0,0 +1,153 @@ +diff --git openjdk/hotspot/agent/src/os/linux/Makefile openjdk/hotspot/agent/src/os/linux/Makefile +index 25d43ae..ac3de8b 100644 +--- openjdk/hotspot/agent/src/os/linux/Makefile ++++ openjdk/hotspot/agent/src/os/linux/Makefile +@@ -45,7 +45,7 @@ OBJS = $(SOURCES:.c=.o) + + LIBS = -lthread_db + +-CFLAGS = -c -fPIC -g -D_GNU_SOURCE -D_$(ARCH)_ $(if $(filter $(ARCH),alpha),,-D$(ARCH)) $(INCLUDES) ++CFLAGS = -c -fPIC -g -D_GNU_SOURCE -D_$(ARCH)_ $(if $(filter $(ARCH),alpha),,-D$(ARCH)) $(INCLUDES) $(OE_CFLAGS) + + LIBSA = $(ARCH)/libsaproc.so + +@@ -65,13 +65,7 @@ ifndef LDNOMAP + LFLAGS_LIBSA = -Xlinker --version-script=mapfile + endif + +-# If this is a --hash-style=gnu system, use --hash-style=both +-# The gnu .hash section won't work on some Linux systems like SuSE 10. +-_HAS_HASH_STYLE_GNU:=$(shell $(CC) -dumpspecs | grep -- '--hash-style=gnu') +-ifneq ($(_HAS_HASH_STYLE_GNU),) +- LDFLAGS_HASH_STYLE = -Wl,--hash-style=both +-endif +-LFLAGS_LIBSA += $(LDFLAGS_HASH_STYLE) ++LFLAGS_LIBSA += $(OE_LDFLAGS) + + $(LIBSA): $(OBJS) mapfile + if [ ! -d $(ARCH) ] ; then mkdir $(ARCH) ; fi +diff --git openjdk/hotspot/make/linux/makefiles/vm.make openjdk/hotspot/make/linux/makefiles/vm.make +index 8220d5f..3c96818 100644 +--- openjdk/hotspot/make/linux/makefiles/vm.make ++++ openjdk/hotspot/make/linux/makefiles/vm.make +@@ -116,6 +116,10 @@ CFLAGS += $(CFLAGS/NOEX) + CFLAGS += $(EXTRA_CFLAGS) + LFLAGS += $(EXTRA_CFLAGS) + ++# oe flags ++CFLAGS += $(OE_CFLAGS) ++LFLAGS += $(OE_LDFLAGS) ++ + # Don't set excutable bit on stack segment + # the same could be done by separate execstack command + LFLAGS += -Xlinker -z -Xlinker noexecstack +diff --git openjdk/hotspot/make/linux/makefiles/gcc.make openjdk/hotspot/make/linux/makefiles/gcc.make +index 1979420..c34e40f 100644 +--- openjdk/hotspot/make/linux/makefiles/gcc.make ++++ openjdk/hotspot/make/linux/makefiles/gcc.make +@@ -160,7 +160,7 @@ CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ACCEPTABLE_WARNINGS) + CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@)) + + # The flags to use for an Optimized g++ build +-OPT_CFLAGS += -O3 ++OPT_CFLAGS += $(OE_CFLAGS) + + # Hotspot uses very unstrict aliasing turn this optimization off + OPT_CFLAGS += -fno-strict-aliasing +@@ -204,15 +204,7 @@ LFLAGS += -Wl,-relax + endif + + # Enable linker optimization +-LFLAGS += -Xlinker -O1 +- +-# If this is a --hash-style=gnu system, use --hash-style=both +-# The gnu .hash section won't work on some Linux systems like SuSE 10. +-_HAS_HASH_STYLE_GNU:=$(shell $(CC) -dumpspecs | grep -- '--hash-style=gnu') +-ifneq ($(_HAS_HASH_STYLE_GNU),) +- LDFLAGS_HASH_STYLE = -Wl,--hash-style=both +-endif +-LFLAGS += $(LDFLAGS_HASH_STYLE) ++LFLAGS += $(OE_LDFLAGS) + + # Use $(MAPFLAG:FILENAME=real_file_name) to specify a map file. + MAPFLAG = -Xlinker --version-script=FILENAME +diff --git openjdk/jdk/make/common/Defs-linux.gmk openjdk/jdk/make/common/Defs-linux.gmk +index 4e9c696..d8d7431 100644 +--- openjdk/jdk/make/common/Defs-linux.gmk ++++ openjdk/jdk/make/common/Defs-linux.gmk +@@ -125,35 +125,13 @@ else + endif + endif + +-# +-# Default optimization +-# +- +-ifndef OPTIMIZATION_LEVEL +- ifeq ($(PRODUCT), java) +- OPTIMIZATION_LEVEL = HIGHER +- else +- OPTIMIZATION_LEVEL = LOWER +- endif +-endif +-ifndef FASTDEBUG_OPTIMIZATION_LEVEL +- FASTDEBUG_OPTIMIZATION_LEVEL = LOWER +-endif +- +-CC_OPT/NONE = +-CC_OPT/LOWER = -O2 +-CC_OPT/HIGHER = -O3 +-CC_OPT/HIGHEST = -O3 +- +-CC_OPT = $(CC_OPT/$(OPTIMIZATION_LEVEL)) +- + # For all platforms, do not omit the frame pointer register usage. + # We need this frame pointer to make it easy to walk the stacks. + # This should be the default on X86, but ia64 and amd64 may not have this + # as the default. + CFLAGS_REQUIRED_alpha += -mieee -D_LITTLE_ENDIAN + CFLAGS_REQUIRED_amd64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN +-CFLAGS_REQUIRED_arm += -D_LITTLE_ENDIAN ++CFLAGS_REQUIRED_arm += -fno-omit-frame-pointer -D_LITTLE_ENDIAN + CFLAGS_REQUIRED_hppa += + CFLAGS_REQUIRED_i586 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN + CFLAGS_REQUIRED_ia64 += -fno-omit-frame-pointer -D_LITTLE_ENDIAN +@@ -182,14 +160,6 @@ else + LDFLAGS_COMMON += $(LDFLAGS_COMMON_$(ARCH)) + endif + +-# If this is a --hash-style=gnu system, use --hash-style=both +-# The gnu .hash section won't work on some Linux systems like SuSE 10. +-_HAS_HASH_STYLE_GNU:=$(shell $(CC) -dumpspecs | $(GREP) -- '--hash-style=gnu') +-ifneq ($(_HAS_HASH_STYLE_GNU),) +- LDFLAGS_HASH_STYLE = -Wl,--hash-style=both +-endif +-LDFLAGS_COMMON += $(LDFLAGS_HASH_STYLE) +- + # + # Selection of warning messages + # +@@ -232,12 +202,12 @@ ifeq ($(DEBUG_BINARIES), true) + CFLAGS_REQUIRED += $(DEBUG_FLAG) + endif + +-CFLAGS_OPT = $(CC_OPT) ++CFLAGS_OPT = $(OE_CFLAGS) + CFLAGS_DBG = $(DEBUG_FLAG) + CFLAGS_COMMON += $(CFLAGS_REQUIRED) + + CXXFLAGS_COMMON = $(GLOBAL_KPIC) -DCC_NOEX $(GCC_WARNINGS) +-CXXFLAGS_OPT = $(CC_OPT) ++CXXFLAGS_OPT = $(OE_CXXFLAGS) + CXXFLAGS_DBG = $(DEBUG_FLAG) + CXXFLAGS_COMMON += $(CFLAGS_REQUIRED) + +@@ -308,7 +278,7 @@ LDFLAGS_COMMON += $(LDFLAGS_DEFS_OPTION) + # + # -L paths for finding and -ljava + # +-LDFLAGS_OPT = -Xlinker -O1 ++LDFLAGS_OPT = $(OE_LDFLAGS) + LDFLAGS_COMMON += -L$(LIBDIR)/$(LIBARCH) + LDFLAGS_COMMON += -Wl,-soname=$(LIB_PREFIX)$(LIBRARY).$(LIBRARY_SUFFIX) + diff --git a/recipes-core/icedtea/openjdk-7-03b147/icedtea-hotspot-make-arch-sane-for-x86.patch b/recipes-core/icedtea/openjdk-7-03b147/icedtea-hotspot-make-arch-sane-for-x86.patch new file mode 100644 index 0000000..be4a7d0 --- /dev/null +++ b/recipes-core/icedtea/openjdk-7-03b147/icedtea-hotspot-make-arch-sane-for-x86.patch @@ -0,0 +1,622 @@ +From bd7c262396b7e21311c0ef983743672eb245fed7 Mon Sep 17 00:00:00 2001 +From: Henning Heinold +Date: Wed, 14 Mar 2012 22:15:47 +0100 +Subject: [PATCH] foo + +--- + hotspot/agent/make/saenv.sh | 4 +- + hotspot/make/defs.make | 4 +- + hotspot/make/jprt.properties | 98 +++--- + hotspot/make/linux/build.sh | 2 +- + hotspot/make/linux/makefiles/buildtree.make | 4 +- + hotspot/make/linux/makefiles/defs.make | 24 +- + hotspot/make/linux/makefiles/gcc.make | 2 +- + hotspot/make/linux/makefiles/i486.make | 34 -- + hotspot/make/linux/makefiles/sparcWorks.make | 2 +- + hotspot/make/linux/makefiles/x86.make | 34 ++ + hotspot/make/linux/platform_i486 | 15 - + hotspot/make/linux/platform_x86 | 15 + + hotspot/src/os/linux/vm/os_linux.cpp | 6 +- + hotspot/src/os/posix/launcher/java_md.c | 26 +- + hotspot/src/share/tools/hsdis/Makefile | 4 +- + hotspot/src/share/tools/hsdis/hsdis.c | 500 ++++++++++++++++++++++++++ + 16 files changed, 637 insertions(+), 137 deletions(-) + delete mode 100644 hotspot/make/linux/makefiles/i486.make + create mode 100644 hotspot/make/linux/makefiles/x86.make + delete mode 100644 hotspot/make/linux/platform_i486 + create mode 100644 hotspot/make/linux/platform_x86 + +diff --git openjdk/hotspot/agent/make/saenv.sh openjdk/hotspot/agent/make/saenv.sh +index 81c2d15..4cc3a28 100644 +--- openjdk/hotspot/agent/make/saenv.sh ++++ openjdk/hotspot/agent/make/saenv.sh +@@ -43,9 +43,9 @@ if [ "$OS" = "Linux" ]; then + OPTIONS="-Dsa.library.path=$SA_LIBPATH" + CPU=amd64 + else +- SA_LIBPATH=$STARTDIR/../src/os/linux/i386:$STARTDIR/linux/i386 ++ SA_LIBPATH=$STARTDIR/../src/os/linux/x86:$STARTDIR/linux/x86 + OPTIONS="-Dsa.library.path=$SA_LIBPATH" +- CPU=i386 ++ CPU=x86 + fi + else + # configure audit helper library if SA_ALTROOT is set +diff --git openjdk/hotspot/make/defs.make openjdk/hotspot/make/defs.make +index fe6c4a2..7ae5b1e 100644 +--- openjdk/hotspot/make/defs.make ++++ openjdk/hotspot/make/defs.make +@@ -216,7 +216,7 @@ ifneq ($(OSNAME),windows) + ifdef LP64 + BUILDARCH = amd64 + else +- BUILDARCH = i486 ++ BUILDARCH = x86 + endif + endif + ifeq ($(BUILDARCH), sparc) +@@ -227,7 +227,7 @@ ifneq ($(OSNAME),windows) + + # LIBARCH is 1:1 mapping from BUILDARCH + LIBARCH = $(LIBARCH/$(BUILDARCH)) +- LIBARCH/i486 = i386 ++ LIBARCH/x86 = x86 + LIBARCH/amd64 = amd64 + LIBARCH/sparc = sparc + LIBARCH/sparcv9 = sparcv9 +diff --git openjdk/hotspot/make/jprt.properties openjdk/hotspot/make/jprt.properties +index 4c88ed0..e35cb84 100644 +--- openjdk/hotspot/make/jprt.properties ++++ openjdk/hotspot/make/jprt.properties +@@ -106,19 +106,19 @@ jprt.my.solaris.x64.ejdk7=${jprt.my.solaris.x64.jdk7} + jprt.my.solaris.x64.ejdk6=${jprt.my.solaris.x64.jdk6} + jprt.my.solaris.x64=${jprt.my.solaris.x64.${jprt.tools.default.release}} + +-jprt.my.linux.i586.jdk8=linux_i586_2.6 +-jprt.my.linux.i586.jdk7=linux_i586_2.6 +-jprt.my.linux.i586.jdk7b107=linux_i586_2.6 +-jprt.my.linux.i586.jdk7temp=linux_i586_2.6 +-jprt.my.linux.i586.jdk6=linux_i586_2.4 +-jprt.my.linux.i586.jdk6perf=linux_i586_2.4 +-jprt.my.linux.i586.jdk6u10=linux_i586_2.4 +-jprt.my.linux.i586.jdk6u14=linux_i586_2.4 +-jprt.my.linux.i586.jdk6u18=linux_i586_2.4 +-jprt.my.linux.i586.jdk6u20=linux_i586_2.4 +-jprt.my.linux.i586.ejdk7=linux_i586_2.6 +-jprt.my.linux.i586.ejdk6=linux_i586_2.6 +-jprt.my.linux.i586=${jprt.my.linux.i586.${jprt.tools.default.release}} ++jprt.my.linux.x86.jdk8=linux_x86_2.6 ++jprt.my.linux.x86.jdk7=linux_x86_2.6 ++jprt.my.linux.x86.jdk7b107=linux_x86_2.6 ++jprt.my.linux.x86.jdk7temp=linux_x86_2.6 ++jprt.my.linux.x86.jdk6=linux_x86_2.4 ++jprt.my.linux.x86.jdk6perf=linux_x86_2.4 ++jprt.my.linux.x86.jdk6u10=linux_x86_2.4 ++jprt.my.linux.x86.jdk6u14=linux_x86_2.4 ++jprt.my.linux.x86.jdk6u18=linux_x86_2.4 ++jprt.my.linux.x86.jdk6u20=linux_x86_2.4 ++jprt.my.linux.x86.ejdk7=linux_x86_2.6 ++jprt.my.linux.x86.ejdk6=linux_x86_2.6 ++jprt.my.linux.x86=${jprt.my.linux.x86.${jprt.tools.default.release}} + + jprt.my.linux.x64.jdk8=linux_x64_2.6 + jprt.my.linux.x64.jdk7=linux_x64_2.6 +@@ -209,7 +209,7 @@ jprt.build.targets.standard= \ + ${jprt.my.solaris.sparcv9}-{product|fastdebug|debug}, \ + ${jprt.my.solaris.i586}-{product|fastdebug|debug}, \ + ${jprt.my.solaris.x64}-{product|fastdebug|debug}, \ +- ${jprt.my.linux.i586}-{product|fastdebug|debug}, \ ++ ${jprt.my.linux.x86}-{product|fastdebug|debug}, \ + ${jprt.my.linux.x64}-{product|fastdebug}, \ + ${jprt.my.windows.i586}-{product|fastdebug|debug}, \ + ${jprt.my.windows.x64}-{product|fastdebug|debug} +@@ -220,7 +220,7 @@ jprt.build.targets.open= \ + ${jprt.my.linux.x64}-{productOpen} + + jprt.build.targets.embedded= \ +- ${jprt.my.linux.i586}-{productEmb|fastdebugEmb|debugEmb}, \ ++ ${jprt.my.linux.x86}-{productEmb|fastdebugEmb|debugEmb}, \ + ${jprt.my.linux.ppc}-{productEmb|fastdebugEmb}, \ + ${jprt.my.linux.ppcv2}-{productEmb|fastdebugEmb}, \ + ${jprt.my.linux.ppcsflt}-{productEmb|fastdebugEmb}, \ +@@ -364,33 +364,33 @@ jprt.my.solaris.i586.test.targets= \ + ${jprt.my.solaris.i586}-fastdebug-c2-jbb_G1, \ + ${jprt.my.solaris.i586}-fastdebug-c2-jbb_ParOldGC + +-jprt.my.linux.i586.test.targets = \ +- ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-jvm98, \ +- ${jprt.my.linux.i586}-{product|fastdebug}-c2-jvm98_tiered, \ +- ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-scimark, \ +- ${jprt.my.linux.i586}-product-c1-runThese_Xcomp, \ +- ${jprt.my.linux.i586}-fastdebug-c1-runThese_Xshare, \ +- ${jprt.my.linux.i586}-fastdebug-c2-runThese_Xcomp, \ +- ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_default, \ +- ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_SerialGC, \ +- ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_ParallelGC, \ +- ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_ParNewGC, \ +- ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_CMS, \ +- ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_G1, \ +- ${jprt.my.linux.i586}-{product|fastdebug}-{c1|c2}-GCBasher_ParOldGC, \ +- ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_default, \ +- ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_SerialGC, \ +- ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_ParallelGC, \ +- ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_ParNewGC, \ +- ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_CMS, \ +- ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_G1, \ +- ${jprt.my.linux.i586}-product-{c1|c2}-GCOld_ParOldGC, \ +- ${jprt.my.linux.i586}-{product|fastdebug}-c1-jbb_default, \ +- ${jprt.my.linux.i586}-{product|fastdebug}-c2-jbb_default_tiered, \ +- ${jprt.my.linux.i586}-{product|fastdebug}-c1-jbb_ParallelGC, \ +- ${jprt.my.linux.i586}-{product|fastdebug}-c1-jbb_CMS, \ +- ${jprt.my.linux.i586}-{product|fastdebug}-c1-jbb_G1, \ +- ${jprt.my.linux.i586}-{product|fastdebug}-c1-jbb_ParOldGC ++jprt.my.linux.x86.test.targets = \ ++ ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-jvm98, \ ++ ${jprt.my.linux.x86}-{product|fastdebug}-c2-jvm98_tiered, \ ++ ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-scimark, \ ++ ${jprt.my.linux.x86}-product-c1-runThese_Xcomp, \ ++ ${jprt.my.linux.x86}-fastdebug-c1-runThese_Xshare, \ ++ ${jprt.my.linux.x86}-fastdebug-c2-runThese_Xcomp, \ ++ ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-GCBasher_default, \ ++ ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-GCBasher_SerialGC, \ ++ ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-GCBasher_ParallelGC, \ ++ ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-GCBasher_ParNewGC, \ ++ ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-GCBasher_CMS, \ ++ ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-GCBasher_G1, \ ++ ${jprt.my.linux.x86}-{product|fastdebug}-{c1|c2}-GCBasher_ParOldGC, \ ++ ${jprt.my.linux.x86}-product-{c1|c2}-GCOld_default, \ ++ ${jprt.my.linux.x86}-product-{c1|c2}-GCOld_SerialGC, \ ++ ${jprt.my.linux.x86}-product-{c1|c2}-GCOld_ParallelGC, \ ++ ${jprt.my.linux.x86}-product-{c1|c2}-GCOld_ParNewGC, \ ++ ${jprt.my.linux.x86}-product-{c1|c2}-GCOld_CMS, \ ++ ${jprt.my.linux.x86}-product-{c1|c2}-GCOld_G1, \ ++ ${jprt.my.linux.x86}-product-{c1|c2}-GCOld_ParOldGC, \ ++ ${jprt.my.linux.x86}-{product|fastdebug}-c1-jbb_default, \ ++ ${jprt.my.linux.x86}-{product|fastdebug}-c2-jbb_default_tiered, \ ++ ${jprt.my.linux.x86}-{product|fastdebug}-c1-jbb_ParallelGC, \ ++ ${jprt.my.linux.x86}-{product|fastdebug}-c1-jbb_CMS, \ ++ ${jprt.my.linux.x86}-{product|fastdebug}-c1-jbb_G1, \ ++ ${jprt.my.linux.x86}-{product|fastdebug}-c1-jbb_ParOldGC + + jprt.my.linux.x64.test.targets = \ + ${jprt.my.linux.x64}-{product|fastdebug}-c2-jvm98, \ +@@ -478,26 +478,26 @@ jprt.test.targets.open = \ + ${jprt.my.linux.x64}-{productOpen|fastdebugOpen}-c2-jvm98_tiered + + # Testing for actual embedded builds is different to standard +-jprt.my.linux.i586.test.targets.embedded = \ +- linux_i586_2.6-product-c1-scimark ++jprt.my.linux.x86.test.targets.embedded = \ ++ linux_x86_2.6-product-c1-scimark + + # The complete list of test targets for jprt + # Note: no PPC or ARM tests at this stage + + jprt.test.targets.standard = \ +- ${jprt.my.linux.i586.test.targets.embedded}, \ ++ ${jprt.my.linux.x86.test.targets.embedded}, \ + ${jprt.my.solaris.sparc.test.targets}, \ + ${jprt.my.solaris.sparcv9.test.targets}, \ + ${jprt.my.solaris.i586.test.targets}, \ + ${jprt.my.solaris.x64.test.targets}, \ +- ${jprt.my.linux.i586.test.targets}, \ ++ ${jprt.my.linux.x86.test.targets}, \ + ${jprt.my.linux.x64.test.targets}, \ + ${jprt.my.windows.i586.test.targets}, \ + ${jprt.my.windows.x64.test.targets}, \ + ${jprt.test.targets.open} + + jprt.test.targets.embedded= \ +- ${jprt.my.linux.i586.test.targets.embedded}, \ ++ ${jprt.my.linux.x86.test.targets.embedded}, \ + ${jprt.my.solaris.sparc.test.targets}, \ + ${jprt.my.solaris.sparcv9.test.targets}, \ + ${jprt.my.solaris.i586.test.targets}, \ +@@ -528,7 +528,7 @@ jprt.test.targets=${jprt.test.targets.${jprt.tools.default.release}} + jprt.make.rule.test.targets.standard.client = \ + ${jprt.my.solaris.sparc}-*-c1-clienttest, \ + ${jprt.my.solaris.i586}-*-c1-clienttest, \ +- ${jprt.my.linux.i586}-*-c1-clienttest, \ ++ ${jprt.my.linux.x86}-*-c1-clienttest, \ + ${jprt.my.windows.i586}-*-c1-clienttest + + jprt.make.rule.test.targets.standard.server = \ +@@ -536,7 +536,7 @@ jprt.make.rule.test.targets.standard.server = \ + ${jprt.my.solaris.sparcv9}-*-c2-servertest, \ + ${jprt.my.solaris.i586}-*-c2-servertest, \ + ${jprt.my.solaris.x64}-*-c2-servertest, \ +- ${jprt.my.linux.i586}-*-c2-servertest, \ ++ ${jprt.my.linux.x86}-*-c2-servertest, \ + ${jprt.my.linux.x64}-*-c2-servertest, \ + ${jprt.my.windows.i586}-*-c2-servertest, \ + ${jprt.my.windows.x64}-*-c2-servertest +diff --git openjdk/hotspot/make/linux/build.sh openjdk/hotspot/make/linux/build.sh +index f46b8df..b06853f 100644 +--- openjdk/hotspot/make/linux/build.sh ++++ openjdk/hotspot/make/linux/build.sh +@@ -43,7 +43,7 @@ esac + + case `uname -m` in + i386|i486|i586|i686) +- mach=i386 ++ mach=x86 + ;; + *) + echo "Unsupported machine: " `uname -m` +diff --git openjdk/hotspot/make/linux/makefiles/buildtree.make openjdk/hotspot/make/linux/makefiles/buildtree.make +index f8a1e88..ce7b575 100644 +--- openjdk/hotspot/make/linux/makefiles/buildtree.make ++++ openjdk/hotspot/make/linux/makefiles/buildtree.make +@@ -30,7 +30,7 @@ + # The macros ARCH, GAMMADIR, OS_FAMILY and VARIANT must be defined in the + # environment or on the command-line: + # +-# ARCH - sparc, i486, ... HotSpot cpu and os_cpu source directory ++# ARCH - sparc, x86, ... HotSpot cpu and os_cpu source directory + # BUILDARCH - build directory + # LIBARCH - the corresponding directory in JDK/JRE + # GAMMADIR - top of workspace +@@ -371,7 +371,7 @@ NO_JAVA_HOME_MSG = \ + DATA_MODE = $(DATA_MODE/$(BUILDARCH)) + JAVA_FLAG = $(JAVA_FLAG/$(DATA_MODE)) + +-DATA_MODE/i486 = 32 ++DATA_MODE/x86 = 32 + DATA_MODE/sparc = 32 + DATA_MODE/sparcv9 = 64 + DATA_MODE/amd64 = 64 +diff --git openjdk/hotspot/make/linux/makefiles/defs.make openjdk/hotspot/make/linux/makefiles/defs.make +index c327974..757b333 100644 +--- openjdk/hotspot/make/linux/makefiles/defs.make ++++ openjdk/hotspot/make/linux/makefiles/defs.make +@@ -72,6 +72,16 @@ ifeq ($(ARCH), sparc64) + HS_ARCH = sparc + endif + ++# x86 ++ifeq ($(findstring 86,$(ARCH)), 86) ++ ifneq ($(ARCH), x86_64) ++ ARCH_DATA_MODEL = 32 ++ PLATFORM = linux-x86 ++ VM_PLATFORM = linux_x86 ++ HS_ARCH = x86 ++ endif ++endif ++ + # x86_64 + ifeq ($(ARCH), x86_64) + ifeq ($(ARCH_DATA_MODEL), 64) +@@ -82,22 +92,12 @@ ifeq ($(ARCH), x86_64) + HS_ARCH = x86 + else + ARCH_DATA_MODEL = 32 +- PLATFORM = linux-i586 +- VM_PLATFORM = linux_i486 ++ PLATFORM = linux-x86 ++ VM_PLATFORM = linux_x86 + HS_ARCH = x86 +- # We have to reset ARCH to i686 since SRCARCH relies on it +- ARCH = i686 + endif + endif + +-# i686 +-ifeq ($(ARCH), i686) +- ARCH_DATA_MODEL = 32 +- PLATFORM = linux-i586 +- VM_PLATFORM = linux_i486 +- HS_ARCH = x86 +-endif +- + # ARM + ifeq ($(ARCH), arm) + ARCH_DATA_MODEL = 32 +diff --git openjdk/hotspot/make/linux/makefiles/gcc.make openjdk/hotspot/make/linux/makefiles/gcc.make +index 05505d4..1979420 100644 +--- openjdk/hotspot/make/linux/makefiles/gcc.make ++++ openjdk/hotspot/make/linux/makefiles/gcc.make +@@ -105,7 +105,7 @@ CFLAGS += -fvisibility=hidden + endif + + ARCHFLAG = $(ARCHFLAG/$(BUILDARCH)) +-ARCHFLAG/i486 = -m32 -march=i586 ++ARCHFLAG/x86 = -m32 + ARCHFLAG/amd64 = -m64 + ARCHFLAG/ia64 = + ARCHFLAG/sparc = -m32 -mcpu=v9 +diff --git openjdk/hotspot/make/linux/makefiles/i486.make openjdk/hotspot/make/linux/makefiles/i486.make +deleted file mode 100644 +index 86e825d..0000000 +--- openjdk/hotspot/make/linux/makefiles/i486.make ++++ /dev/null +@@ -1,34 +0,0 @@ +-# +-# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. +-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +-# +-# This code is free software; you can redistribute it and/or modify it +-# under the terms of the GNU General Public License version 2 only, as +-# published by the Free Software Foundation. +-# +-# This code is distributed in the hope that it will be useful, but WITHOUT +-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +-# version 2 for more details (a copy is included in the LICENSE file that +-# accompanied this code). +-# +-# You should have received a copy of the GNU General Public License version +-# 2 along with this work; if not, write to the Free Software Foundation, +-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +-# +-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +-# or visit www.oracle.com if you need additional information or have any +-# questions. +-# +-# +- +-# TLS helper, assembled from .s file +- +-# The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized +-OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT) +-# The copied fdlibm routines in sharedRuntimeTrans.o must not be optimized +-OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT) +-# Must also specify if CPU is little endian +-CFLAGS += -DVM_LITTLE_ENDIAN +- +-OPT_CFLAGS/compactingPermGenGen.o = -O1 +diff --git openjdk/hotspot/make/linux/makefiles/sparcWorks.make openjdk/hotspot/make/linux/makefiles/sparcWorks.make +index 6e6c841..78e5041 100644 +--- openjdk/hotspot/make/linux/makefiles/sparcWorks.make ++++ openjdk/hotspot/make/linux/makefiles/sparcWorks.make +@@ -33,7 +33,7 @@ HOSTCPP = $(CPP) + HOSTCC = $(CC) + + ARCHFLAG = $(ARCHFLAG/$(BUILDARCH)) +-ARCHFLAG/i486 = -m32 ++ARCHFLAG/x86 = -m32 + ARCHFLAG/amd64 = -m64 + + CFLAGS += $(ARCHFLAG) +diff --git openjdk/hotspot/make/linux/makefiles/x86.make openjdk/hotspot/make/linux/makefiles/x86.make +new file mode 100644 +index 0000000..86e825d +--- /dev/null ++++ openjdk/hotspot/make/linux/makefiles/x86.make +@@ -0,0 +1,34 @@ ++# ++# Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. ++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ++# ++# This code is free software; you can redistribute it and/or modify it ++# under the terms of the GNU General Public License version 2 only, as ++# published by the Free Software Foundation. ++# ++# This code is distributed in the hope that it will be useful, but WITHOUT ++# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ++# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ++# version 2 for more details (a copy is included in the LICENSE file that ++# accompanied this code). ++# ++# You should have received a copy of the GNU General Public License version ++# 2 along with this work; if not, write to the Free Software Foundation, ++# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. ++# ++# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA ++# or visit www.oracle.com if you need additional information or have any ++# questions. ++# ++# ++ ++# TLS helper, assembled from .s file ++ ++# The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized ++OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT) ++# The copied fdlibm routines in sharedRuntimeTrans.o must not be optimized ++OPT_CFLAGS/sharedRuntimeTrans.o = $(OPT_CFLAGS/NOOPT) ++# Must also specify if CPU is little endian ++CFLAGS += -DVM_LITTLE_ENDIAN ++ ++OPT_CFLAGS/compactingPermGenGen.o = -O1 +diff --git openjdk/hotspot/make/linux/platform_i486 openjdk/hotspot/make/linux/platform_i486 +deleted file mode 100644 +index 610ac91..0000000 +--- openjdk/hotspot/make/linux/platform_i486 ++++ /dev/null +@@ -1,15 +0,0 @@ +-os_family = linux +- +-arch = x86 +- +-arch_model = x86_32 +- +-os_arch = linux_x86 +- +-os_arch_model = linux_x86_32 +- +-lib_arch = i386 +- +-compiler = gcc +- +-sysdefs = -DLINUX -D_GNU_SOURCE -DIA32 +diff --git openjdk/hotspot/make/linux/platform_x86 openjdk/hotspot/make/linux/platform_x86 +new file mode 100644 +index 0000000..5c613fe +--- /dev/null ++++ openjdk/hotspot/make/linux/platform_x86 +@@ -0,0 +1,15 @@ ++os_family = linux ++ ++arch = x86 ++ ++arch_model = x86_32 ++ ++os_arch = linux_x86 ++ ++os_arch_model = linux_x86_32 ++ ++lib_arch = x86 ++ ++compiler = gcc ++ ++sysdefs = -DLINUX -D_GNU_SOURCE -DIA32 +diff --git openjdk/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp +index dd75c42..dd91767 100644 +--- openjdk/hotspot/src/os/linux/vm/os_linux.cpp ++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp +@@ -261,10 +261,10 @@ bool os::have_special_privileges() { + + + #ifndef SYS_gettid +-// i386: 224, ia64: 1105, amd64: 186, sparc 143 ++// x86: 224, ia64: 1105, amd64: 186, sparc 143 + #ifdef __ia64__ + #define SYS_gettid 1105 +-#elif __i386__ ++#elif __x86__ + #define SYS_gettid 224 + #elif __amd64__ + #define SYS_gettid 186 +@@ -281,7 +281,7 @@ static char cpu_arch[] = ZERO_LIBARCH; + #elif defined(IA64) + static char cpu_arch[] = "ia64"; + #elif defined(IA32) +-static char cpu_arch[] = "i386"; ++static char cpu_arch[] = "x86"; + #elif defined(AMD64) + static char cpu_arch[] = "amd64"; + #elif defined(ARM) +diff --git openjdk/hotspot/src/os/posix/launcher/java_md.c openjdk/hotspot/src/os/posix/launcher/java_md.c +index 3ee0f20..29374ea 100644 +--- openjdk/hotspot/src/os/posix/launcher/java_md.c ++++ openjdk/hotspot/src/os/posix/launcher/java_md.c +@@ -57,8 +57,8 @@ + * models is supported, then DUAL_MODE is defined. When DUAL_MODE is + * defined, the architecture names for the narrow and wide version of + * the architecture are defined in LIBARCH64NAME and LIBARCH32NAME. Currently +- * only Solaris on sparc/sparcv9 and i586/amd64 is DUAL_MODE; linux +- * i586/amd64 could be defined as DUAL_MODE but that is not the ++ * only Solaris on sparc/sparcv9 and x86/amd64 is DUAL_MODE; linux ++ * x86/amd64 could be defined as DUAL_MODE but that is not the + * current policy. + */ + +@@ -1175,7 +1175,7 @@ get_cpuid(uint32_t arg, + + #endif /* __sun && i586 */ + +-#if defined(__linux__) && defined(i586) ++#if defined(__linux__) && defined(x86) + + /* + * A utility method for asking the CPU about itself. +@@ -1240,11 +1240,11 @@ get_cpuid(uint32_t arg, + #endif + } + +-#endif /* __linux__ && i586 */ ++#endif /* __linux__ && x86 */ + +-#ifdef i586 ++#if defined(i586) || defined(x86) + /* +- * Routines shared by solaris-i586 and linux-i586. ++ * Routines shared by solaris-i586 and linux-x86. + */ + + enum HyperThreadingSupport_enum { +@@ -1384,7 +1384,7 @@ physical_processors(void) { + return result; + } + +-#endif /* i586 */ ++#endif /* i586 || x86 */ + + #if defined(__sun) && defined(i586) + +@@ -1419,11 +1419,11 @@ solaris_i586_ServerClassMachine(void) { + + #endif /* __sun && i586 */ + +-#if defined(__linux__) && defined(i586) ++#if defined(__linux__) && defined(x86) + +-/* The definition of a server-class machine for linux-i586 */ ++/* The definition of a server-class machine for linux-x86 */ + jboolean +-linux_i586_ServerClassMachine(void) { ++linux_x86_ServerClassMachine(void) { + jboolean result = JNI_FALSE; + /* How big is a server class machine? */ + const unsigned long server_processors = 2UL; +@@ -1450,7 +1450,7 @@ linux_i586_ServerClassMachine(void) { + return result; + } + +-#endif /* __linux__ && i586 */ ++#endif /* __linux__ && x86 */ + + /* Dispatch to the platform-specific definition of "server-class" */ + jboolean +@@ -1464,8 +1464,8 @@ ServerClassMachine(void) { + result = solaris_sparc_ServerClassMachine(); + #elif defined(__sun) && defined(i586) + result = solaris_i586_ServerClassMachine(); +-#elif defined(__linux__) && defined(i586) +- result = linux_i586_ServerClassMachine(); ++#elif defined(__linux__) && defined(x86) ++ result = linux_x86_ServerClassMachine(); + #else + if (_launcher_debug) { + printf("ServerClassMachine: returns default value of %s\n", +diff --git openjdk/hotspot/src/share/tools/hsdis/Makefile openjdk/hotspot/src/share/tools/hsdis/Makefile +index 19f9cdb..b2b9092 100644 +--- openjdk/hotspot/src/share/tools/hsdis/Makefile ++++ openjdk/hotspot/src/share/tools/hsdis/Makefile +@@ -25,7 +25,7 @@ + # Single gnu makefile for solaris, linux and windows (windows requires cygwin and mingw) + + # Default arch; it is changed below as needed. +-ARCH = i386 ++ARCH = x86 + OS = $(shell uname) + + ## OS = SunOS ## +@@ -40,7 +40,7 @@ ifdef LP64 + ifeq ($(ARCH),sparc) + ARCH = sparcv9 + endif +-ifeq ($(ARCH),i386) ++ifeq ($(ARCH),x86) + ARCH = amd64 + endif + endif +diff --git openjdk/hotspot/src/share/tools/hsdis/hsdis.c openjdk/hotspot/src/share/tools/hsdis/hsdis.c +index daea404..2e49766 100644 +--- openjdk/hotspot/src/share/tools/hsdis/hsdis.c ++++ openjdk/hotspot/src/share/tools/hsdis/hsdis.c +@@ -384,8 +384,8 @@ static void print_help(struct hsdis_app_data* app_data, + else + disassembler_usage(stderr); /* better than nothing */ + (*printf_callback)(printf_stream, " mach= select disassembly mode\n"); +-#if defined(LIBARCH_i386) || defined(LIBARCH_amd64) +- (*printf_callback)(printf_stream, " mach=i386 select 32-bit mode\n"); ++#if defined(LIBARCH_x86) || defined(LIBARCH_amd64) ++ (*printf_callback)(printf_stream, " mach=x86 select 32-bit mode\n"); + (*printf_callback)(printf_stream, " mach=x86-64 select 64-bit mode\n"); + (*printf_callback)(printf_stream, " suffix always print instruction suffix\n"); + #endif +@@ -406,11 +406,11 @@ static const bfd_arch_info_type* find_arch_info(const char* arch_name) { + + static const char* native_arch_name() { + const char* res = NULL; +-#ifdef LIBARCH_i386 +- res = "i386"; ++#ifdef LIBARCH_x86 ++ res = "x86"; + #endif + #ifdef LIBARCH_amd64 +- res = "i386:x86-64"; ++ res = "x86-64"; + #endif + #ifdef LIBARCH_sparc + res = "sparc:v8plusb"; diff --git a/recipes-core/icedtea/openjdk-7-03b147/icedtea-jdk-sane-x86-arch.patch b/recipes-core/icedtea/openjdk-7-03b147/icedtea-jdk-sane-x86-arch.patch new file mode 100644 index 0000000..0ff00b7 --- /dev/null +++ b/recipes-core/icedtea/openjdk-7-03b147/icedtea-jdk-sane-x86-arch.patch @@ -0,0 +1,204 @@ +From 634840cbdefe385590ed170f0ed0f48d4b412550 Mon Sep 17 00:00:00 2001 +From: Henning Heinold +Date: Wed, 14 Mar 2012 22:34:51 +0100 +Subject: [PATCH] real patch + +--- + jdk/make/common/shared/Compiler-gcc.gmk | 4 +- + jdk/make/common/shared/Platform.gmk | 18 ++++------ + jdk/make/javax/sound/SoundDefs.gmk | 6 ++-- + .../share/native/com/sun/media/sound/SoundDefs.h | 2 +- + jdk/src/solaris/bin/i586/jvm.cfg | 38 -------------------- + jdk/src/solaris/bin/x86/jvm.cfg | 38 ++++++++++++++++++++ + 6 files changed, 51 insertions(+), 55 deletions(-) + delete mode 100644 jdk/src/solaris/bin/i586/jvm.cfg + create mode 100644 jdk/src/solaris/bin/x86/jvm.cfg + +diff --git openjdk/jdk/make/common/shared/Compiler-gcc.gmk openjdk/jdk/make/common/shared/Compiler-gcc.gmk +index e99068b..a05ca09 100644 +--- openjdk/jdk/make/common/shared/Compiler-gcc.gmk ++++ openjdk/jdk/make/common/shared/Compiler-gcc.gmk +@@ -91,8 +91,8 @@ ifeq ($(PLATFORM), linux) + REQUIRED_CC_VER = 3.2 + REQUIRED_GCC_VER = 3.2.* + endif +- ifeq ($(ARCH), i586) +- # i586 ++ ifeq ($(ARCH), x86) ++ # x86 + REQUIRED_CC_VER = 3.2 + REQUIRED_GCC_VER = 3.2.1* + REQUIRED_GCC_VER_INT = 3.2.1-7a +diff --git openjdk/jdk/make/common/shared/Platform.gmk openjdk/jdk/make/common/shared/Platform.gmk +index 5b21888..e508be0 100644 +--- openjdk/jdk/make/common/shared/Platform.gmk ++++ openjdk/jdk/make/common/shared/Platform.gmk +@@ -53,11 +53,11 @@ PLATFORM_SHARED=done + # VARIANT OPT or DBG, OPT is the default + # TEMP_DISK /tmp or C:/temp + # ARCH_DATA_MODEL 32 or 64 +-# ARCH sparc, sparcv9, i586, amd64, or ia64 +-# ARCH_FAMILY sparc or i586 ++# ARCH sparc, sparcv9, x86, amd64, or ia64 ++# ARCH_FAMILY sparc or x86 + # ARCHPROP sparc or x86 + # ARCH_VM_SUBDIR jre/bin, jre/lib/sparc, etc. +-# LIBARCH sparc, sparcv9, i386, amd64, or ia64 ++# LIBARCH sparc, sparcv9, x86, amd64, or ia64 + # DEV_NULL destination of /dev/null, NUL or /dev/NULL + # CLASSPATH_SEPARATOR separator in classpath, ; or : + # LIB_PREFIX dynamic or static library prefix, lib or empty +@@ -67,7 +67,7 @@ PLATFORM_SHARED=done + # EXE_SUFFIX executable file suffix, .exe or empty + # BUNDLE_FILE_SUFFIX suffix for bundles: .tar or .tar.gz + # ISA_DIR solaris only: /sparcv9 or /amd64 +-# LIBARCH32 solaris only: sparc or i386 ++# LIBARCH32 solaris only: sparc or x86 + # LIBARCH64 solaris only: sparcv9 or amd64 + # USING_CYGWIN windows only: true or false + # ISHIELD_TEMP_MIN windows only: minimum disk space in temp area +@@ -165,7 +165,7 @@ ifeq ($(SYSTEM_UNAME), Linux) + endif + archExpr = case "$(mach)" in \ + i[3-9]86) \ +- echo i586 \ ++ echo x86 \ + ;; \ + ia64) \ + echo ia64 \ +@@ -217,12 +217,8 @@ ifeq ($(SYSTEM_UNAME), Linux) + endif + endif + +- # Need to maintain the jre/lib/i386 location for 32-bit Intel +- ifeq ($(ARCH), i586) +- LIBARCH = i386 +- else +- LIBARCH = $(ARCH) +- endif ++ # Need to maintain the jre/lib/x86 location for 32-bit Intel ++ LIBARCH = $(ARCH) + + # Value of Java os.arch property + ARCHPROP = $(LIBARCH) +diff --git openjdk/jdk/make/javax/sound/SoundDefs.gmk openjdk/jdk/make/javax/sound/SoundDefs.gmk +index 73b6e0d..055c71d 100644 +--- openjdk/jdk/make/javax/sound/SoundDefs.gmk ++++ openjdk/jdk/make/javax/sound/SoundDefs.gmk +@@ -70,9 +70,9 @@ else + CPPFLAGS += -DX_ARCH=X_ARM + endif # ARCH arm + +- ifeq ($(ARCH), i586) +- CPPFLAGS += -DX_ARCH=X_I586 +- endif # ARCH i586 ++ ifeq ($(ARCH), x86) ++ CPPFLAGS += -DX_ARCH=X_X86 ++ endif # ARCH x86 + + ifeq ($(ARCH), ia64) + CPPFLAGS += -DX_ARCH=X_IA64 +diff --git openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h +index 2810548..4d00827 100644 +--- openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h ++++ openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h +@@ -33,7 +33,7 @@ + #define X_LINUX 3 + + // types for X_ARCH +-#define X_I586 1 ++#define X_X86 1 + #define X_SPARC 2 + #define X_SPARCV9 3 + #define X_IA64 4 +diff --git openjdk/jdk/src/solaris/bin/i586/jvm.cfg openjdk/jdk/src/solaris/bin/i586/jvm.cfg +deleted file mode 100644 +index 0f8fe07..0000000 +--- openjdk/jdk/src/solaris/bin/i586/jvm.cfg ++++ /dev/null +@@ -1,38 +0,0 @@ +-# Copyright (c) 2001, 2004, Oracle and/or its affiliates. All rights reserved. +-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +-# +-# This code is free software; you can redistribute it and/or modify it +-# under the terms of the GNU General Public License version 2 only, as +-# published by the Free Software Foundation. Oracle designates this +-# particular file as subject to the "Classpath" exception as provided +-# by Oracle in the LICENSE file that accompanied this code. +-# +-# This code is distributed in the hope that it will be useful, but WITHOUT +-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +-# version 2 for more details (a copy is included in the LICENSE file that +-# accompanied this code). +-# +-# You should have received a copy of the GNU General Public License version +-# 2 along with this work; if not, write to the Free Software Foundation, +-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +-# +-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +-# or visit www.oracle.com if you need additional information or have any +-# questions. +-# +-# List of JVMs that can be used as an option to java, javac, etc. +-# Order is important -- first in this list is the default JVM. +-# NOTE that this both this file and its format are UNSUPPORTED and +-# WILL GO AWAY in a future release. +-# +-# You may also select a JVM in an arbitrary location with the +-# "-XXaltjvm=" option, but that too is unsupported +-# and may not be available in a future release. +-# +--client IF_SERVER_CLASS -server +--server KNOWN +--hotspot ALIASED_TO -client +--classic WARN +--native ERROR +--green ERROR +diff --git openjdk/jdk/src/solaris/bin/x86/jvm.cfg openjdk/jdk/src/solaris/bin/x86/jvm.cfg +new file mode 100644 +index 0000000..0f8fe07 +--- /dev/null ++++ openjdk/jdk/src/solaris/bin/x86/jvm.cfg +@@ -0,0 +1,38 @@ ++# Copyright (c) 2001, 2004, Oracle and/or its affiliates. All rights reserved. ++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ++# ++# This code is free software; you can redistribute it and/or modify it ++# under the terms of the GNU General Public License version 2 only, as ++# published by the Free Software Foundation. Oracle designates this ++# particular file as subject to the "Classpath" exception as provided ++# by Oracle in the LICENSE file that accompanied this code. ++# ++# This code is distributed in the hope that it will be useful, but WITHOUT ++# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ++# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ++# version 2 for more details (a copy is included in the LICENSE file that ++# accompanied this code). ++# ++# You should have received a copy of the GNU General Public License version ++# 2 along with this work; if not, write to the Free Software Foundation, ++# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. ++# ++# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA ++# or visit www.oracle.com if you need additional information or have any ++# questions. ++# ++# List of JVMs that can be used as an option to java, javac, etc. ++# Order is important -- first in this list is the default JVM. ++# NOTE that this both this file and its format are UNSUPPORTED and ++# WILL GO AWAY in a future release. ++# ++# You may also select a JVM in an arbitrary location with the ++# "-XXaltjvm=" option, but that too is unsupported ++# and may not be available in a future release. ++# ++-client IF_SERVER_CLASS -server ++-server KNOWN ++-hotspot ALIASED_TO -client ++-classic WARN ++-native ERROR ++-green ERROR +-- +1.7.7 + diff --git a/recipes-core/icedtea/openjdk-7-03b147/icedtea-sane-x86-arch-name.patch b/recipes-core/icedtea/openjdk-7-03b147/icedtea-sane-x86-arch-name.patch new file mode 100644 index 0000000..cb7eb7f --- /dev/null +++ b/recipes-core/icedtea/openjdk-7-03b147/icedtea-sane-x86-arch-name.patch @@ -0,0 +1,35 @@ +Index: icedtea-2.1/acinclude.m4 +=================================================================== +--- icedtea-2.1.orig/acinclude.m4 ++++ icedtea-2.1/acinclude.m4 +@@ -8,9 +8,9 @@ AC_DEFUN([IT_SET_ARCH_SETTINGS], + ARCHFLAG="-m64" + ;; + i?86) +- BUILD_ARCH_DIR=i586 +- INSTALL_ARCH_DIR=i386 +- JRE_ARCH_DIR=i386 ++ BUILD_ARCH_DIR=x86 ++ INSTALL_ARCH_DIR=x86 ++ JRE_ARCH_DIR=x86 + ARCH_PREFIX=${LINUX32} + ARCHFLAG="-m32" + ;; +@@ -700,7 +700,7 @@ AC_DEFUN([IT_ENABLE_ZERO_BUILD], + ZERO_LIBARCH="${INSTALL_ARCH_DIR}" + dnl can't use AC_CHECK_SIZEOF on multilib + case "${ZERO_LIBARCH}" in +- i386|ppc|s390|sparc) ++ x86|ppc|s390|sparc) + ZERO_BITSPERWORD=32 + ;; + amd64|ppc64|s390x|sparc64) +@@ -712,7 +712,7 @@ AC_DEFUN([IT_ENABLE_ZERO_BUILD], + esac + AC_C_BIGENDIAN([ZERO_ENDIANNESS="big"], [ZERO_ENDIANNESS="little"]) + case "${ZERO_LIBARCH}" in +- i386) ++ x86) + ZERO_ARCHDEF="IA32" + ;; + ppc*) diff --git a/recipes-core/icedtea/openjdk-7-03b147/icedtea-unbreak-float.patch b/recipes-core/icedtea/openjdk-7-03b147/icedtea-unbreak-float.patch new file mode 100644 index 0000000..b5219da --- /dev/null +++ b/recipes-core/icedtea/openjdk-7-03b147/icedtea-unbreak-float.patch @@ -0,0 +1,16 @@ +--- openjdk/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h ++++ openjdk/jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h +@@ -26,13 +26,11 @@ + + #include "jfdlibm.h" + +-#ifdef __NEWVALID /* special setup for Sun test regime */ + #if defined(i386) || defined(i486) || \ + defined(intel) || defined(x86) || defined(arm) || \ + defined(i86pc) || defined(_M_IA64) || defined(ia64) + #define _LITTLE_ENDIAN + #endif +-#endif + + #ifdef _LITTLE_ENDIAN + #define __HI(x) *(1+(int*)&x) diff --git a/recipes-core/icedtea/openjdk-7-release-03b147.inc b/recipes-core/icedtea/openjdk-7-release-03b147.inc new file mode 100644 index 0000000..0932e22 --- /dev/null +++ b/recipes-core/icedtea/openjdk-7-release-03b147.inc @@ -0,0 +1,99 @@ +require icedtea7-native.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" + +FILESPATH =. "${FILE_DIRNAME}/openjdk-7-03b147:" + +# Force arm mode for now +ARM_INSTRUCTION_SET_armv4t = "ARM" + +ICEDTEA_URI = "http://icedtea.classpath.org/download/source/${ICEDTEA}.tar.gz;name=iced" + +ICEDTEA_PREFIX = "icedtea7-forest-2.1" +ICEDTEA_HG_URL = "http://icedtea.classpath.org/hg/release/${ICEDTEA_PREFIX}" + +OPENJDK_CHANGESET = "22cc03983e20" +OPENJDK_FILE = "${OPENJDK_CHANGESET}.tar.bz2" +OPENJDK_URI = "${ICEDTEA_HG_URL}/archive/${OPENJDK_FILE};name=openjdk;unpack=false" +SRC_URI[openjdk.md5sum] = "f98b0f7a69f9427a5b3775dddddc89cb" +SRC_URI[openjdk.sha256sum] = "758227833982371e3a94def84226a947f8dbbd176517f313b8cb96840bdea41e" + +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] = "cb45a8f19d77acc1f4f48e75e36a27fe" +SRC_URI[hotspot.sha256sum] = "22866990d143e76ced94b76defa3051e5e5d9a51fd272d63daa0df272d6406a2" + +CORBA_CHANGESET = "5617f6c5cc94" +CORBA_FILE = "${CORBA_CHANGESET}.tar.gz" +CORBA_URI = "${ICEDTEA_HG_URL}/corba/archive/${CORBA_FILE};name=corba;unpack=false" +SRC_URI[corba.md5sum] = "920f1a788a7fdef29a5cd70892331251" +SRC_URI[corba.sha256sum] = "963915483530f311ff313635f79ed11ea7ce5a1c0dbee5d1acb1994132857fa3" + +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] = "a0982b6df79739127871e355a40ca5a6" +SRC_URI[jaxp.sha256sum] = "297c8dbeed5afa5395b6be06b17282d53f8a888c2909074dfc1605afc0daf1c2" + +JAXWS_CHANGESET = "7edfbfe974f2" +JAXWS_FILE = "${JAXWS_CHANGESET}.tar.gz" +JAXWS_URI = "${ICEDTEA_HG_URL}/jaxws/archive/${JAXWS_FILE};name=jaxws;unpack=false" +SRC_URI[jaxws.md5sum] = "2deecec809ea8e38835678889c2bc3ac" +SRC_URI[jaxws.sha256sum] = "823ca6b8fd780bf1b1565a90cfc8ec6f0ee422a5d25ffb20b1ce0272dc4955aa" + +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] = "27c28d6be213df818490e69f12efe475" +SRC_URI[jdk.sha256sum] = "e83e6234842376147a4c32451f23d629ba107e908ebdb0f367657f9cc6c1be98" + +LANGTOOLS_CHANGESET = "b534c4c6cd9b" +LANGTOOLS_FILE = "${LANGTOOLS_CHANGESET}.tar.gz" +LANGTOOLS_URI = "${ICEDTEA_HG_URL}/langtools/archive/${LANGTOOLS_FILE};name=langtools;unpack=false" +SRC_URI[langtools.md5sum] = "16b72f3fea8ac4e5b50de693e87f9c53" +SRC_URI[langtools.sha256sum] = "c77dd42d83f06d18fa8aa65c93d137608a2e02cf24b68fc10d7b1c0bcc12a93c" + +CACAO_VERSION = "a567bcb7f589" +CACAO_FILE = "${CACAO_VERSION}.tar.gz" +CACAO_URI = "http://icedtea.classpath.org/download/drops/cacao/${CACAO_FILE};name=cacao;unpack=false" +SRC_URI[cacao.md5sum] = "ec1def7f0d3d25e9e7da47c480f26a73" +SRC_URI[cacao.sha256sum] = "d49f79debc131a5694cae6ab3ba2864e7f3249ee8d9dc09aae8afdd4dc6b09f9" + +JAMVM_VERSION = "4617da717ecb05654ea5bb9572338061106a414d" +JAMVM_FILE = "jamvm-${JAMVM_VERSION}.tar.gz" +JAMVM_URI = "http://icedtea.classpath.org/download/drops/jamvm/${JAMVM_FILE};name=jamvm;unpack=false" +SRC_URI[jamvm.md5sum] = "740c2587502831cac6797d1233a7e27b" +SRC_URI[jamvm.sha256sum] = "47fce7bd556c1b1d29a93b8c45497e0d872b48b7f535066b303336f29d0f0d8d" + +ICEDTEA_PATCHES = " \ + file://disable-library-checks.patch \ + file://build-hacks-native.patch \ + file://icedtea-sane-x86-arch-name.patch \ + file://fix-checksums.patch \ + " + + +OPENJDK_PATCHES = " \ + file://icedtea-ecj-disable-compilation.patch;apply=no \ + file://icedtea-unbreak-float.patch;apply=no \ + file://icedtea-corba-parallel-make.patch;apply=no \ + 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-disable-desktop-dirs.patch;apply=no \ + + +export DISTRIBUTION_PATCHES = " \ + patches/icedtea-ecj-disable-compilation.patch \ + patches/icedtea-unbreak-float.patch \ + patches/icedtea-corba-parallel-make.patch \ + patches/icedtea-hotspot-make-arch-sane-for-x86.patch \ + patches/icedtea-jdk-sane-x86-arch.patch \ + patches/icedtea-flags.patch \ + " + +# patches/icedtea-disable-desktop-dirs.patch \ + -- cgit v1.2.3-54-g00ecf