diff options
Diffstat (limited to 'recipes-core/openjdk/openjdk-8-release-172b11-common.inc')
-rw-r--r-- | recipes-core/openjdk/openjdk-8-release-172b11-common.inc | 36 |
1 files changed, 31 insertions, 5 deletions
diff --git a/recipes-core/openjdk/openjdk-8-release-172b11-common.inc b/recipes-core/openjdk/openjdk-8-release-172b11-common.inc index 8e94a4f..0cda4bb 100644 --- a/recipes-core/openjdk/openjdk-8-release-172b11-common.inc +++ b/recipes-core/openjdk/openjdk-8-release-172b11-common.inc | |||
@@ -33,30 +33,52 @@ HOTSPOT_UB_PATCH_prepend_aarch64 = "\ | |||
33 | file://0012-hotspot-aarch64-fix-undefined-behaviour-gcc-v8-fix.patch \ | 33 | file://0012-hotspot-aarch64-fix-undefined-behaviour-gcc-v8-fix.patch \ |
34 | file://0013-hotspot-aarch64-Fix-further-functions-with-a-missing.patch \ | 34 | file://0013-hotspot-aarch64-Fix-further-functions-with-a-missing.patch \ |
35 | " | 35 | " |
36 | HOTSPOT_UB_PATCH_append_armv7a = " file://0001-hotspot-aarch32-fix-missing-return-values.patch" | ||
37 | HOTSPOT_UB_PATCH_append_armv7ve = " file://0001-hotspot-aarch32-fix-missing-return-values.patch" | ||
36 | # some patches extracted from http://cr.openjdk.java.net/~rkennke/shark-build-hotspot/webrev.01/hotspot.patch | 38 | # some patches extracted from http://cr.openjdk.java.net/~rkennke/shark-build-hotspot/webrev.01/hotspot.patch |
37 | # reported via http://mail.openjdk.java.net/pipermail/build-dev/2015-January/013972.html | 39 | # reported via http://mail.openjdk.java.net/pipermail/build-dev/2015-January/013972.html |
38 | # by Roman Kennke (rkennke at redhat.com) | 40 | # by Roman Kennke (rkennke at redhat.com) |
39 | LIBPNG_NEON_PATCH = "file://openjdk8-fix-libpng-neon-build.patch;striplevel=0" | 41 | LIBPNG_NEON_PATCH = "file://openjdk8-fix-libpng-neon-build.patch;striplevel=0" |
40 | LIBPNG_NEON_PATCH_aarch64 = "" | 42 | LIBPNG_NEON_PATCH_aarch64 = "" |
43 | |||
41 | PATCHES_URI_append_class-target = "\ | 44 | PATCHES_URI_append_class-target = "\ |
42 | file://openjdk8-restrict-to-staging-dir.patch;striplevel=0 \ | 45 | file://openjdk8-restrict-to-staging-dir.patch;striplevel=0 \ |
43 | file://openjdk8-fix-shark-build.patch;striplevel=0 \ | 46 | file://openjdk8-fix-shark-build-common.patch;striplevel=0 \ |
47 | ${FIX_SHARK_BUILD_PT2_PATCH} \ | ||
44 | file://openjdk8-fix-shark-stdc++11.patch;striplevel=0 \ | 48 | file://openjdk8-fix-shark-stdc++11.patch;striplevel=0 \ |
45 | file://openjdk8-fix-assembler-flag-handling-in-makefile.patch;striplevel=0 \ | 49 | file://openjdk8-fix-assembler-flag-handling-in-makefile.patch;striplevel=0 \ |
46 | file://openjdk8-fix-adlc-flags.patch;striplevel=0 \ | 50 | file://openjdk8-fix-adlc-flags.patch;striplevel=0 \ |
47 | file://openjdk8-add-missing-linker-flags.patch;striplevel=0 \ | 51 | file://openjdk8-add-missing-linker-flags.patch;striplevel=0 \ |
48 | " | 52 | " |
53 | FIX_SHARK_BUILD_PT2_PATCH = "file://openjdk8-fix-shark-build-pt2.patch;striplevel=0" | ||
54 | FIX_SHARK_BUILD_PT2_PATCH_armv7a = "file://openjdk8-fix-shark-build-pt2-aarch32.patch;striplevel=0" | ||
55 | FIX_SHARK_BUILD_PT2_PATCH_armv7ve = "file://openjdk8-fix-shark-build-pt2-aarch32.patch;striplevel=0" | ||
56 | |||
49 | PATCHES_URI_append_libc-musl = "\ | 57 | PATCHES_URI_append_libc-musl = "\ |
50 | file://musl-0001-hotspot-stop-using-obsolete-isnanf.patch \ | 58 | ${OBSOLETE_ISNANF_PATCH} \ |
51 | file://musl-0002-jdk-give-a-much-bigger-buffer-to-getmntent_r.patch \ | 59 | file://musl-0002-jdk-give-a-much-bigger-buffer-to-getmntent_r.patch \ |
52 | file://musl-0003-jdk-fix-libjvm-load-on-musl-set-LD_LIBRARY_PATH.patch \ | 60 | file://musl-0003-jdk-fix-libjvm-load-on-musl-set-LD_LIBRARY_PATH.patch \ |
53 | file://musl-0004-jdk-remove-sysctl.h-include-musl-build-fix.patch \ | 61 | file://musl-0004-jdk-remove-sysctl.h-include-musl-build-fix.patch \ |
54 | file://musl-0005-hotspot-disable-agent-build.patch \ | 62 | file://musl-0005-hotspot-disable-agent-build-common.patch \ |
55 | file://musl-0006-hotspot-os_linux-remove-glibc-dependencies.patch \ | 63 | ${DISABLE_AGENT_BUILD_PT2} \ |
64 | file://musl-0006-hotspot-os_linux-remove-glibc-dependencies-common.patch \ | ||
65 | ${REMOVE_GLIBC_DEPENDENCIES_PT2} \ | ||
56 | file://musl-0007-hotspot-os_linux_x86-remove-glibc-dependencies-fpu_c.patch \ | 66 | file://musl-0007-hotspot-os_linux_x86-remove-glibc-dependencies-fpu_c.patch \ |
57 | file://musl-0008-jdk-musl-build-fix-use-SIGRTMAX-rather-than-__SIGRTM.patch \ | 67 | file://musl-0008-jdk-musl-build-fix-use-SIGRTMAX-rather-than-__SIGRTM.patch \ |
58 | file://musl-0009-jdk-musl-has-gethostby_r.patch \ | 68 | file://musl-0009-jdk-musl-has-gethostby_r.patch \ |
59 | " | 69 | " |
70 | OBSOLETE_ISNANF_PATCH = "file://musl-0001-hotspot-stop-using-obsolete-isnanf.patch" | ||
71 | OBSOLETE_ISNANF_PATCH_armv7a = "" | ||
72 | OBSOLETE_ISNANF_PATCH_armv7ve = "" | ||
73 | DISABLE_AGENT_BUILD_PT2 = "file://musl-0005-hotspot-disable-agent-build-pt2.patch" | ||
74 | DISABLE_AGENT_BUILD_PT2_armv7a = "file://musl-0005-hotspot-disable-agent-build-pt2-aarch32.patch" | ||
75 | DISABLE_AGENT_BUILD_PT2_armv7ve = "file://musl-0005-hotspot-disable-agent-build-pt2-aarch32.patch" | ||
76 | REMOVE_GLIBC_DEPENDENCIES_PT2 = "file://musl-0006-hotspot-os_linux-remove-glibc-dependencies-pt2.patch" | ||
77 | REMOVE_GLIBC_DEPENDENCIES_PT2_armv7a = "file://musl-0006-hotspot-os_linux-remove-glibc-dependencies-pt2-aarch.patch" | ||
78 | REMOVE_GLIBC_DEPENDENCIES_PT2_armv7ve = "file://musl-0006-hotspot-os_linux-remove-glibc-dependencies-pt2-aarch.patch" | ||
79 | |||
80 | PATCHES_URI_append_libc-musl_armv7a = " file://hotspot-remaining-musl-fixes-aarch32.patch" | ||
81 | PATCHES_URI_append_libc-musl_armv7ve = " file://hotspot-remaining-musl-fixes-aarch32.patch" | ||
60 | PATCHES_URI_append_libc-musl_aarch64 = " file://hotspot-remaining-musl-fixes-aarch64.patch" | 82 | PATCHES_URI_append_libc-musl_aarch64 = " file://hotspot-remaining-musl-fixes-aarch64.patch" |
61 | 83 | ||
62 | # Name of the directory containing the compiled output | 84 | # Name of the directory containing the compiled output |
@@ -72,10 +94,14 @@ BUILD_CFLAGS_append = " -Wno-error=deprecated-declarations" | |||
72 | TARGET_CFLAGS_append = " -Wno-error=deprecated-declarations" | 94 | TARGET_CFLAGS_append = " -Wno-error=deprecated-declarations" |
73 | 95 | ||
74 | # Enable zero mode for arm based builds, as normal hotspot fails to build | 96 | # Enable zero mode for arm based builds, as normal hotspot fails to build |
75 | PACKAGECONFIG_append_arm = " zero" | 97 | PACKAGECONFIG_append_armv4 = " zero" |
98 | PACKAGECONFIG_append_armv5 = " zero" | ||
99 | PACKAGECONFIG_append_armv6 = " zero" | ||
76 | 100 | ||
77 | OPENJDK_ARCH_PORT = "jdk8u" | 101 | OPENJDK_ARCH_PORT = "jdk8u" |
78 | OPENJDK_ARCH_PORT_aarch64 = "aarch64-port" | 102 | OPENJDK_ARCH_PORT_aarch64 = "aarch64-port" |
103 | OPENJDK_ARCH_PORT_armv7a = "aarch32-port" | ||
104 | OPENJDK_ARCH_PORT_armv7ve = "aarch32-port" | ||
79 | OPENJDK_HG_U = "jdk8u" | 105 | OPENJDK_HG_U = "jdk8u" |
80 | OPENJDK_HG_URL = "http://hg.openjdk.java.net/${OPENJDK_ARCH_PORT}/${OPENJDK_HG_U}" | 106 | OPENJDK_HG_URL = "http://hg.openjdk.java.net/${OPENJDK_ARCH_PORT}/${OPENJDK_HG_U}" |
81 | 107 | ||