meta-java: fixes for some issues

index 464d8a8..ab51787 100644
@@ -98,11 +98,14 @@ oe_makeclasspath() {
       case "$1" in
           -s)
               # take jar files from native staging if this is a -native recipe
-              if [ ${PACKAGE_ARCH} = ${BUILD_ARCH} ]; then
+              case "$PN" in
+              *-native|*-nativesdk)
                   dir=${STAGING_DATADIR_JAVA_NATIVE}
-              else
+                  ;;
+              *)
                   dir=${STAGING_DATADIR_JAVA}
-              fi
+                  ;;
+              esac
               ;;
           -*)
               bbfatal "oe_makeclasspath: unknown option: $1"

new file mode 100644
index 0000000..6691228
@@ -0,0 +1,31 @@
+From 9779e734630e65ac7f9b27531c521e6555e2b12b Mon Sep 17 00:00:00 2001
+From: Paul Barrette <[email protected]>
+Date: Wed, 14 May 2014 10:55:31 -0400
+Subject: [PATCH] inetlib: missing dependency for util_classes
+
+Fix a dependency for intermittent build failures, e.g.:
+1. ERROR in source/gnu/inet/util/SaslCallbackHandler.java (at line 43)
+        import javax.security.auth.callback.Callback;
+               ^^^^^^^^^^^^^^
+
+Signed-off-by: Paul Barrette <[email protected]>
+---
+ Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 5694974..ca93170 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -205,7 +205,7 @@ comsat_classes = $(patsubst $(src)/%.java, $(dst)/%.class, $(comsat_sources))
+ 
+ # Jar
+ 
+-$(inetlib_jar): $(dst) $(META_INF_FILES) $(smtp_classes) $(imap_classes) $(pop3_classes) $(nntp_classes) $(ftp_classes) $(gopher_classes) $(finger_classes) $(http_classes) $(ldap_classes) $(comsat_classes)
++$(inetlib_jar): $(dst) $(META_INF_FILES) $(util_classes) $(smtp_classes) $(imap_classes) $(pop3_classes) $(nntp_classes) $(ftp_classes) $(gopher_classes) $(finger_classes) $(http_classes) $(ldap_classes) $(comsat_classes)
+ 	$(JAR) cf $(inetlib_jar) -C $(dst) META-INF -C $(dst) gnu
+ 
+ $(dst):
+-- 
+1.8.3.2
+

index f078e33..e42a650 100644
@@ -7,6 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
 
 SRC_URI = "http://ftp.gnu.org/gnu/classpath/${BP}.tar.gz \
            file://datadir_java.patch \
+           file://inetlib-missing-dependency-for-util_classes.patch \
           "
 
 inherit java-library autotools

index dc26522..6a72572 100644
@@ -7,7 +7,6 @@ SECTION  = "libs"
 ICEDTEA_VERSION = "${@bb.parse.BBHandler.vars_from_file(d.getVar('FILE', False),d)[1].split("-")[1] or '1.0'}"
 
 S = "${WORKDIR}/${ICEDTEA}"
-B = "${S}/build"
 
 DEPENDS_append_libc-uclibc = " virtual/libiconv "
 

@@ -19,6 +18,8 @@ DEPENDS_append = " qemu-native "
 
 inherit java autotools gettext qemu pkgconfig
 
+B = "${S}/build"
+
 # OpenJDK uses slightly different names for certain arches. We need to know
 #	this to create some files which are expected by the build.
 def get_jdk_arch(d):

index 5893cbc..777b442 100644
@@ -15,11 +15,6 @@ RPROVIDES_${PN}_virtclass-native = ""
 
 BBCLASSEXTEND = "native"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/jamvm/jamvm-${PV}.tar.gz \
-            file://jamvm-jni_h-noinst.patch \
-            file://libffi.patch \
-          "
-
 
 inherit java autotools update-alternatives pkgconfig
 

