Page MenuHomeFreeBSD
Differential D53707

java/openjdk25: Add jre_headless flavor
Needs ReviewPublic
Actions

Authored by haraldei on Wed, Nov 12, 1:44 PM.
Tags
None
Referenced Files
Unknown Object (File)
Fri, Nov 14, 12:10 PM
Unknown Object (File)
Fri, Nov 14, 11:41 AM
Unknown Object (File)
Fri, Nov 14, 5:54 AM
Unknown Object (File)
Fri, Nov 14, 5:48 AM
Unknown Object (File)
Thu, Nov 13, 9:21 AM
Unknown Object (File)
Thu, Nov 13, 2:30 AM
Unknown Object (File)
Wed, Nov 12, 10:50 PM
Unknown Object (File)
Wed, Nov 12, 10:06 PM
View All 10 Files
Subscribers
None

Details

Reviewers
fuz
bofh
jrm
emaste
glewis
Summary

Add flavor to make a headless jre package, where dev tools and x11
support is removed. As requested in Bug #266059.
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=266059

Sponsored by: The FreeBSD Foundation

Diff Detail

Repository
R11 FreeBSD ports repository
Lint
No Lint Coverage
Unit
No Test Coverage
Build Status
Buildable 68590
Build 65473: arc lint + arc unit

Event Timeline

haraldei requested review of this revision.Wed, Nov 12, 1:44 PM
haraldei created this revision.
Harbormaster completed remote builds in B68568: Diff 166294.Wed, Nov 12, 1:44 PM
fuz accepted this revision.Wed, Nov 12, 2:16 PM

Looks reasonable. I trust you to have tested this change well.

This revision is now accepted and ready to land.Wed, Nov 12, 2:16 PM
jrm added inline comments.Wed, Nov 12, 3:33 PM
java/openjdk25/Makefile
21

Do you need && ${FLAVORS:U} != jre_headless here?

36–43

Nit: Without changing default tab width, the alignment in vi and Emacs looks approximately as shown here.

haraldei added a comment.Wed, Nov 12, 5:01 PM
In D53707#1226353, @fuz wrote:

Looks reasonable. I trust you to have tested this change well.

Will go though my standard tests tomorrow. Tomcat, and a few others.

java/openjdk25/Makefile
21

Good catch! I do think I do.

Won't make a difference to the build itself, but the point it to not require all these dependencies :)

36–43

Ai, I'll fix that.

haraldei updated this revision to Diff 166343.Thu, Nov 13, 8:27 AM
  • java/openjdk25: Fix review comments
This revision now requires review to proceed.Thu, Nov 13, 8:27 AM
Harbormaster completed remote builds in B68590: Diff 166343.Thu, Nov 13, 8:27 AM
haraldei updated this revision to Diff 166345.Thu, Nov 13, 9:31 AM
  • java/openjdk25: Fix minor typo causing wrong pkg name
Harbormaster completed remote builds in B68591: Diff 166345.Thu, Nov 13, 9:31 AM
haraldei marked 2 inline comments as done.Thu, Nov 13, 9:32 AM

Think I fixed all issues now.

Also tested various network and non-gui apps, in addition to tuxguitar which works despite being a gui app due to using swt instead of awt for the gui.

fuz added a comment.Thu, Nov 13, 9:58 AM

Also perhaps consider .if ${FLAVOR:Mheadless} to simplify the logic.

java/openjdk25/Makefile
21

FLAVORS is not set at this point and is the wrong macro anyway. You should move the definition of FLAVORS and FLAVOR above this point so that FLAVOR is guaranteed to be set when the .if is evaluated.

32
50
59
92
jrm added inline comments.Thu, Nov 13, 3:20 PM
java/openjdk25/Makefile
21

The editors/emacs port is doing a lot of the same things with flavors as you are here. You may find it helpful to have a gander at it.

fuz added inline comments.Thu, Nov 13, 3:58 PM
java/openjdk25/Makefile
21

I don't understand the point you are trying to make.

jrm added inline comments.Thu, Nov 13, 4:14 PM
java/openjdk25/Makefile
21

After you correctly pointed out that FLAVORS was the wrong variable and that the order should be adjusted, I thought it might be helpful for Harald to look at another port Makefile that does something similar. For example, it defines FLAVOR right after the dependencies and includes some <flavor>_CONFLICTS_INSTALL lines that might be relevant here.

Revision Contents
Changeset List

PathSize
java/
openjdk25/
23 lines

Diff 166343

View Options

java/openjdk25/Makefile

Loading...