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.

Sign up for GitHub

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

Jump to bottom

Restructure RPATH and elf interpreter setting for Java, and add the LIBRARY_PATH to the additional RPATH and separate java awt libs #3583

Open
wants to merge 34 commits into
base: develop
Choose a base branch
from
Open

Restructure RPATH and elf interpreter setting for Java, and add the LIBRARY_PATH to the additional RPATH and separate java awt libs #3583

wants to merge 34 commits into from

Conversation

casparvl
Copy link
Contributor

@casparvl casparvl commented Feb 7, 2025

Supersedes #3571

Caspar van Leeuwen added 30 commits January 29, 2025 22:55
Restructure RPATH and elf interpreter setting for Java, and add the L…
e2a6a45 
…IBRARY_PATH to the additional RPATH
Fix hound issues
af2f85e
Remove blank line
c2e0795
Make sure libraries in /lib/server are also found
a7267f3
fix variable name
aee12db
Make sure the paths appear before the paths from LIBRARY_PATH
b012847
Make running the RPATH sanity check optional for Binary, instead of s…
18b20e5 
…kipping it unconditionally
Overwrite run_rpath_sanity_check with True for Java, since we have pa…
eaf3f74 
…tching of the RPATH for java now
Fix hound issues
ed4f113
Make sure to return extra_options
83e1976
Remove blank lines
8af9549
Make sure to return the failures from sanity_check_rpath()
3169ab8
Use --force-rpath to make sure an RPATH gets set, and not RUNPATH
11d4bf3
Fix order of arguments to patchelf
446692b
Also use --force-rpath when shrinking the rpath, to see if that helps
4284264
Fix RPATH also for executables in the libdir
70ae426
Move RPATH patching to binary easyblock level. Then, enable it by def…
7d508e0 
…ault for java
Forgot comma
616cc64
Fix indent
4701009
Fix syntax errors
9a500f9
Fix imports, smaller issues
ed87e04
Make sure the function that should determine the extra RPATHS actuall…
9b1e8f8 
…y returns something :)
Some more fixes of imports and other small mistakes
5151c73
Make sure that sysroot variable is set inside the function determinin…
13b4f30 
…g extra RPATHS. Also, fix syntax for call to logging
Some more debug loggin and check that extra_rpaths option is a list, …
0ff262b 
…as it shouyld be
Use installdir, as EBROOTJAVA isn't set yet at postinstallcmds time. …
c45a7e7 
…Also, set bin_lib_subdirs so that also the files in lib/server are patched
Remove commented section, which is no longer needed
c3580a4
Clarify the potential TODO
980b045
Fix indents
65672ee
Clean up unused imports
7ec9440
@casparvl casparvl mentioned this pull request Feb 7, 2025
Closed
@casparvl casparvl marked this pull request as ready for review February 7, 2025 20:59
This was referenced Feb 7, 2025
Open
Open
@boegel boegel added bug fix EESSI Related to EESSI project labels Feb 12, 2025
@boegel boegel added this to the 4.x milestone Feb 12, 2025
@lexming
Copy link
Contributor

lexming commented Feb 21, 2025

@casparvl all development is on 5.0 now, can you please move the target of this PR to the branch 5.0.x?

@boegel
Copy link
Member

boegel commented Feb 26, 2025

@casparvl all development is on 5.0 now, can you please move the target of this PR to the branch 5.0.x?

If this can wait a bit, there's no need to, soon the 5.0.x branch will be collapsed into develop...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
bug fix EESSI Related to EESSI project
Projects
None yet
Milestone
4.x
Development

Successfully merging this pull request may close these issues.
3 participants
@casparvl @lexming @boegel