stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8238912: Update devkit for linux-aarch64

Browse Source 
Reviewed-by: erikj
This commit is contained in:
Mikael Vidstedt 2020-02-12 09:44:53 -08:00
parent 5c3a01591c
commit aa4ef80f6a
2 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
make/conf/jib-profiles.js
View File

@ -974,7 +974,7 @@ var getJibProfilesDependencies = function (input, common) {
solaris_x64: "SS12u4-Solaris11u1+1.0", solaris_x64: "SS12u4-Solaris11u1+1.0",
solaris_sparcv9: "SS12u6-Solaris11u3+1.0", solaris_sparcv9: "SS12u6-Solaris11u3+1.0",
windows_x64: "VS2017-15.9.16+1.0", windows_x64: "VS2017-15.9.16+1.0",
linux_aarch64: "gcc8.2.0-Fedora27+1.0", linux_aarch64: "gcc8.3.0-OL7.6+1.0",
linux_arm: "gcc8.2.0-Fedora27+1.0", linux_arm: "gcc8.2.0-Fedora27+1.0",
linux_ppc64le: "gcc8.2.0-Fedora27+1.0", linux_ppc64le: "gcc8.2.0-Fedora27+1.0",
linux_s390x: "gcc8.2.0-Fedora27+1.0" linux_s390x: "gcc8.2.0-Fedora27+1.0"
@ -1004,9 +1004,17 @@ var getJibProfilesDependencies = function (input, common) {
? input.get("gnumake", "install_path") + "/cygwin/bin" ? input.get("gnumake", "install_path") + "/cygwin/bin"
: input.get("gnumake", "install_path") + "/bin"); : input.get("gnumake", "install_path") + "/bin");
var dependencies = { if (input.build_cpu == 'aarch64') {
boot_jdk = {
boot_jdk: { organization: common.organization,
ext: "tar.gz",
module: "jdk-linux_aarch64",
revision: "13+1.0",
configure_args: "--with-boot-jdk=" + common.boot_jdk_home,
environment_path: common.boot_jdk_home + "/bin"
}
} else {
boot_jdk = {
server: "jpg", server: "jpg",
product: "jdk", product: "jdk",
version: common.boot_jdk_version, version: common.boot_jdk_version,
@ -1015,7 +1023,11 @@ var getJibProfilesDependencies = function (input, common) {
+ boot_jdk_platform + "_bin" + boot_jdk_ext, + boot_jdk_platform + "_bin" + boot_jdk_ext,
configure_args: "--with-boot-jdk=" + common.boot_jdk_home, configure_args: "--with-boot-jdk=" + common.boot_jdk_home,
environment_path: common.boot_jdk_home + "/bin" environment_path: common.boot_jdk_home + "/bin"
}, }
}
var dependencies = {
boot_jdk: boot_jdk,
devkit: { devkit: {
organization: common.organization, organization: common.organization,

14
make/devkit/Tools.gmk
View File

@ -51,9 +51,17 @@ endif
$(info ARCH=$(ARCH)) $(info ARCH=$(ARCH))
KERNEL_HEADERS_RPM := kernel-headers
ifeq ($(BASE_OS), OL) ifeq ($(BASE_OS), OL)
BASE_URL := http://yum.oracle.com/repo/OracleLinux/OL6/4/base/$(ARCH)/ ifeq ($(ARCH), aarch64)
LINUX_VERSION := OL6.4 BASE_URL := http://yum.oracle.com/repo/OracleLinux/OL7/6/base/$(ARCH)/
LINUX_VERSION := OL7.6
KERNEL_HEADERS_RPM := kernel-uek-headers
else
BASE_URL := http://yum.oracle.com/repo/OracleLinux/OL6/4/base/$(ARCH)/
LINUX_VERSION := OL6.4
endif
else ifeq ($(BASE_OS), Fedora) else ifeq ($(BASE_OS), Fedora)
DEFAULT_OS_VERSION := 27 DEFAULT_OS_VERSION := 27
ifeq ($(BASE_OS_VERSION), ) ifeq ($(BASE_OS_VERSION), )
@ -118,7 +126,7 @@ GDB := http://ftp.gnu.org/gnu/gdb/${gdb_ver}.tar.xz
# RPMs used by all BASE_OS # RPMs used by all BASE_OS
RPM_LIST := \ RPM_LIST := \
kernel-headers \ $(KERNEL_HEADERS_RPM) \
glibc glibc-headers glibc-devel \ glibc glibc-headers glibc-devel \
cups-libs cups-devel \ cups-libs cups-devel \
libX11 libX11-devel \ libX11 libX11-devel \