Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport support for Alpine musl #8

Closed
wants to merge 18 commits into from

Conversation

calderast
Copy link

Apply Alpine's patches with the addition of some small fixes for Alpine musl build support on jdk8u

@calderast calderast changed the title Release Backport support for Alpine musl Jan 21, 2022
@karianna
Copy link
Contributor

@gdams - This looks fine to me, quick Q on Git commits. I assume that if/when @calderast submits the upstream patch set it would be easiest for her to do that as the same 2 commits to avoid merge conflicts down the line?

@gdams
Copy link
Member

gdams commented Jan 21, 2022

I assume that if/when @calderast submits the upstream patch set it would be easiest for her to do that as the same 2 commits to avoid merge conflicts down the line?

Upstream will likely want the patches in their original form (which we already have in the repo (even if they were rebased)). I'd say this approach is fine, git is usually pretty clever at resolving conflicts like that

@karianna
Copy link
Contributor

karianna commented Jan 21, 2022 via email

@gdams
Copy link
Member

gdams commented Jan 26, 2022

Thanks for recreating this @calderast. We'll likely have to wait for a few days to merge again until post-release

@gdams
Copy link
Member

gdams commented Feb 11, 2022

@gdams
Copy link
Member

gdams commented Feb 11, 2022

@calderast looks like Linux x64 is still failing:

/usr/include/dlfcn.h:74:14: note: previous declaration of 'void* dlvsym(void*, const char*, const char*)'
13:11:03   extern void *dlvsym (void *__restrict __handle,
13:11:03                ^~~~~~
13:11:03  Compiling /home/jenkins/workspace/build-scripts/jobs/jdk8u/jdk8u-linux-x64-hotspot/workspace/build/src/hotspot/src/share/vm/opto/parse1.cpp
13:11:03  Compiling /home/jenkins/workspace/build-scripts/jobs/jdk8u/jdk8u-linux-x64-hotspot/workspace/build/src/hotspot/src/share/vm/opto/parse2.cpp
13:11:03  /home/jenkins/workspace/build-scripts/jobs/jdk8u/jdk8u-linux-x64-hotspot/workspace/build/src/hotspot/make/linux/makefiles/rules.make:149: recipe for target 'os_linux.o' failed
13:11:03  gmake[6]: *** [os_linux.o] Error 1
13:11:03  gmake[6]: *** Waiting for unfinished jobs....
13:11:07  /home/jenkins/workspace/build-scripts/jobs/jdk8u/jdk8u-linux-x64-hotspot/workspace/build/src/hotspot/make/linux/makefiles/top.make:119: recipe for target 'the_vm' failed
13:11:07  gmake[5]: *** [the_vm] Error 2
13:11:07  /home/jenkins/workspace/build-scripts/jobs/jdk8u/jdk8u-linux-x64-hotspot/workspace/build/src/hotspot/make/linux/Makefile:284: recipe for target 'product' failed
13:11:07  gmake[4]: *** [product] Error 2
13:11:07  Makefile:230: recipe for target 'generic_build2' failed
13:11:07  gmake[3]: *** [generic_build2] Error 2
13:11:07  Makefile:177: recipe for target 'product' failed
13:11:07  gmake[2]: *** [product] Error 2
13:11:07  HotspotWrapper.gmk:44: recipe for target '/home/jenkins/workspace/build-scripts/jobs/jdk8u/jdk8u-linux-x64-hotspot/workspace/build/src/build/linux-x86_64-normal-server-release/hotspot/_hotspot.timestamp' failed
13:11:07  gmake[1]: *** [/home/jenkins/workspace/build-scripts/jobs/jdk8u/jdk8u-linux-x64-hotspot/workspace/build/src/build/linux-x86_64-normal-server-release/hotspot/_hotspot.timestamp] Error 2
13:11:07  /home/jenkins/workspace/build-scripts/jobs/jdk8u/jdk8u-linux-x64-hotspot/workspace/build/src//make/Main.gmk:109: recipe for target 'hotspot-only' failed

@gdams
Copy link
Member

gdams commented Feb 14, 2022

Building again: https://ci.adoptopenjdk.net/job/build-scripts/job/openjdk8-pipeline/1975/

@calderast pointed out that I was running against the wrong fork

@gdams
Copy link
Member

gdams commented Feb 14, 2022

Running another Pipeline (post rebase) https://ci.adoptopenjdk.net/job/build-scripts/job/openjdk8-pipeline/1977/

@gdams
Copy link
Member

gdams commented Feb 16, 2022

@gdams
Copy link
Member

gdams commented Feb 17, 2022

Another pipeline run (with the latest changes)
https://ci.adoptopenjdk.net/job/build-scripts/job/openjdk8-pipeline/1993/

@gdams
Copy link
Member

gdams commented Feb 18, 2022

Kicking off a build with the code set at the most recent JDK8 release so that we can hopefully push out a JDK8 alpine release: https://ci.adoptopenjdk.net/job/jdk8-alpine-linux-x64-hotspot/41/

@gdams
Copy link
Member

gdams commented Feb 21, 2022

Link to a pipeline which is passing on all platforms (https://ci.adoptopenjdk.net/job/build-scripts/job/openjdk8-pipeline/1995/)

@calderast this is looking good now! I'll request some reviewers

common/autoconf/build-aux/config.sub Outdated Show resolved Hide resolved
common/autoconf/flags.m4 Outdated Show resolved Hide resolved
hotspot/src/os/linux/vm/os_linux.cpp Outdated Show resolved Hide resolved
Copy link
Member

@gdams gdams left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Temurin-Compliance group has determined that more work is required here. Blocking until resolved

@calderast
Copy link
Author

calderast commented Mar 3, 2022

Alpine build with the latest changes (https://ci.adoptopenjdk.net/job/jdk8-alpine-linux-x64-hotspot/54/)
Pipeline run for all other platforms (https://ci.adoptopenjdk.net/job/build-scripts/job/openjdk8-pipeline/2015/)

Copy link
Member

@gdams gdams left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved - this is no longer a concern to the temurin-compliance group 🎉

@karianna
Copy link
Contributor

karianna commented Mar 7, 2022

@calderast - is this the tidied version your happy to release?

@calderast
Copy link
Author

@karianna @gdams PR with cleaner commit history here #9

@gdams
Copy link
Member

gdams commented Mar 8, 2022

Superseded by #9

@gdams gdams closed this Mar 8, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants