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

Default Temurin jdk-21+ to use bundled FreeType #3557

Merged
merged 10 commits into from
Dec 5, 2023
Merged

Default Temurin jdk-21+ to use bundled FreeType #3557

merged 10 commits into from
Dec 5, 2023

Conversation

andrew-m-leonard
Copy link
Contributor

Fixes #3504

PMC confirmed moving Temurin jdk21u to using "bundled" FreeType, to provide "consistent" and "reproducible" builds with FreeType.

@andrew-m-leonard
Default Temurin jdk-21+ to use bundled FreeType
63565c7 
Signed-off-by: Andrew Leonard <anleonar@redhat.com>
@andrew-m-leonard andrew-m-leonard self-assigned this Dec 1, 2023
@github-actions github-actions bot added macos Issues that affect or relate to the MAC OS windows Issues that affect or relate to the WINDOWS OS aix Issues that affect or relate to the AIX OS alpine-linux Issues that affect or relate to the Alpine LINUX OS labels Dec 1, 2023
@andrew-m-leonard
Default Temurin jdk-21+ to use bundled FreeType
24b40a0 
Signed-off-by: Andrew Leonard <anleonar@redhat.com>
@andrew-m-leonard
Default Temurin jdk-21+ to use bundled FreeType
e52863e 
Signed-off-by: Andrew Leonard <anleonar@redhat.com>
@sxa
Copy link
Member

sxa commented Dec 1, 2023

Are the AIX and Alpine changes here correct i.e. is freetype already included in those platforms or this this going to start adding support for it?

@andrew-m-leonard
Default Temurin jdk-21+ to use bundled FreeType
9992ed7 
Signed-off-by: Andrew Leonard <anleonar@redhat.com>
@andrew-m-leonard
Default Temurin jdk-21+ to use bundled FreeType
75c8150 
Signed-off-by: Andrew Leonard <anleonar@redhat.com>
@andrew-m-leonard
Default Temurin jdk-21+ to use bundled FreeType
a6d5394 
Signed-off-by: Andrew Leonard <anleonar@redhat.com>
@andrew-m-leonard
Copy link
Contributor Author

Are the AIX and Alpine changes here correct i.e. is freetype already included in those platforms or this this going to start adding support for it?

@sxa they are the same as Linux, ie.they currently use "System", but will change to "bundled"

@andrew-m-leonard
Default Temurin jdk-21+ to use bundled FreeType
39e6c05 
Signed-off-by: Andrew Leonard <anleonar@redhat.com>
@andrew-m-leonard
Default Temurin jdk-21+ to use bundled FreeType
2167e70 
Signed-off-by: Andrew Leonard <anleonar@redhat.com>
@andrew-m-leonard
Copy link
Contributor Author

andrew-m-leonard commented Dec 1, 2023 •
edited
Loading

Test jdk21u pipeline: https://ci.adoptium.net/job/build-scripts/job/openjdk21-pipeline/224/console
All compile and produce a bundled libfreetype.so.

@andrew-m-leonard
Copy link
Contributor Author

Test pipeline with "tests" enabled:
https://ci.adoptium.net/job/build-scripts/job/openjdk21-pipeline/225/

@andrew-m-leonard
Copy link
Contributor Author

Test pipeline with "tests" enabled: https://ci.adoptium.net/job/build-scripts/job/openjdk21-pipeline/225/

Tests all look good

adamfarley
adamfarley approved these changes Dec 4, 2023
View reviewed changes
Copy link
Contributor

@adamfarley adamfarley left a comment

Choose a reason for hiding this comment

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

LGTM

@andrew-m-leonard
Default Temurin jdk-21+ to use bundled FreeType
796d86b 
Signed-off-by: Andrew Leonard <anleonar@redhat.com>
@andrew-m-leonard
Default jdk-21+ to use bundled FreeType
65dd287 
Signed-off-by: Andrew Leonard <anleonar@redhat.com>
@andrew-m-leonard andrew-m-leonard merged commit 3a3f4ac into adoptium:master Dec 5, 2023
23 checks passed
@karianna karianna mentioned this pull request Jan 8, 2024
Merged
@pshipton pshipton mentioned this pull request Jan 16, 2024
Merged
pshipton added a commit to pshipton/openj9-openjdk-jdk21 that referenced this pull request Jan 16, 2024
@pshipton
Bundle freetype by default to match Semeru builds
b174ef0 
Bundles freetype on Linux.

See adoptium/temurin-build#3557

Signed-off-by: Peter Shipton <Peter_Shipton@ca.ibm.com>
pshipton added a commit to pshipton/openj9-openjdk-jdk that referenced this pull request Jan 16, 2024
@pshipton
Bundle freetype by default to match Semeru builds
d819390 
Bundles freetype on Linux.

See adoptium/temurin-build#3557

Signed-off-by: Peter Shipton <Peter_Shipton@ca.ibm.com>
@pshipton pshipton mentioned this pull request Jan 16, 2024
Merged
pshipton added a commit to pshipton/openj9-openjdk-jdk22 that referenced this pull request Jan 16, 2024
@pshipton
Bundle freetype by default to match Semeru builds
4261559 
Bundles freetype on Linux.

See adoptium/temurin-build#3557

Signed-off-by: Peter Shipton <Peter_Shipton@ca.ibm.com>
@pshipton pshipton mentioned this pull request Jan 16, 2024
Merged
@andrew-m-leonard andrew-m-leonard mentioned this pull request Jan 29, 2024
Open
@sxa sxa mentioned this pull request Jan 29, 2024
Closed
@sxa sxa mentioned this pull request Feb 19, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pshipton pshipton pshipton approved these changes

@adamfarley adamfarley adamfarley approved these changes

@sxa sxa sxa approved these changes

@AdamBrousseau AdamBrousseau Awaiting requested review from AdamBrousseau

Assignees

@andrew-m-leonard andrew-m-leonard

Labels
aix Issues that affect or relate to the AIX OS alpine-linux Issues that affect or relate to the Alpine LINUX OS macos Issues that affect or relate to the MAC OS windows Issues that affect or relate to the WINDOWS OS
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

FreeType version used across Temurin versions is inconsistent
5 participants
@andrew-m-leonard @sxa @AdamBrousseau @pshipton @adamfarley