diff options
| author | Simon Frankenberger <simon@fraho.eu> | 2020-11-10 19:54:21 +0100 |
|---|---|---|
| committer | Milan P. Stanić <mps@arvanta.net> | 2020-12-04 08:04:19 +0000 |
| commit | 7ca4bf63c9c3b7df4654e63347c9845178909278 (patch) | |
| tree | 18826f0e1f732441e80d0c0a9db70854dc188c61 /testing/openjdk15/build.patch | |
| parent | 0b8ae1f26d4830980ac497e2ddb03a628fefc546 (diff) | |
community/openjdk15: unify patches
Diffstat (limited to 'testing/openjdk15/build.patch')
| -rw-r--r-- | testing/openjdk15/build.patch | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/testing/openjdk15/build.patch b/testing/openjdk15/build.patch index 67d463a96b1..6be5953ffae 100644 --- a/testing/openjdk15/build.patch +++ b/testing/openjdk15/build.patch @@ -1,3 +1,11 @@ +Subject: Fix compilation issues with musl libc +Upstream: No +Author: The portola team at https://openjdk.java.net/projects/portola/ + With modifications by Simon Frankenberger <simon-alpine@fraho.eu> + +This giant patch makes it possible to compile openjdk with musl libc. +The base was taken from a diff with the portola project and adjusted for latest musl libc. + This patch contains mainly code from the portola project. Adopted, enhanced and fixed so that it actually compiles with alpine. @@ -475,11 +483,11 @@ Adopted, enhanced and fixed so that it actually compiles with alpine. #include <stdlib.h> #include <string.h> -#include <gnu/libc-version.h> - + // Declare the thread local variable(s) in the main executable. This can be // used to demonstrate the issues associated with the on-stack static TLS blocks @@ -56,6 +55,10 @@ - + // glibc 2.15 introduced __pthread_get_minstack int glibc_has_pthread_get_minstack() { +#if !defined(__GLIBC__) && !defined(__UCLIBC__) @@ -495,5 +503,5 @@ Adopted, enhanced and fixed so that it actually compiles with alpine. return 0; +#endif } - + int run(jboolean addTLS) { |