Merge
This commit is contained in:
commit
6ef515c0b1
@ -35,3 +35,4 @@ ffd09e767dfa6d21466183a400f72cf62d53297f jdk7-b57
|
||||
59b497130f82ec809c245ffb5e521e3a5fabf8af jdk7-b58
|
||||
030142474602b4a067662fffc0c8e541de5a78df jdk7-b59
|
||||
39565502682c7085369bd09e51640919dc741097 jdk7-b60
|
||||
472c21584cfd7e9c0229ad6a100366a5c03d2976 jdk7-b61
|
||||
|
@ -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:
|
||||
@ -656,6 +657,9 @@
|
||||
<a href="#cups">CUPS Include files</a>, set
|
||||
<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
|
||||
@ -1032,6 +1036,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.
|
||||
|
@ -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) \
|
||||
|
Loading…
x
Reference in New Issue
Block a user