diff --git a/.hgtags b/.hgtags index f29e5783c6c0cb57daafe98fa0cca99b9ae641a7..bacb8f8c5161309f8ea65593042391c89a8b524e 100644 --- a/.hgtags +++ b/.hgtags @@ -36,3 +36,4 @@ ffd09e767dfa6d21466183a400f72cf62d53297f jdk7-b57 030142474602b4a067662fffc0c8e541de5a78df jdk7-b59 39565502682c7085369bd09e51640919dc741097 jdk7-b60 472c21584cfd7e9c0229ad6a100366a5c03d2976 jdk7-b61 +c7ed15ab92ce36a09d264a5e34025884b2d7607f jdk7-b62 diff --git a/README-builds.html b/README-builds.html index ad7d16cb30b38c4e613e655982a5b44fd7502a6f..fe9ea5d1baa9b047b4c0a409dbbb4fa0d415fcc3 100644 --- a/README-builds.html +++ b/README-builds.html @@ -72,6 +72,7 @@
  • Linux and Solaris:
  • Linux only: @@ -656,6 +657,9 @@ CUPS Include files, set ALT_CUPS_HEADERS_PATH.
  • +
  • + Install the XRender Include files. +
  • Install the JIBX Libraries, set @@ -1032,6 +1036,27 @@ CUPS Header files. +

    XRender Extension Headers (Solaris & Linux)

    +
    +

    + Solaris: + 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 SFWxwinc on new enough versions of + Solaris and will be installed in + /usr/X11/include/X11/extensions/Xrender.h +

    + Linux: + 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. +

    +
    +

    FreeType 2

    Version 2.3 or newer of FreeType is required for building the OpenJDK. diff --git a/make/Defs-internal.gmk b/make/Defs-internal.gmk index 89be05b1efe0d7983e87b865306b8410a02849cc..fc18e7fd408883bf6c12ec68d053e1e951c6d615 100644 --- a/make/Defs-internal.gmk +++ b/make/Defs-internal.gmk @@ -218,6 +218,7 @@ COMMON_BUILD_ARGUMENTS = \ 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) \