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

[Christoph Langer]

On Thu, 28 Jul 2022 12:44:22 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.

I've finally managed to review this backport a bit more in depth.

First of all, there are some other changes of which you bring in some parts but not everything. There are a few which are good candidates for backports as well, so I would recommend to do so before merging this patch. Namely:

https://bugs.openjdk.org/browse/JDK-8218413 (https://github.com/openjdk/jdk/commit/9efdb33a59f7db7b4b39e113265a3b3ba513c5d3)

https://bugs.openjdk.org/browse/JDK-8217032 (https://github.com/openjdk/jdk/commit/4f45b5f9739e5a5e7d1c4f80da9c42e0d77dd0bf)

https://bugs.openjdk.org/browse/JDK-8221907 (https://github.com/openjdk/jdk/commit/0974861dd800fdb44b3888e68b08c570f1985b58)

https://bugs.openjdk.org/browse/JDK-8233712 (https://github.com/openjdk/jdk/commit/753c58b7f556fedd7828da487a34b8b228785ff9)

Then, from https://bugs.openjdk.org/browse/JDK-8211724 (https://github.com/openjdk/jdk/commit/d3458328a28704288daccc1ed036bae3df6a37e6) you bring a little hunk: `BASIC_REQUIRE_PROGS(MKDIR, [gmkdir mkdir])`. That's ok and the rest of the change is too much, so that's alright.

https://bugs.openjdk.org/browse/JDK-8206125 (https://github.com/openjdk/jdk/commit/7ae384b2ad25d39f271f936ee98ab28a5f92fa94) is partly implemented in your change. Some hunks in new util_windows.m4 are missing, however. Please make sure it's completely contained in your backport and add the issue to this PR then.

https://bugs.openjdk.org/browse/JDK-8213239 (https://github.com/openjdk/jdk/commit/68dbbf566d8d504308367005048d274aebfd5b50) is contained in your PR. Please mark as backported by adding it to this PR.

https://bugs.openjdk.org/browse/JDK-8240972: Make sure that the changes don't get lost. The implementation file is a different before and after this change. See: https://github.com/openjdk/jdk11u-dev/commit/f771367f73bd01648a454fdd0298b8b4479a3ca0 vs. https://github.com/openjdk/jdk/commit/e30b89e1389ccd7bd2c6bb2265a3110f6fcd31de

Then, the backport of https://bugs.openjdk.org/browse/JDK-8285728 (https://github.com/openjdk/jdk11u-dev/commit/f00776b653b9d0e1d556c6b44446fe18d72617c1) must not be lost which it currently would.

And finally, we should thoroughly check whether the fix for `8226346: Build better binary builders` (non-public bug, contained in a CPU release) is still intact after this PR. The implementation file is also different, see https://github.com/openjdk/jdk11u-dev/commit/3e9a9c9c4955185ae2be6dd97ddf1c03a4588395 vs. https://github.com/openjdk/jdk/commit/4df99aa7aeaed0d6132ca5c86f803f1096df8841

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

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