Conversation
We're not supporting 32 bit x86 builds anyway, so we don't need this change. This work was sponsored by The FreeBSD Foundation
Updates the makefiles to set up for compilation and building for *BSD. This is a cleaned up diff towards the existing BSD port from the battleblow/jdk repository. Some parts have been held back for later PRs, mainly because I expect them to require more thorough review. (Some is also probably outdated, and we'll go through those first.) This work is sponsored by The FreeBSD Foundation. Co-authored-by: Greg Lewis <glewis@openjdk.org> Co-authored-by: Kurt Miller <bsdkurt@openjdk.org>
|
👋 Welcome back haraldei! A progress list of the required criteria for merging this PR into |
|
@snake66 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: 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 no new commits pushed to the ➡️ To integrate this PR with the above commit message to the |
Webrevs
|
make/common/native/Link.gmk
Outdated
| endif | ||
| endif | ||
| ifeq ($(OPENJDK_TARGET_OS_ENV), bsd.netbsd) | ||
| /usr/sbin/paxctl +m $$@ |
There was a problem hiding this comment.
I don't know what this tool is, but in general we prefer looking up tools in configure and using them through a variable. This allows for a uniform way of overriding any tool at configure time.
There was a problem hiding this comment.
Changed in latest patch by adding it to make/autoconf/basic_tools.m4, and use variable for access.
make/modules/java.desktop/Lib.gmk
Outdated
| include lib/ClientLibraries.gmk | ||
|
|
||
| ifeq ($(call isTargetOs, aix), false) | ||
| ifneq ($(OPENJDK_TARGET_OS_ENV), bsd.openbsd) |
There was a problem hiding this comment.
Use isTargetOsEnv?
Also please fix indentation of the block.
There was a problem hiding this comment.
Changes in latest version of the patch.
make/modules/jdk.sctp/Java.gmk
Outdated
| EXCLUDE_FILES += $(SCTP_IMPL_CLASSES) | ||
| endif | ||
|
|
||
| ifeq ($(OPENJDK_TARGET_OS_ENV), bsd.openbsd) |
There was a problem hiding this comment.
Changed in latest version of the patch.
make/modules/jdk.sctp/Lib.gmk
Outdated
| ifeq ($(call isTargetOs, linux), true) | ||
| SCTP_SUPPORTED=true | ||
| endif | ||
| ifeq ($(OPENJDK_TARGET_OS_ENV), bsd.freebsd) |
There was a problem hiding this comment.
Could use $(call Or,...) to avoid duplication.
There was a problem hiding this comment.
Changed in latest version of the patch.
make/test/JtregNativeJdk.gmk
Outdated
| BUILD_JDK_JTREG_LIBRARIES_JDK_LIBS_libInheritedChannel := java.base:libjava | ||
| BUILD_JDK_JTREG_EXECUTABLES_LIBS_exelauncher := -pthread | ||
| endif | ||
| ifeq ($(OPENJDK_TARGET_OS_ENV), bsd.openbsd) |
There was a problem hiding this comment.
Changed in latest version of the patch.
make/RunTestsPrebuilt.gmk
Outdated
| OPENJDK_TARGET_OS := linux | ||
| else ifeq ($(UNAME_OS), Darwin) | ||
| OPENJDK_TARGET_OS := macosx | ||
| else ifneq ($(findstring BSD,$(UNAME_OS)),) |
There was a problem hiding this comment.
We prefer space after comma when possible. https://openjdk.org/groups/build/doc/code-conventions.html
There was a problem hiding this comment.
I agree that's nicer. Changed in latest version of the patch.
make/modules/jdk.sctp/Lib.gmk
Outdated
| SCTP_SUPPORTED=true | ||
| endif | ||
| ifeq ($(OPENJDK_TARGET_OS_ENV), bsd.freebsd) | ||
| ifeq ($(call Or $(call isTargetOs, linux) $(call isTargetOsEnv, bsd.freebsd)), true) |
There was a problem hiding this comment.
Good catch! Fixed now. Seemed to work without it too, but not sure why.
Looks like it's the first non-test use of this macro :)
|
Thanks a lot for the reviews! |
|
/integrate |
|
Going to push as commit bb48416. |
Updates the makefiles to set up for compilation and building for *BSD.
This is a cleaned up diff towards the existing BSD port from the
battleblow/jdk repository.
Some parts have been held back for later PRs, mainly because I expect
them to require more thorough review. (Some is also probably outdated,
and we'll go through those first.)
This work is sponsored by The FreeBSD Foundation.
Co-authored-by: @battleblow
Co-authored-by: @bsdkurt
Progress
Reviewers
Reviewing
Using
gitCheckout this PR locally:
$ git fetch https://git.openjdk.org/bsd-port.git pull/6/head:pull/6$ git checkout pull/6Update a local copy of the PR:
$ git checkout pull/6$ git pull https://git.openjdk.org/bsd-port.git pull/6/headUsing Skara CLI tools
Checkout this PR locally:
$ git pr checkout 6View PR using the GUI difftool:
$ git pr show -t 6Using diff file
Download this PR as a diff file:
https://git.openjdk.org/bsd-port/pull/6.diff
Using Webrev
Link to Webrev Comment