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

Ensure SBOM FreeType version is set correctly for system and bundled settings #3497

Merged
merged 7 commits into from
Oct 6, 2023

Conversation

andrew-m-leonard
Copy link
Contributor

Fixes #3493

Determines what type of FreeType build it was "system" or "bundled", then look for the freetype.h from that freetype installation/openjdk bundle, to determine the FREETYPE_MAJOR,MINOR,PATCH

@andrew-m-leonard andrew-m-leonard self-assigned this Oct 5, 2023
Copy link
Member

@sxa sxa left a comment

Choose a reason for hiding this comment

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

Will this still pick up things properly in the case where we are pulling a version from git?
Other than checking that (and a personal hatred of using bash arrays) this LGTM (Not looked in explicit detail, but I trust that you've tested it, and I really want this in before the October release cycle!)

@andrew-m-leonard
Copy link
Contributor Author

Will this still pick up things properly in the case where we are pulling a version from git? Other than checking that (and a personal hatred of using bash arrays) this LGTM (Not looked in explicit detail, but I trust that you've tested it, and I really want this in before the October release cycle!)

@sxa Yes, works for all.. the FREETYPE_CFLAGS gets pointed at by autoconf to either the cloned freetype includes, or the system installed one...

sbin/build.sh Show resolved Hide resolved
Copy link
Member

@sxa sxa left a comment

Choose a reason for hiding this comment

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

Based on my earlier question and this:

!= is correct, the comment is missleading, i've changed it jdk8 can only be system jdk-11+ supports bundled or system

do we have builds where we are building freetype from a downloaded source? Approving regardless ...

@andrew-m-leonard
Copy link
Contributor Author

Based on my earlier question and this:

!= is correct, the comment is missleading, i've changed it jdk8 can only be system jdk-11+ supports bundled or system

do we have builds where we are building freetype from a downloaded source? Approving regardless ...

@sxa Yes jdk8u, Windows & Mac

@andrew-m-leonard andrew-m-leonard merged commit e5ac399 into adoptium:master Oct 6, 2023
20 of 22 checks passed
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.

Some sbom's missing FreeType version
3 participants