changeset 2959:7ba5c2343ee6

Merge
author duke
date Wed, 05 Jul 2017 16:54:44 +0200
parents 301dcd5c88d0 6809875dbaf1
children 81166015098c
files
diffstat 4 files changed, 28 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags-top-repo	Tue Jun 23 23:09:49 2009 -0700
+++ b/.hgtags-top-repo	Wed Jul 05 16:54:44 2017 +0200
@@ -35,3 +35,4 @@
 59b497130f82ec809c245ffb5e521e3a5fabf8af jdk7-b58
 030142474602b4a067662fffc0c8e541de5a78df jdk7-b59
 39565502682c7085369bd09e51640919dc741097 jdk7-b60
+472c21584cfd7e9c0229ad6a100366a5c03d2976 jdk7-b61
--- a/README-builds.html	Tue Jun 23 23:09:49 2009 -0700
+++ b/README-builds.html	Wed Jul 05 16:54:44 2017 +0200
@@ -72,6 +72,7 @@
                             <li>Linux and Solaris:
                                 <ul>
                                     <li><a href="#cups">CUPS Include files</a> </li>
+                                    <li><a href="#xrender">XRender Include files</a></li>
                                 </ul>
                             </li>
                             <li>Linux only:
@@ -657,6 +658,9 @@
                     <tt><a href="#ALT_CUPS_HEADERS_PATH">ALT_CUPS_HEADERS_PATH</a></tt>.
                 </li>
                 <li>
+                    Install the <a href="#xrender">XRender Include files</a>.
+                </li>
+                <li>
                     Install the
                     <a href="#jibx">JIBX Libraries</a>, set
                     <tt><a href="#ALT_JIBX_LIBS_PATH">ALT_JIBX_LIBS_PATH</a></tt>.
@@ -1032,6 +1036,27 @@
                 CUPS Header files.
             </blockquote>
             <!-- ------------------------------------------------------ -->
+            <h4><a name="xrender">XRender Extension Headers (Solaris &amp; Linux)</a></h4>
+            <blockquote>
+                <p>
+                <strong>Solaris:</strong>
+                XRender header files are required for building the 
+                OpenJDK on Solaris.
+                The XRender header file is included with the other X11 header files
+                in the package <strong>SFWxwinc</strong> on new enough versions of
+                Solaris and will be installed in
+	        <tt>/usr/X11/include/X11/extensions/Xrender.h</tt>
+                </p><p>
+                <strong>Linux:</strong>
+                XRender header files are required for building the 
+                OpenJDK on Linux.
+                The Linux header files are usually available from a "Xrender"
+                development package, it's recommended that you try and use
+                the package provided by the particular distribution of Linux that
+                you are using.
+	        </p>
+            </blockquote>
+            <!-- ------------------------------------------------------ -->
             <h4><a name="freetype">FreeType 2</a></h4>
             <blockquote>
                 Version 2.3 or newer of FreeType is required for building the OpenJDK.
--- a/hotspot/.hgtags	Tue Jun 23 23:09:49 2009 -0700
+++ b/hotspot/.hgtags	Wed Jul 05 16:54:44 2017 +0200
@@ -35,3 +35,4 @@
 53d9bf689e80fcc76b221bbe6c5d58e08b80cbc6 jdk7-b58
 c55be0c7bd32c016c52218eb4c8b5da8a75450b5 jdk7-b59
 a77eddcd510c3972717c025cfcef9a60bfa4ecac jdk7-b60
+27b728fd1281ab62e9d7e4424f8bbb6ca438d803 jdk7-b61
--- a/make/Defs-internal.gmk	Tue Jun 23 23:09:49 2009 -0700
+++ b/make/Defs-internal.gmk	Wed Jul 05 16:54:44 2017 +0200
@@ -218,6 +218,7 @@
     JDK_TOPDIR=$(ABS_JDK_TOPDIR) \
     JDK_MAKE_SHARED_DIR=$(ABS_JDK_TOPDIR)/make/common/shared \
     EXTERNALSANITYCONTROL=true \
+    SOURCE_LANGUAGE_VERSION=$(SOURCE_LANGUAGE_VERSION) \
     TARGET_CLASS_VERSION=$(TARGET_CLASS_VERSION) \
     MILESTONE=$(MILESTONE) \
     BUILD_NUMBER=$(BUILD_NUMBER) \