[jdk11u-dev] RFR: 8239708: Split basics.m4 into basic.m4 and util.m4 [v4]

Christoph Langer clanger at openjdk.org
Thu Sep 1 06:30:22 UTC 2022


On Thu, 4 Aug 2022 11:31:21 GMT, George Adams <duke at openjdk.org> wrote:

>> The main conflict is the lack of the WSL backport ([8215445: Enable building for Windows in WSL](https://github.com/openjdk/jdk/commit/46eb26b692ac7f9431d5b479028ec87e56707557)) Something which doesn't apply particularly cleanly and isn't required to achieve the MSYS2 backport that I'm trying to reach.
>> 
>> This backport will also considerably help many build/toolchain backports going forwards as this one nearly always trips me up when I backport patches.
>> 
>> This backport will allow me to more easily backport [8257679: Improved unix compatibility layer in Windows build (winenv)](https://github.com/openjdk/jdk/commit/d29c78da).
>> 
>> @RealCLanger / @GoeLin I suggest that this is run through the full SAP nightlies before this is merged.
>
> George Adams has refreshed the contents of this pull request, and previous commits have been removed. The incremental views will show differences compared to the previous content of the PR. The pull request contains one new commit since the last revision:
> 
>   Backport 63f939636a5fe9871f5f9057c93ed5b1a9924265

Looks merely good now. I have two minor nits and I was wondering why you did not complete the backport of the pandoc change 8217032 (https://github.com/openjdk/jdk11u-dev/pull/1315). I think we figured out that we should rather not do the larger pandoc changes but this one could still be nice to take over.
In autoconf/basic_tools.m4, the AC_DEFUN_ONCE([BASIC_SETUP_PANDOC] stuff is missing currently which is contained in the upstream change for 8239708.

make/autoconf/basic.m4 line 93:

> 91:   UTIL_FIXUP_PATH(TOPDIR)
> 92: 
> 93:   if test "x$CUSTOM_ROOT" != x; then

Please move this `if test "x$CUSTOM_ROOT" != x; then`... block before `# We can only call UTIL_FIXUP_PATH after BASIC_CHECK_PATHS_WINDOWS.`, just like in https://github.com/openjdk/jdk/commit/4df99aa7aeaed0d6132ca5c86f803f1096df8841

make/autoconf/basic_tools.m4 line 290:

> 288:   elif test "x$TAR_TYPE" = "aix"; then
> 289:     # -L InputList of aix tar: name of file listing the files and directories
> 290:     # that need to be   archived or extracted

Can you remove the spaces here as in https://github.com/openjdk/jdk/commit/36bf6fbe0839cebce5e66ba680a73353703152aa, since JDK-8285728 has already been backported.

-------------

Changes requested by clanger (Reviewer).

PR: https://git.openjdk.org/jdk11u-dev/pull/1277


More information about the jdk-updates-dev mailing list