Mercurial > hg > release > icedtea7-forest-2.1
changeset 105:38c6ee1015aa
Merge
author | xdono |
---|---|
date | Mon, 29 Jun 2009 22:13:31 -0700 |
parents | 8ca3d95b1ea3 (current diff) 57f7e028c7ad (diff) |
children | 9ed059501673 |
files | README-builds.html |
diffstat | 3 files changed, 27 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Mon Jun 22 10:13:20 2009 -0700 +++ b/.hgtags Mon Jun 29 22:13:31 2009 -0700 @@ -36,3 +36,4 @@ 030142474602b4a067662fffc0c8e541de5a78df jdk7-b59 39565502682c7085369bd09e51640919dc741097 jdk7-b60 472c21584cfd7e9c0229ad6a100366a5c03d2976 jdk7-b61 +c7ed15ab92ce36a09d264a5e34025884b2d7607f jdk7-b62
--- a/README-builds.html Mon Jun 22 10:13:20 2009 -0700 +++ b/README-builds.html Mon Jun 29 22:13:31 2009 -0700 @@ -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: @@ -666,6 +667,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>. @@ -1041,6 +1045,27 @@ CUPS Header files. </blockquote> <!-- ------------------------------------------------------ --> + <h4><a name="xrender">XRender Extension Headers (Solaris & 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/make/Defs-internal.gmk Mon Jun 22 10:13:20 2009 -0700 +++ b/make/Defs-internal.gmk Mon Jun 29 22:13:31 2009 -0700 @@ -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) \