new file mode 100644
index 0000000..4651185
@@ -0,0 +1,13 @@
+do_install_append() {
+	cat >> ${D}${sysconfdir}/profile << EOT
+JAVA_HOME=""
+for dir in ${libdir}/jvm/*; do
+	if [ -x "\${dir}/bin/java" ]; then
+		[ -z "\${JAVA_HOME}" ] && JAVA_HOME="\${dir}"
+	fi
+done
+if [ -n "\${JAVA_HOME}" ]; then
+	export JAVA_HOME=\${JAVA_HOME}
+fi
+EOT
+}

index 02951b9..d49d7d7 100644
@@ -1,7 +1,7 @@
 require classpath-native.inc
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=af0004801732bc4b20d90f351cf80510"
-DEPENDS += "ecj-initial-native"
+DEPENDS += "ecj-initial-native virtual/java-initial-native"
 
 PR = "${INC_PR}.0"
 

index 43385e9..b38f3cb 100644
@@ -17,7 +17,7 @@ PACKAGECONFIG[x11] = ",--disable-headful,libx11-native xproto-native libxt-nativ
 OEMAKE_BUILD_HEADLESS_ONLY = "${@base_contains('PACKAGECONFIG', 'x11', '', 'BUILD_HEADLESS_ONLY=1', d)}"
 CFLAGS_append = "${@base_contains('PACKAGECONFIG', 'x11', '', ' -DHEADLESS=true', d)}"
 
-inherit native java autotools
+inherit native java autotools pkgconfig
 
 JAVA_HOME[unexport] = "1"
 

index 777b442..880b1e7 100644
@@ -3,7 +3,7 @@ HOMEPAGE = "http://jamvm.sourceforge.net/"
 LICENSE = "GPL-2.0"
 LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
 
-DEPENDS = "zlib classpath virtual/javac-native libffi"
+DEPENDS = "zlib classpath virtual/javac-native libffi virtual/java-initial-native"
 DEPENDS_virtclass-native = "zlib-native classpath-native ecj-initial-native libffi-native"
 
 RDEPENDS_${PN} = "classpath"

index 4feb80f..37f5911 100644
@@ -302,6 +302,7 @@ FILES_${JDKPN}-jdk = " \
     ${JDK_HOME}/bin \
     ${JDK_HOME}/lib \
     ${JDK_HOME}/include \
+    ${JDK_HOME}${libdir}/jvm \
 "
 RDEPENDS_${JDKPN}-jre = "${JDKPN}-java ${JDKPN}-common"
 RDEPENDS_${JDKPN}-java = "${JDKPN}-common"

index e309a27..4985d56 100644
@@ -74,11 +74,13 @@ pkg_prerm_${JDKPN}-vm-zero () {
 
 inherit update-alternatives
 
-ALTERNATIVE_${JDKPN}-jre = "java"
-ALTERNATIVE_TARGET_${JDKPN}-jre = "${JDK_HOME}/jre/bin/java"
-
+ALTERNATIVE_${JDKPN}-jre = "java keytool"
 ALTERNATIVE_${JDKPN}-jdk = "javac"
-ALTERNATIVE_TARGET_${JDKPN}-jdk = "${JDK_HOME}/bin/javac"
+
+ALTERNATIVE_TARGET[java] = "${JDK_HOME}/jre/bin/java"
+ALTERNATIVE_TARGET[javac] = "${JDK_HOME}/bin/javac"
+ALTERNATIVE_TARGET[keytool] = "${JDK_HOME}/jre/bin/keytool"
 
 ALTERNATIVE_LINK_NAME[java] = "${bindir}/java"
 ALTERNATIVE_LINK_NAME[javac] = "${bindir}/javac"
+ALTERNATIVE_LINK_NAME[keytool] = "${bindir}/keytool"

index 4985d56..be88714 100644
@@ -1,6 +1,9 @@
 # handles all postinst action for openjdk
 
+# some of the former results in a build error because "ERR" is in the first line.
+
 pkg_postinst_${JDKPN}-vm-shark () {
+    true
     if grep -q "\-server ERROR" $D/${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg && ! grep -q "KNOWN" $D/${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then
         sed -i -e "/\-shark.*/d" -e "s|\(^\-server*\)|\-shark KNOWN\n\1|" -e "/^$/d" $D/${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
     else

@@ -9,6 +12,7 @@ pkg_postinst_${JDKPN}-vm-shark () {
 }
 
 pkg_prerm_${JDKPN}-vm-shark () {
+    true
     sed -i -e "/^\-shark.*/d" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
     if grep -q "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg && grep -q "\-server ERROR" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then
         FIRST_KNOWN=`grep "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | head -n 1`

@@ -19,6 +23,7 @@ pkg_prerm_${JDKPN}-vm-shark () {
 }
 
 pkg_postinst_${JDKPN}-vm-cacao () {
+    true
     if grep -q "\-server ERROR" $D/${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg && ! grep -q "KNOWN" $D/${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then
         sed -i -e "/\-cacao.*/d" -e "s|\(^\-server*\)|\-cacao KNOWN\n\1|" -e "/^$/d" $D/${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
     else

@@ -27,6 +32,7 @@ pkg_postinst_${JDKPN}-vm-cacao () {
 }
 
 pkg_prerm_${JDKPN}-vm-cacao () {
+    true
     sed -i -e "/^\-cacao.*/d" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
     if grep -q "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg && grep -q "\-server ERROR" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then
         FIRST_KNOWN=`grep "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | head -n 1`

@@ -37,6 +43,7 @@ pkg_prerm_${JDKPN}-vm-cacao () {
 }
 
 pkg_postinst_${JDKPN}-vm-jamvm () {
+    true
     if grep -q "\-server ERROR" $D/${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg && ! grep -q "KNOWN" $D/${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then
         sed -i -e "/\-jamvm.*/d" -e "s|\(^\-server*\)|\-jamvm KNOWN\n\1|" -e "/^$/d" $D/${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
     else

@@ -45,6 +52,7 @@ pkg_postinst_${JDKPN}-vm-jamvm () {
 }
 
 pkg_prerm_${JDKPN}-vm-jamvm () {
+    true
     sed -i -e "/^\-jamvm.*/d" -e "/^$/d" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
     if grep -q "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg && grep -q "\-server ERROR" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then
         FIRST_KNOWN=`grep "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | head -n 1`

@@ -55,6 +63,7 @@ pkg_prerm_${JDKPN}-vm-jamvm () {
 }
 
 pkg_postinst_${JDKPN}-vm-zero () {
+    true
     if grep -q "KNOWN" $D/${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg && grep -q "\-server ERROR" $D/${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then
         FIRST_KNOWN=`grep "KNOWN" $D/${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | head -n 1`
         sed -i -e "/${FIRST_KNOWN}/d" -e "/^$/d" $D/${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg

@@ -65,6 +74,7 @@ pkg_postinst_${JDKPN}-vm-zero () {
 }
 
 pkg_prerm_${JDKPN}-vm-zero () {
+    true
     sed -i -e "/^\-server.*/\-server ERROR" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg
     if grep -q "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg; then
         FIRST_KNOWN=`grep "KNOWN" ${JDK_HOME}/jre/lib/${JDK_ARCH}/jvm.cfg | head -n 1`

@@ -72,6 +82,10 @@ pkg_prerm_${JDKPN}-vm-zero () {
     fi
 }
 
+pkg_postinst_${JDKPN}-jre () {
+    ln -s ${JDK_HOME}/jre  $D/${libdir}/jvm/jre
+}
+
 inherit update-alternatives
 
 ALTERNATIVE_${JDKPN}-jre = "java keytool"

new file mode 100644
index 0000000..1b92c9a
@@ -0,0 +1,42 @@
+icedtea7-native compile failure undefined reference to `main'
+
+On hosts without /usr/include/X11/extensions, icedtea7-native compile
+results in a build failure while trying to create an object file:
+
++/data/home/.../git/csu/../sysdeps/x86_64/start.S:118: undefined reference to `main'
+[2015-03-31 15:22:53.115930161+00:00] | collect2: error: ld returned 1 exit status
+
+The compile line shows: (-c gets eaten)
+... -I -c -o
+
+The makefile tries to do the following which results in a faulty build
+line if /usr/include/X11/extensions doesn't exist:
+
+   CPPFLAGS += -I$(firstword $(wildcard $(OPENWIN_HOME)/include/X11/extensions) \
+                         $(wildcard /usr/include/X11/extensions))
+
+This looks like a missed line from the following patch which removes the need for X11/extensions:
+  icedtea-ecj-disable-compilation.patch
+
+Upstream-Status: Pending
+
+Signed-off-by: Amy Fong <[email protected]>
+---
+ openjdk/jdk/make/sun/awt/mawt.gmk |    6 ------
+ 1 file changed, 6 deletions(-)
+
+--- openjdk/jdk/make/sun/awt/mawt.gmk
++++ openjdk/jdk/make/sun/awt/mawt.gmk
+@@ -258,12 +258,6 @@
+         -I$(PLATFORM_SRC)/native/$(PKGDIR) \
+         $(EVENT_MODEL)
+ 
+-ifeq ($(PLATFORM), linux)
+-  # Checking for the X11/extensions headers at the additional location
+-  CPPFLAGS += -I$(firstword $(wildcard $(OPENWIN_HOME)/include/X11/extensions) \
+-                        $(wildcard /usr/include/X11/extensions))
+-endif
+-
+ ifeq ($(PLATFORM), solaris)
+   CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions
+ endif

index b1cf6e9..dbdc045 100644
@@ -85,6 +85,7 @@ OPENJDK_PATCHES = " \
 	file://icedtea-disable-x11-in-headless.patch;apply=no \
 	file://icedtea-disable-sun.applet-for-tools-in-headless.patch;apply=no \
 	file://icedtea-hotspot-fix-undefined-behaviour.patch;apply=no \
+	file://icedtea-x11_extension_cleanup.patch;apply=no \
         "
 
 OPENJDK_HEADLESS_PATCHES = " \

@@ -104,5 +105,6 @@ export DISTRIBUTION_PATCHES = " \
 	patches/icedtea-openjdk-remove-currency-data-generation-expi.patch \
 	patches/icedtea-change-to-gdb-debug-format.patch \
 	patches/icedtea-hotspot-fix-undefined-behaviour.patch \
+	patches/icedtea-x11_extension_cleanup.patch \
 	${CLEAN_X11_DISTRIBUTION_PATCH} \
         "

new file mode 100644
index 0000000..d0717c4
@@ -0,0 +1,44 @@
+This provides a fix for the security vulnerability reported in
+http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2014-1876
+
+    The unpacker::redirect_stdio function in unpack.cpp in unpack200 in OpenJDK 6,
+    7, and 8, and Oracle Java JDK, does not securely create temporary files when a
+    log file cannot be opened, which allows local users to overwrite arbitrary
+    files via a symlink attack on /tmp/unpack.log.
+
+Rather than trying to open a /tmp/unpack.log file, this fix comments
+out that segment and goes to the fallback options which include
+redirecting error to /dev/null, or failing that, redirecting to stderr.
+
+Upstream-Status: Pending
+
+Signed-off-by: Amy Fong <[email protected]>
+
+Index: openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp
+===================================================================
+--- openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp
++++ openjdk/jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp
+@@ -4757,6 +4757,15 @@
+     return;
+   } else {
+     char log_file_name[PATH_MAX+100];
++#if 0
++/*
++The unpacker::redirect_stdio function in unpack.cpp in unpack200 in OpenJDK 6,
++7, and 8, and Oracle Java JDK, does not securely create temporary files when a
++log file cannot be opened, which allows local users to overwrite arbitrary
++files via a symlink attack on /tmp/unpack.log.
++
++http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2014-1876
++*/
+     char tmpdir[PATH_MAX];
+ #ifdef WIN32
+     int n = GetTempPath(PATH_MAX,tmpdir); //API returns with trailing '\'
+@@ -4781,6 +4790,7 @@
+       log_file = errstrm_name = saveStr(log_file_name);
+       return ;
+     }
++#endif
+ #ifndef WIN32
+     sprintf(log_file_name, "/dev/null");
+     // On windows most likely it will fail.

index dbdc045..83b087c 100644
@@ -86,6 +86,7 @@ OPENJDK_PATCHES = " \
 	file://icedtea-disable-sun.applet-for-tools-in-headless.patch;apply=no \
 	file://icedtea-hotspot-fix-undefined-behaviour.patch;apply=no \
 	file://icedtea-x11_extension_cleanup.patch;apply=no \
+	file://icedtea-CVE-2014-1876-unpack.patch;apply=no \
         "
 
 OPENJDK_HEADLESS_PATCHES = " \

@@ -106,5 +107,6 @@ export DISTRIBUTION_PATCHES = " \
 	patches/icedtea-change-to-gdb-debug-format.patch \
 	patches/icedtea-hotspot-fix-undefined-behaviour.patch \
 	patches/icedtea-x11_extension_cleanup.patch \
+	patches/icedtea-CVE-2014-1876-unpack.patch \
 	${CLEAN_X11_DISTRIBUTION_PATCH} \
         "

index 63364aa..6bbfa52 100644
@@ -7,8 +7,8 @@ inherit distro_features_check
 
 REQUIRED_DISTRO_FEATURES = "x11"
 
-SRCREV = "ebd11bde0a97b57f0d18938c6b65468d3c932719"
-PV = "1.5.5+1.6.0-devel+git${SRCPV}"
+SRCREV = "6cef41d859fbc9ce7868a97cb2cb5dd2b10b9103"
+PV = "2.0.0-devel+git${SRCPV}"
 
 SRC_URI = "git://git.code.sf.net/p/jamvm/code;protocol=git \
            file://jamvm-jni_h-noinst.patch \

index 37f5911..a928103 100644
@@ -32,6 +32,7 @@ DEPENDS = " \
     rhino krb5 \
     libxt libxinerama libxrender libxtst libxi \
     freetype alsa-lib libffi \
+    attr \
 "
 
 # No package should directly depend on this (it should require

index b38f3cb..cb6b5d3 100644
@@ -85,6 +85,7 @@ EXTRA_OECONF = "\
         --with-jaxws-src-zip=${DL_DIR}/${JAXWS_FILE} \
         --with-jdk-src-zip=${DL_DIR}/${JDK_FILE} \
         --with-langtools-src-zip=${DL_DIR}/${LANGTOOLS_FILE} \
+        ac_cv_path_UNZIP_BIN="${STAGING_BINDIR_NATIVE}/unzip" \
   "
 
 JDK_DIR = "icedtea7-native"

@@ -163,6 +164,7 @@ EXTRA_OEMAKE = ' \
                 ZIPEXE="${STAGING_BINDIR_NATIVE}/zip" \
 		${OEMAKE_BUILD_HEADLESS_ONLY} \
 		DISABLE_HOTSPOT_OS_VERSION_CHECK=ok \
+                UNZIP_BIN="${STAGING_BINDIR_NATIVE}/unzip" \
                '
 
 do_compile() {

130 lines not on this page · raw message

167 lines not on this page · raw message

index 83b087c..fdf3a89 100644
@@ -71,6 +71,7 @@ ICEDTEA_PATCHES = " \
         file://build-hacks-native.patch \
         file://icedtea-sane-x86-arch-name.patch \
 	file://fix-checksums.patch \
+	file://icedtea-makefile-unzip.patch \
         "
 
 OPENJDK_PATCHES = " \

@@ -87,6 +88,7 @@ OPENJDK_PATCHES = " \
 	file://icedtea-hotspot-fix-undefined-behaviour.patch;apply=no \
 	file://icedtea-x11_extension_cleanup.patch;apply=no \
 	file://icedtea-CVE-2014-1876-unpack.patch;apply=no \
+	file://icedtea-jdk-unzip.patch;apply=no \
         "
 
 OPENJDK_HEADLESS_PATCHES = " \

@@ -108,5 +110,6 @@ export DISTRIBUTION_PATCHES = " \
 	patches/icedtea-hotspot-fix-undefined-behaviour.patch \
 	patches/icedtea-x11_extension_cleanup.patch \
 	patches/icedtea-CVE-2014-1876-unpack.patch \
+	patches/icedtea-jdk-unzip.patch \
 	${CLEAN_X11_DISTRIBUTION_PATCH} \
         "

index a928103..718fc1a 100644
@@ -109,6 +109,7 @@ EXTRA_OECONF = " \
     \
     --with-pkgversion=${PV} \
     --with-cc-for-build=${BUILD_CC} \
+    ac_cv_path_UNZIP_BIN="${STAGING_BINDIR_NATIVE}/unzip" \
 "
 
 # PCSC default value was changed to true and SCTP was added during the 2.6.0

@@ -149,6 +150,7 @@ EXTRA_OEMAKE += ' \
     CROSS_COMPILE_ARCH="${JDK_ARCH}" \
     REQUIRED_ALSA_VERSION="" \
     DISABLE_HOTSPOT_OS_VERSION_CHECK=ok \
+    UNZIP_BIN="${STAGING_BINDIR_NATIVE}/unzip" \
 '
 
 # Provides the target architecture to the configure script.

index 854d179..1431301 100644
@@ -47,6 +47,7 @@ SRC_URI[hotspot.sha256sum] = "39bc54bf343e1dce404b8c95285c0457a8d0a7c7aedfb55055
 OEPATCHES = "\
     file://build-hacks.patch \
     file://fix_hotspot_crosscompile.patch \
+    file://icedtea-makefile-unzip.patch \
 "
 
 ICEDTEAPATCHES = "\

@@ -55,6 +56,7 @@ ICEDTEAPATCHES = "\
     file://icedtea-jdk-rmi-crosscompile.patch;apply=no \
     file://icedtea-crosscompile-fix.patch;apply=no \
     file://icedtea-xawt-crosscompile-fix.patch;apply=no \
+    file://icedtea-jdk-unzip.patch;apply=no \
 "
 
 DISTRIBUTION_PATCHES = "\

@@ -63,6 +65,7 @@ DISTRIBUTION_PATCHES = "\
     patches/icedtea-jdk-rmi-crosscompile.patch \
     patches/icedtea-crosscompile-fix.patch \
     patches/icedtea-xawt-crosscompile-fix.patch \
+    patches/icedtea-jdk-unzip.patch \
 "
 
 export DISTRIBUTION_PATCHES

130 lines not on this page · raw message

176 lines not on this page · raw message

index 1431301..047aac4 100644
@@ -57,6 +57,7 @@ ICEDTEAPATCHES = "\
     file://icedtea-crosscompile-fix.patch;apply=no \
     file://icedtea-xawt-crosscompile-fix.patch;apply=no \
     file://icedtea-jdk-unzip.patch;apply=no \
+    file://icedtea-dtrace-std_h.patch;apply=no \
 "
 
 DISTRIBUTION_PATCHES = "\

@@ -66,6 +67,7 @@ DISTRIBUTION_PATCHES = "\
     patches/icedtea-crosscompile-fix.patch \
     patches/icedtea-xawt-crosscompile-fix.patch \
     patches/icedtea-jdk-unzip.patch \
+    patches/icedtea-dtrace-std_h.patch \
 "
 
 export DISTRIBUTION_PATCHES

new file mode 100644
index 0000000..9ec59b7
@@ -0,0 +1,40 @@
+openjdk hotspot build system std.h fix
+
+Backport from upstream from jdk9
+
+    OpenJDK / jdk9 / hs-rt / hotspot
+    
+    changeset 6671:465eb6bc50d1
+    
+    8046818: Hotspot build system looking for sdt.h in the wrong place
+    Reviewed-by: sla, dholmes
+    author	mikael
+    date	Thu, 03 Jul 2014 09:16:56 -0700 (14 months ago)
+    parents	35de71d2af77
+    children	da4514678bcf
+    files	make/linux/makefiles/dtrace.make
+    diffstat	1 files changed, 8 insertions(+), 1 deletions(-) [+]
+
+Upstream-Status: Backport
+---
+ openjdk/hotspot/make/linux/makefiles/dtrace.make |    9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+--- openjdk/hotspot/make/linux/makefiles/dtrace.make
++++ openjdk/hotspot/make/linux/makefiles/dtrace.make
+@@ -40,7 +40,14 @@
+ ifneq ($(ALT_SDT_H),)
+   SDT_H_FILE = $(ALT_SDT_H)
+ else
+-  SDT_H_FILE = /usr/include/sys/sdt.h
++  ifeq ($(USE_CLANG), true)
++    # Clang doesn't support the -print-sysroot option and there is no known equivalent
++    # option, so fall back to using / as sysroot
++    SDT_SYSROOT=
++  else
++    SDT_SYSROOT=$(shell $(CXX) -print-sysroot)
++  endif
++  SDT_H_FILE = $(SDT_SYSROOT)/usr/include/sys/sdt.h
+ endif
+ DTRACE_ENABLED = $(shell test -f $(SDT_H_FILE) && echo $(SDT_H_FILE))
+ REASON = "$(SDT_H_FILE) not found"