Add OpenJDK 23 to ports

[haraldei_anduin.net]

Summary

Pretty much just a copy of the java/openjdk22 port, but updated for OpenJDK 23.

[bofh]

Some minor tweaks. Apart from that there are two more files which needs to be addressed:

• java/Makefile
• Mk/bsd.java.mk

java/openjdk23/Makefile

17

This should be USES=autoreconf:build

99

I think we should just keep it FreeBSD

100

This should point to FreeBSD website rather than anything else.

java/openjdk23/pkg-descr

2

Mostly this file remains unchanged. So no point in adding the word Initial.

5

12 has reached EOL. So we should not mention it here.

[jrm]

I fired off some poudriere jobs to test the build and will report back when they are done. On quick inspection, I see you need an openjdk23 entry in java/Makefile.

[haraldei_anduin.net]

java/openjdk23/Makefile

99

This is the same as for the other openjdk versions. I'll leave it for now, and wait to see if any of the other reviewers have any opinions on it.

100

This is the same as for the other openjdk versions. I'll leave it for now, and wait to see if any of the other reviewers have any opinions on it.

[jrm]

Builds look good:

https://pkg.ftfl.ca/data/13amd64-default/2024-12-24_13h48m21s/logs/openjdk23-23.0.1+11.1.log
https://pkg.ftfl.ca/data/14amd64-default/2024-12-24_13h39m39s/logs/openjdk23-23.0.1+11.1.log
https://pkg.ftfl.ca/data/15amd64-default/2024-12-24_12h46m12s/logs/openjdk23-23.0.1+11.1.log

[haraldei_anduin.net]

Update based on feedback.

[bofh]

Mk/bsd.java.mk

187

These are not the only changes that are required. There are other changes that should be done. Recheck the bsd.java.mk file.

[lwhsu]

One very minor stuff, we can update the comment in Mk/bsd.default-versions.mk

And FWIW, we should consider changing the JAVA_DEFAULT in the future. :-)

[lwhsu]

Mk/bsd.java.mk

184

HOME=${LOCALBASE}/openjdk22 ?

java/openjdk23/distinfo

1

This seems copied from java/openjdk22, not a serious issue, but this distinfo file can be generated from this comment make makesum
Having TIMESTAMP earlier than the port is created is a bit odd.

[lwhsu]

Another thing also not directly related to this openjdk23 port is that the bootstrap chain would be long this time. It would be 23 -> 22 -> 21 -> 20 -> 19 -> 18 -> 17. We may want to create bootstrap-openjdk21 in the future, before openjdk17 decommission.

[lwhsu]

Mk/bsd.java.mk

185

Also this openjdk22 addition (fix missing) part is better to be in another commit. We can land this one first.

[haraldei_anduin.net]

Mk/bsd.java.mk

184

Good catch, but I removed it entirely as suggested in your next comment :)

[haraldei_anduin.net]

Think I got all the parts of Mk/bsd.java.mk covered now, but please check as I'm not all that familiar with how it works.

Also updated the timestamp in the distinfo file, and removed the openjdk22 entry from Mk/bsd.java.mk.

[bofh]

I have created a bug report https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=283600 for adding the openjdk22. Have a look at it as it will give some idea about the changes required.

[bofh]

In D48194#1098982, @lwhsu wrote:

Another thing also not directly related to this openjdk23 port is that the bootstrap chain would be long this time. It would be 23 -> 22 -> 21 -> 20 -> 19 -> 18 -> 17. We may want to create bootstrap-openjdk21 in the future, before openjdk17 decommission.

Considering 17 as an LTS version of somewhat although openjdk builds are not considered LTS I think we should concentrate on bootstrap-openjdk21 and decommission 18, 29 and 20.

[lwhsu]

In D48194#1099000, @bofh wrote:

In D48194#1098982, @lwhsu wrote:

Another thing also not directly related to this openjdk23 port is that the bootstrap chain would be long this time. It would be 23 -> 22 -> 21 -> 20 -> 19 -> 18 -> 17. We may want to create bootstrap-openjdk21 in the future, before openjdk17 decommission.

Considering 17 as an LTS version of somewhat although openjdk builds are not considered LTS I think we should concentrate on bootstrap-openjdk21 and decommission 18, 29 and 20.

I think that's exactly what I mean? 21 is another LTS and eventually we need to use it as the next bootstrap base.

[haraldei_anduin.net]

In D48194#1098993, @bofh wrote:

I have created a bug report https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=283600 for adding the openjdk22. Have a look at it as it will give some idea about the changes required.

Thanks!

[diizzy]

java/openjdk23/Makefile

42

CC, CXX, CPP are already defined by the framework?

43

You're probably looking for https://cgit.freebsd.org/ports/tree/Mk/bsd.port.mk#n346 ?

72

Are you sure these (CC, CXX CPP) needs to be defined as they're set by the framework?

83

Are *-include and *-lib necessary? They don't get picked up by pkgconfig or are you missing USES= localbase:ldflags or localbase?

[haraldei_anduin.net]

More changes based on feedback.

[emaste]

@haraldei_anduin.net for the next update (if any) please generate patches with git diff -U999999 or git show -U9999999 so that phabricator will be able to expand context.

[glewis]

I think the main thing from my point of view is to fix the regex in bsd,java,mk

Mk/bsd.default-versions.mk

76 ↗

(On Diff #148403)

I think we should add 22 at the same time here, unless there is a reason not to. Was there a discussion about doing that separately perhaps instead that I missed? Same comment for other files.

Mk/bsd.java.mk

281

It looks like there is an extra / that has been added here for expanding 21+. It should be :S/^21+/21 23+/:S/^23+/23/ (note the removal of the / in 21 13+

java/openjdk23/Makefile

30

Nit: seems more indented than surrounding lines

59–62

I think this is the right thing to do, since upstream has for some reason been poor about pushing tags to the jdk23u repo, but in reality we're somewhere in between 23.0.1 and 23.0.2.

[emaste]

java/openjdk23/Makefile

30

Note that Phabricator may render hard tabs poorly, and it is possible that this is not actually an issue.

[haraldei_anduin.net]

Mk/bsd.default-versions.mk

76 ↗

(On Diff #148403)

Yes, it was suggested to do that separately, and there's a patch for that here. I'll probably rebase on top of that when it's merged.

Mk/bsd.java.mk

281

Good catch! I'll fix.

[haraldei_anduin.net]

Updated regex in Mk/bsd.java.mk and fixed indentation in openjdk23/Makefile

[glewis]

Mk/bsd.default-versions.mk

76 ↗

(On Diff #148403)

Great. The diff there looks good to me.

java/openjdk23/Makefile

30

That's fair. Was just going by what I could see

[bofh]

I have pushed the commit for openjdk22 so you might rebase and update the patch.

[haraldei_anduin.net]

Rebased on top of bofh's openjdk22 additions.

[arrowd]

java/openjdk23/Makefile

41

Why this var? If the port doesn't build with multiple jobs, the MAKE_JOBS_UNSAFE=yes knob should be set.

42

Why this knob? C.UTF-8 is default, unless meson or cabal is used.

java/openjdk23/files/patch-configure

6

This patch is probably useless, since we're using autoreconf.

[jrm]

@arrowd, thanks for catching those things. I believe Harald will investigate the original reasons for setting LOCALE to C and test with the default locale.

[glewis]

In D48194#1100442, @jrm wrote:

@arrowd, thanks for catching those things. I believe Harald will investigate the original reasons for setting LOCALE to C and test with the default locale.

IIRC the original reason was simply that the build failed when using other locales. However, that was many versions ago now and may no longer be the case.