Mon, 29 Jun 2009 12:00:09 -0400
Merge
1.1 --- a/.hgtags Mon Jun 22 09:14:12 2009 -0400 1.2 +++ b/.hgtags Mon Jun 29 12:00:09 2009 -0400 1.3 @@ -36,3 +36,4 @@ 1.4 030142474602b4a067662fffc0c8e541de5a78df jdk7-b59 1.5 39565502682c7085369bd09e51640919dc741097 jdk7-b60 1.6 472c21584cfd7e9c0229ad6a100366a5c03d2976 jdk7-b61 1.7 +c7ed15ab92ce36a09d264a5e34025884b2d7607f jdk7-b62
2.1 --- a/README-builds.html Mon Jun 22 09:14:12 2009 -0400 2.2 +++ b/README-builds.html Mon Jun 29 12:00:09 2009 -0400 2.3 @@ -72,6 +72,7 @@ 2.4 <li>Linux and Solaris: 2.5 <ul> 2.6 <li><a href="#cups">CUPS Include files</a> </li> 2.7 + <li><a href="#xrender">XRender Include files</a></li> 2.8 </ul> 2.9 </li> 2.10 <li>Linux only: 2.11 @@ -657,6 +658,9 @@ 2.12 <tt><a href="#ALT_CUPS_HEADERS_PATH">ALT_CUPS_HEADERS_PATH</a></tt>. 2.13 </li> 2.14 <li> 2.15 + Install the <a href="#xrender">XRender Include files</a>. 2.16 + </li> 2.17 + <li> 2.18 Install the 2.19 <a href="#jibx">JIBX Libraries</a>, set 2.20 <tt><a href="#ALT_JIBX_LIBS_PATH">ALT_JIBX_LIBS_PATH</a></tt>. 2.21 @@ -1032,6 +1036,27 @@ 2.22 CUPS Header files. 2.23 </blockquote> 2.24 <!-- ------------------------------------------------------ --> 2.25 + <h4><a name="xrender">XRender Extension Headers (Solaris & Linux)</a></h4> 2.26 + <blockquote> 2.27 + <p> 2.28 + <strong>Solaris:</strong> 2.29 + XRender header files are required for building the 2.30 + OpenJDK on Solaris. 2.31 + The XRender header file is included with the other X11 header files 2.32 + in the package <strong>SFWxwinc</strong> on new enough versions of 2.33 + Solaris and will be installed in 2.34 + <tt>/usr/X11/include/X11/extensions/Xrender.h</tt> 2.35 + </p><p> 2.36 + <strong>Linux:</strong> 2.37 + XRender header files are required for building the 2.38 + OpenJDK on Linux. 2.39 + The Linux header files are usually available from a "Xrender" 2.40 + development package, it's recommended that you try and use 2.41 + the package provided by the particular distribution of Linux that 2.42 + you are using. 2.43 + </p> 2.44 + </blockquote> 2.45 + <!-- ------------------------------------------------------ --> 2.46 <h4><a name="freetype">FreeType 2</a></h4> 2.47 <blockquote> 2.48 Version 2.3 or newer of FreeType is required for building the OpenJDK.
3.1 --- a/make/Defs-internal.gmk Mon Jun 22 09:14:12 2009 -0400 3.2 +++ b/make/Defs-internal.gmk Mon Jun 29 12:00:09 2009 -0400 3.3 @@ -218,6 +218,7 @@ 3.4 JDK_TOPDIR=$(ABS_JDK_TOPDIR) \ 3.5 JDK_MAKE_SHARED_DIR=$(ABS_JDK_TOPDIR)/make/common/shared \ 3.6 EXTERNALSANITYCONTROL=true \ 3.7 + SOURCE_LANGUAGE_VERSION=$(SOURCE_LANGUAGE_VERSION) \ 3.8 TARGET_CLASS_VERSION=$(TARGET_CLASS_VERSION) \ 3.9 MILESTONE=$(MILESTONE) \ 3.10 BUILD_NUMBER=$(BUILD_NUMBER) \