Skip to content

switch back to system freetype on Solaris - #4345

Merged
andrew-m-leonard merged 3 commits into
adoptium:masterfrom
sxa:solaris_system_freetype
Dec 31, 2025
Merged

switch back to system freetype on Solaris#4345
andrew-m-leonard merged 3 commits into
adoptium:masterfrom
sxa:solaris_system_freetype

Conversation

@sxa

@sxa sxa commented Dec 19, 2025

Copy link
Copy Markdown
Member

Fixes the build failure on Solaris by switching away from the builtin freetype to the system one again.

@sxa sxa self-assigned this Dec 19, 2025
@github-actions github-actions Bot added the solaris Issues that affect or relate to the SOLARIS OS label Dec 19, 2025
@sxa
sxa force-pushed the solaris_system_freetype branch from 1f3cdde to f1313ce Compare December 19, 2025 15:54
@sxa
switch back to system freetype on Solaris
429107b 
Signed-off-by: Stewart X Addison <sxa@ibm.com>
@sxa
sxa force-pushed the solaris_system_freetype branch from f1313ce to 429107b Compare December 19, 2025 17:25
@judovana

judovana commented Dec 20, 2025

Copy link
Copy Markdown
Contributor

Tahanx! Am happy it works like this. Sorry for this. I guess the sbom validator do not need any changes due to fate of solaris?

@karianna

karianna commented Dec 21, 2025

Copy link
Copy Markdown
Contributor

Should we add a comment saying wht this is the exception?

@judovana

judovana commented Dec 22, 2025

Copy link
Copy Markdown
Contributor

Should we add a comment saying wht this is the exception?

Yes please. @sxa Please add comment saying why solaris had to switch back to system freetype. Otherwise some eager contributor will switch it back again.

@sxa

sxa commented Dec 22, 2025

Copy link
Copy Markdown
Member Author

Yep will definitely add that now that it seems to have got past the test.

Noting that I'm still looking at an issue with the verification of the CycloneDX downloads - hopefully easy to resolve :'(

judovana
judovana reviewed Dec 22, 2025
View reviewed changes
Comment thread sbin/build.sh
patchNo="$(grep "DEFAULT_VERSION_PATCH" "${numbersFile}" | head -1 | grep -Eo '[0-9]+')" || error="true"
updateNo="$(grep "DEFAULT_VERSION_UPDATE" "${numbersFile}" | head -1 | grep -Eo '[0-9]+')" || error="true"
interimNo="$(grep "DEFAULT_VERSION_INTERIM" "${numbersFile}" | head -1 | grep -Eo '[0-9]+')" || error="true"
featureNo="$(grep "DEFAULT_VERSION_FEATURE" "${numbersFile}" | head -1 | grep -Eo '[0-9]+')" || error="true"

@judovana judovana Dec 22, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Some of this forbidden grep switches (-q, -E?, -o?) shoudl be documented, and/or some linter check enabled over them
I like grep over awk, which would live without -E here jsut with bit of escaping....

@sxa sxa Dec 22, 2025

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

I'm not sure it's up to us (or really practical) to document every GNU-specific option that exists on all tools 🤔

@judovana judovana Dec 22, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Sure not. Just those two bites from time to time. I know there is checkbashism project, but am not sure if there is any thing about -q/-E like gnu-specific switches.

@sxa

sxa commented Dec 22, 2025

Copy link
Copy Markdown
Member Author

Noting that I'm still looking at an issue with the verification of the CycloneDX downloads - hopefully easy to resolve :'(

Unfortunately it isn't ...

download-cyclonedx:
     [echo] Executing macro get-component for: cyclonedx-core-java
     [echo] Expected checksum: 4931d0aed28763ae9fa1c574e26b7636879abdc101ff81ce3c63ad905c99937c

BUILD FAILED
/export/home/vagrant/sehrish-build/cyclonedx-lib/build.xml:53: The following error occurred while executing this line:
/export/home/vagrant/sehrish-build/cyclonedx-lib/build.xml:1068: Warning: Could not find file /export/home/vagrant/dependency_cache/cyclonedx-core-java-10.1.0.jar to copy.

Total time: 0 seconds

A normal successful build has a bit more there:

download-cyclonedx:
     [echo] Executing macro get-component for: cyclonedx-core-java
     [echo] Expected checksum: 4931d0aed28763ae9fa1c574e26b7636879abdc101ff81ce3c63ad905c99937c
     [echo] Executing macro download-file
     [echo] File to download: https://repo1.maven.org/maven2/org/cyclonedx/cyclonedx-core-java/10.1.0/cyclonedx-core-java-10.1.0.jar
     [echo] Destination: build/jar/cyclonedx-core-java.jar
     [echo] Download tool: curl
    [mkdir] Created dir: /export/home/vagrant/temurin-build/cyclonedx-lib/build/jar

@sxa

sxa commented Dec 22, 2025

Copy link
Copy Markdown
Member Author

Last issue with the ant build was due to it picking up the version in /usr/sfw/bin (1.7.1) instead of /usr/local/bin (1.10.5)

@sxa
add comments explaning change
8b470bb 
Signed-off-by: Stewart X Addison <sxa@ibm.com>
@sxa
sxa force-pushed the solaris_system_freetype branch from 82673e1 to 8b470bb Compare December 22, 2025 17:41
@sxa

sxa commented Dec 22, 2025 •
edited
Loading

Copy link
Copy Markdown
Member Author

Force push here because to remove the grep fixes into a separate PR. The first commit approved by Martijn is unchanged.
Explanatory description added for the freetype options with a link to this PR

@sxa
Move doc before the BUILD_ARGS as that includes a freetype switch
bc37461 
Signed-off-by: Stewart X Addison <sxa@ibm.com>
@sxa
sxa requested a review from andrew-m-leonard December 30, 2025 17:30
@sxa sxa mentioned this pull request Dec 30, 2025
Merged
@andrew-m-leonard
andrew-m-leonard merged commit 740d4af into adoptium:master Dec 31, 2025
29 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@karianna karianna karianna approved these changes
@andrew-m-leonard andrew-m-leonard andrew-m-leonard approved these changes
+1 more reviewer
@judovana judovana judovana left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@sxa sxa

Labels

solaris Issues that affect or relate to the SOLARIS OS

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@sxa @judovana @karianna @andrew-m-leonard