# HG changeset patch
# User herrick
# Date 1246291209 14400
# Node ID 528e4cc7541b7813303229b576cfece9eb640be0
# Parent  d28a8c422df14a23acbfd437511fbdc76c4469a9# Parent  57f7e028c7ad1806500ae89eb3f4cd9a51b10e18
Merge

diff -r d28a8c422df1 -r 528e4cc7541b .hgtags
--- a/.hgtags	Mon Jun 22 09:14:12 2009 -0400
+++ b/.hgtags	Mon Jun 29 12:00:09 2009 -0400
@@ -36,3 +36,4 @@
 030142474602b4a067662fffc0c8e541de5a78df jdk7-b59
 39565502682c7085369bd09e51640919dc741097 jdk7-b60
 472c21584cfd7e9c0229ad6a100366a5c03d2976 jdk7-b61
+c7ed15ab92ce36a09d264a5e34025884b2d7607f jdk7-b62
diff -r d28a8c422df1 -r 528e4cc7541b README-builds.html
--- a/README-builds.html	Mon Jun 22 09:14:12 2009 -0400
+++ b/README-builds.html	Mon Jun 29 12:00:09 2009 -0400
@@ -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.
diff -r d28a8c422df1 -r 528e4cc7541b make/Defs-internal.gmk
--- a/make/Defs-internal.gmk	Mon Jun 22 09:14:12 2009 -0400
+++ b/make/Defs-internal.gmk	Mon Jun 29 12:00:09 2009 -0400
@@ -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) \