Merge
This commit is contained in:
commit
c04ee47f85
common
make/devkit
@ -223,7 +223,7 @@ BASIC_COMPILE_FIXPATH
|
||||
LIB_DETERMINE_DEPENDENCIES
|
||||
LIB_SETUP_LIBRARIES
|
||||
|
||||
# Hotspot setup depends on lib checks (AOT needs libelf).
|
||||
# Hotspot setup depends on lib checks.
|
||||
|
||||
HOTSPOT_SETUP_JVM_FEATURES
|
||||
|
||||
|
@ -4213,8 +4213,6 @@ apt_help() {
|
||||
PKGHANDLER_COMMAND="sudo apt-get install ccache" ;;
|
||||
dtrace)
|
||||
PKGHANDLER_COMMAND="sudo apt-get install systemtap-sdt-dev" ;;
|
||||
elf)
|
||||
PKGHANDLER_COMMAND="sudo apt-get install libelf-dev" ;;
|
||||
esac
|
||||
}
|
||||
|
||||
@ -4234,8 +4232,6 @@ yum_help() {
|
||||
PKGHANDLER_COMMAND="sudo yum install libXtst-devel libXt-devel libXrender-devel libXi-devel" ;;
|
||||
ccache)
|
||||
PKGHANDLER_COMMAND="sudo yum install ccache" ;;
|
||||
elf)
|
||||
PKGHANDLER_COMMAND="sudo yum install elfutils-libelf-devel" ;;
|
||||
esac
|
||||
}
|
||||
|
||||
@ -5155,7 +5151,7 @@ VS_SDK_PLATFORM_NAME_2013=
|
||||
#CUSTOM_AUTOCONF_INCLUDE
|
||||
|
||||
# Do not change or remove the following line, it is needed for consistency checks:
|
||||
DATE_WHEN_GENERATED=1503320123
|
||||
DATE_WHEN_GENERATED=1503411624
|
||||
|
||||
###############################################################################
|
||||
#
|
||||
@ -65605,7 +65601,7 @@ $as_echo "no, not found at $STLPORT_LIB" >&6; }
|
||||
|
||||
|
||||
|
||||
# Hotspot setup depends on lib checks (AOT needs libelf).
|
||||
# Hotspot setup depends on lib checks.
|
||||
|
||||
|
||||
# The user can in some cases supply additional jvm features. For the custom
|
||||
|
@ -123,8 +123,6 @@ apt_help() {
|
||||
PKGHANDLER_COMMAND="sudo apt-get install ccache" ;;
|
||||
dtrace)
|
||||
PKGHANDLER_COMMAND="sudo apt-get install systemtap-sdt-dev" ;;
|
||||
elf)
|
||||
PKGHANDLER_COMMAND="sudo apt-get install libelf-dev" ;;
|
||||
esac
|
||||
}
|
||||
|
||||
@ -144,8 +142,6 @@ yum_help() {
|
||||
PKGHANDLER_COMMAND="sudo yum install libXtst-devel libXt-devel libXrender-devel libXi-devel" ;;
|
||||
ccache)
|
||||
PKGHANDLER_COMMAND="sudo yum install ccache" ;;
|
||||
elf)
|
||||
PKGHANDLER_COMMAND="sudo yum install elfutils-libelf-devel" ;;
|
||||
esac
|
||||
}
|
||||
|
||||
|
@ -58,7 +58,6 @@
|
||||
<li><a href="#x11">X11</a></li>
|
||||
<li><a href="#alsa">ALSA</a></li>
|
||||
<li><a href="#libffi">libffi</a></li>
|
||||
<li><a href="#libelf">libelf</a></li>
|
||||
</ul></li>
|
||||
<li><a href="#other-tooling-requirements">Other Tooling Requirements</a><ul>
|
||||
<li><a href="#gnu-make">GNU Make</a></li>
|
||||
@ -469,13 +468,6 @@ tar -xzf freetype-2.5.3.tar.gz</code></pre>
|
||||
<li>To install on an rpm-based Linux, try running <code>sudo yum install libffi-devel</code>.</li>
|
||||
</ul>
|
||||
<p>Use <code>--with-libffi=<path></code> if <code>configure</code> does not properly locate your libffi files.</p>
|
||||
<h3 id="libelf">libelf</h3>
|
||||
<p>libelf from the <a href="http://sourceware.org/elfutils">elfutils project</a> is required when building the AOT feature of Hotspot.</p>
|
||||
<ul>
|
||||
<li>To install on an apt-based Linux, try running <code>sudo apt-get install libelf-dev</code>.</li>
|
||||
<li>To install on an rpm-based Linux, try running <code>sudo yum install elfutils-libelf-devel</code>.</li>
|
||||
</ul>
|
||||
<p>Use <code>--with-libelf=<path></code> if <code>configure</code> does not properly locate your libelf files.</p>
|
||||
<h2 id="other-tooling-requirements">Other Tooling Requirements</h2>
|
||||
<h3 id="gnu-make">GNU Make</h3>
|
||||
<p>OpenJDK requires <a href="http://www.gnu.org/software/make">GNU Make</a>. No other flavors of make are supported.</p>
|
||||
@ -537,7 +529,6 @@ tar -xzf freetype-2.5.3.tar.gz</code></pre>
|
||||
<li><code>--with-x=<path></code> - Set the path to <a href="#x11">X11</a></li>
|
||||
<li><code>--with-alsa=<path></code> - Set the path to <a href="#alsa">ALSA</a></li>
|
||||
<li><code>--with-libffi=<path></code> - Set the path to <a href="#libffi">libffi</a></li>
|
||||
<li><code>--with-libelf=<path></code> - Set the path to <a href="#libelf">libelf</a></li>
|
||||
<li><code>--with-jtreg=<path></code> - Set the path to JTReg. See <a href="#running-tests">Running Tests</a></li>
|
||||
</ul>
|
||||
<p>Certain third-party libraries used by OpenJDK (libjpeg, giflib, libpng, lcms and zlib) are included in the OpenJDK repository. The default behavior of the OpenJDK build is to use this version of these libraries, but they might be replaced by an external version. To do so, specify <code>system</code> as the <code><source></code> option in these arguments. (The default is <code>bundled</code>).</p>
|
||||
|
@ -648,19 +648,6 @@ Hotspot.
|
||||
Use `--with-libffi=<path>` if `configure` does not properly locate your libffi
|
||||
files.
|
||||
|
||||
### libelf
|
||||
|
||||
libelf from the [elfutils project](http://sourceware.org/elfutils) is required
|
||||
when building the AOT feature of Hotspot.
|
||||
|
||||
* To install on an apt-based Linux, try running `sudo apt-get install
|
||||
libelf-dev`.
|
||||
* To install on an rpm-based Linux, try running `sudo yum install
|
||||
elfutils-libelf-devel`.
|
||||
|
||||
Use `--with-libelf=<path>` if `configure` does not properly locate your libelf
|
||||
files.
|
||||
|
||||
## Other Tooling Requirements
|
||||
|
||||
### GNU Make
|
||||
@ -813,7 +800,6 @@ features, use `bash configure --help=short` instead.)
|
||||
* `--with-x=<path>` - Set the path to [X11](#x11)
|
||||
* `--with-alsa=<path>` - Set the path to [ALSA](#alsa)
|
||||
* `--with-libffi=<path>` - Set the path to [libffi](#libffi)
|
||||
* `--with-libelf=<path>` - Set the path to [libelf](#libelf)
|
||||
* `--with-jtreg=<path>` - Set the path to JTReg. See [Running Tests](
|
||||
#running-tests)
|
||||
|
||||
|
@ -83,8 +83,6 @@ RPM_LIST := \
|
||||
libXdmcp libXdmcp-devel \
|
||||
libXau libXau-devel \
|
||||
libgcc \
|
||||
elfutils elfutils-libs elfutils-devel \
|
||||
elfutils-libelf elfutils-libelf-devel \
|
||||
zlib zlib-devel \
|
||||
libffi libffi-devel
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user