8314730: GHA: Drop libfreetype6-dev transitional package in favor of libfreetype-dev

[shipilev]

Current GHA bootstraps fail for some arches with the incompatibility between libfreetype-dev and libfreetype6-dev. Current RISC-V GHA bootstrap fails due to this conflict.

In both sid, bullseye, jammy, libfreetype6-dev is a transitional package, the alias to libfreetype-dev:
https://packages.debian.org/bullseye/libfreetype6-dev
https://packages.debian.org/sid/libfreetype6-dev
https://packages.ubuntu.com/jammy/libfreetype6-dev

There is therefore no reason to ask for libfreetype6-dev instead of libfreetype-dev.

Additional testing:

• GHA

---

Progress

• Change must be properly reviewed (1 review required, with at least 1 Reviewer)
• Change must not contain extraneous whitespace
• Commit message must refer to an issue

Issue

• JDK-8314730: GHA: Drop libfreetype6-dev transitional package in favor of libfreetype-dev (Enhancement - P4)

Reviewers

• Andrew John Hughes (@gnu-andrew - Reviewer)
• Erik Joelsson (@erikj79 - Reviewer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/15378/head:pull/15378
$ git checkout pull/15378

Update a local copy of the PR:
$ git checkout pull/15378
$ git pull https://git.openjdk.org/jdk.git pull/15378/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 15378

View PR using the GUI difftool:
$ git pr show -t 15378

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/15378.diff

Webrev

Link to Webrev Comment

[bridgekeeper]

👋 Welcome back shade! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

[openjdk]

@shipilev The following label will be automatically applied to this pull request:

• build

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

[mlbridge]

Webrevs

• 00: Full (0386e84d)

[gnu-andrew]

Fix for the issue looks good and tests pass.

As to removing FreeType as a dependency altogether, I think you'd need to pass --with-freetype=bundled to the configure in build-cross-compile.yml as well. By default, it is set to system on Linux.
From make/autoconf/lib-freetype.m4:

  FREETYPE_TO_USE=bundled
  if test "x$OPENJDK_TARGET_OS" != "xwindows" && \
      test "x$OPENJDK_TARGET_OS" != "xmacosx" && \
      test "x$OPENJDK_TARGET_OS" != "xaix"; then
    FREETYPE_TO_USE=system
  fi

I did notice that this is set for the riscv64 build in make/conf/jib-profiles.js

[openjdk]

@shipilev This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8314730: GHA: Drop libfreetype6-dev transitional package in favor of libfreetype-dev

Reviewed-by: andrew, erikj

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 8 new commits pushed to the master branch:

• f39fc0a: 8314738: Remove all occurrences of and support for @Revised
• 6b9df03: 8311240: Eliminate usage of testcases.jar from TestMetaSpaceLog.java
• 3e1b1bf: 8314688: VM build without C1 fails after JDK-8313372
• 02ef859: 8313689: C2: compiler/c2/irTests/scalarReplacement/AllocationMergesTests.java fails intermittently with -XX:-TieredCompilation
• ab86d23: 8250269: Replace ATTRIBUTE_ALIGNED with alignas
• a66b5df: 8314618: RISC-V: -XX:MaxVectorSize does not work as expected
• 87298d2: 8312535: MidiSystem.getSoundbank() throws unexpected SecurityException
• 78f74bc: 8314672: ProblemList runtime/cds/appcds/customLoader/HelloCustom_JFR.java on linux-all and windows-x64

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

[erikj79]

I did notice that this is set for the riscv64 build in make/conf/jib-profiles.js

This configuration only exists to verify that the build works. We don't currently use the binaries for anything. Using "bundled" made devkit creation and maintenance simpler.

For GHA, I think the builds should be configured the way we expect most users to configure them. On Linux, I think linking to a system installed freetype is more common and desired.

[shipilev]

Integrating to unbreak GHA.

/integrate

[openjdk]

Going to push as commit 69d900d.
Since your change was applied there have been 8 commits pushed to the master branch:

• f39fc0a: 8314738: Remove all occurrences of and support for @Revised
• 6b9df03: 8311240: Eliminate usage of testcases.jar from TestMetaSpaceLog.java
• 3e1b1bf: 8314688: VM build without C1 fails after JDK-8313372
• 02ef859: 8313689: C2: compiler/c2/irTests/scalarReplacement/AllocationMergesTests.java fails intermittently with -XX:-TieredCompilation
• ab86d23: 8250269: Replace ATTRIBUTE_ALIGNED with alignas
• a66b5df: 8314618: RISC-V: -XX:MaxVectorSize does not work as expected
• 87298d2: 8312535: MidiSystem.getSoundbank() throws unexpected SecurityException
• 78f74bc: 8314672: ProblemList runtime/cds/appcds/customLoader/HelloCustom_JFR.java on linux-all and windows-x64

Your commit was automatically rebased without conflicts.

[openjdk]

@shipilev Pushed as commit 69d900d.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

[gnu-andrew]

I did notice that this is set for the riscv64 build in make/conf/jib-profiles.js

This configuration only exists to verify that the build works. We don't currently use the binaries for anything. Using "bundled" made devkit creation and maintenance simpler.

For GHA, I think the builds should be configured the way we expect most users to configure them. On Linux, I think linking to a system installed freetype is more common and desired.

I agree, though I have wondered in the past if we should have a build-only run that tests out the non-default options for these (mostly --with-x=system, freetype is the exception).