[meta-java][PATCH] openjdk-8: use relative path to build-aux in configure.ac

[meta-java][PATCH] openjdk-8: use relative path to build-aux in configure.ac

[S. Lockwood-Childs]

This autoconf error has been present a long time, though it used to be non-fatal:

  autoreconf: configure.ac: creating directory $TOPDIR/common/autoconf/build-aux
  autoreconf: error: cannot create $TOPDIR/common/autoconf/build-aux: No such file or directory

Recently it started leading to a second fatal error:

  Error in tempfile() using template $TOPDIR/common/autoconf/build-aux/XXXXXXXXXX:
         Parent directory ($TOPDIR/common/autoconf/build-aux/) does not exist

Fix by patching configure.ac to take into account that bitbake is
calling autoreconf directly from its parent directory rather than
the top level of source.

Signed-off-by: S. Lockwood-Childs <sjl@vctlabs.com>
---
 .../openjdk/openjdk-8-release-common.inc      |  1 +
 .../0014-autoconf-fix-build-aux-path.patch    | 30 +++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 recipes-core/openjdk/patches-openjdk-8/0014-autoconf-fix-build-aux-path.patch

diff --git a/recipes-core/openjdk/openjdk-8-release-common.inc b/recipes-core/openjdk/openjdk-8-release-common.inc
index a3747cf..db6a4ab 100644
--- a/recipes-core/openjdk/openjdk-8-release-common.inc
+++ b/recipes-core/openjdk/openjdk-8-release-common.inc
@@ -10,6 +10,7 @@ PATCHES_URI = "\
     file://0009-prevent-debuginfo-in-favour-of-openembedded-package-.patch \
     file://0010-autoconf-remove-shell-variables-from-autoheader.patch \
     file://0013-autoconf-remove-Werror.patch \
+    file://0014-autoconf-fix-build-aux-path.patch \
     ${HOTSPOT_UB_PATCH} \
     file://2001-jdk-comparison-between-pointer-and-integer.patch \
     file://2002-jdk-Allow-using-a-system-installed-libjpeg.patch \
diff --git a/recipes-core/openjdk/patches-openjdk-8/0014-autoconf-fix-build-aux-path.patch b/recipes-core/openjdk/patches-openjdk-8/0014-autoconf-fix-build-aux-path.patch
new file mode 100644
index 0000000..45dbcd8
--- /dev/null
+++ b/recipes-core/openjdk/patches-openjdk-8/0014-autoconf-fix-build-aux-path.patch
@@ -0,0 +1,30 @@
+From 2246166945819a68d1c9facd1698c9ef430611a6 Mon Sep 17 00:00:00 2001
+From: "S. Lockwood-Childs" <sjl@vctlabs.com>
+Date: Wed, 17 Mar 2021 15:21:54 -0700
+Subject: [PATCH] autoconf: fix build-aux path
+
+Unlike the upstream build wrapper script, bitbake recipe calls
+autoconf directly from common/autoreconf directory. Adjust the
+path to build-aux directory accordingly.
+
+Signed-off-by: S. Lockwood-Childs <sjl@vctlabs.com>
+---
+ common/autoconf/configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/common/autoconf/configure.ac b/common/autoconf/configure.ac
+index 67a230591f..00f3b0ef7e 100644
+--- a/common/autoconf/configure.ac
++++ b/common/autoconf/configure.ac
+@@ -33,7 +33,7 @@
+ AC_PREREQ([2.69])
+ AC_INIT(OpenJDK, jdk8, build-dev@openjdk.java.net,,http://openjdk.java.net)
+ 
+-AC_CONFIG_AUX_DIR([$TOPDIR/common/autoconf/build-aux])
++AC_CONFIG_AUX_DIR([build-aux])
+ m4_include([build-aux/pkg.m4])
+ 
+ # Include these first...
+-- 
+2.17.1
+
-- 
2.20.1

Re: [meta-java][PATCH] openjdk-8: use relative path to build-aux in configure.ac

[konstantin.kletschke]

[-- Attachment #1: Type: text/plain, Size: 672 bytes --]

Dear S.,
many thanks for your kind effort providing the patch.

I integrated it into my local build environment and I got a native openjre-8 build into my root file system installed, HEUREKA!
It is not tested though but I suppose it will work.

The next days I will try to incorporate this change into my desired openjre-14 target (the initial report was done with that) but I struggle a bit with that because the structure is slightly/more different - no configure.ac in sight...
I will do my best and report if I manage to sort of port this to the openjre-14, any helpt is appreciated, though.

But as said, many thanks for the hint!!!

Kind Regards
Konsti

[-- Attachment #2: Type: text/html, Size: 732 bytes --]

Re: [meta-java][PATCH] openjdk-8: use relative path to build-aux in configure.ac

[konstantin.kletschke]

[-- Attachment #1: Type: text/plain, Size: 2139 bytes --]

I incorporated two patches into my local meta-java layer. Then openjre-14 builds also!

*diff --git a/recipes-core/openjdk/openjdk-14-common.inc b/recipes-core/openjdk/openjdk-14-common.inc*

*index 36451b8..df99626 100644*

*--- a/recipes-core/openjdk/openjdk-14-common.inc*

*+++ b/recipes-core/openjdk/openjdk-14-common.inc*

@@ -30,6 +30,8 @@ SRC_URI = "\

https://hg.openjdk.java.net/jdk-updates/jdk14u/archive/jdk-${PV}-ga.tar.bz2;name=jdk \

file://0001-make-autoconf-remove-hard-dependency-on-cups.patch \

file://0002-make-autoconf-toolchain-remove-invalid-compiler-chec.patch \

+    file://0066-autoconf-fix-build-aux-path.patch \

+    file://0067-sysctl-path-fix.patch \

"

*cat patches-openjdk-14/0066-autoconf-fix-build-aux-path.patch*

diff --color -Nur jdk14u-jdk-14.0.1-ga.ORIG/make/autoconf/configure.ac jdk14u-jdk-14.0.1-ga/make/autoconf/configure.ac

--- jdk14u-jdk-14.0.1-ga.ORIG/make/autoconf/configure.ac 2020-03-05 13:10:05.000000000 +0100

+++ jdk14u-jdk-14.0.1-ga/make/autoconf/configure.ac 2021-03-20 15:59:41.985648025 +0100

@@ -33,7 +33,7 @@

AC_PREREQ([2.69])

AC_INIT(OpenJDK, openjdk, build-dev@openjdk.java.net,,http://openjdk.java.net)

-AC_CONFIG_AUX_DIR([$TOPDIR/make/autoconf/build-aux])

+AC_CONFIG_AUX_DIR([build-aux])

m4_include([build-aux/pkg.m4])

# Include these first...

*cat patches-openjdk-14/0067-sysctl-path-fix.patch*

diff --color -Nur jdk14u-jdk-14.0.1-ga.ORIG/src/jdk.incubator.jpackage/unix/native/libapplauncher/PosixPlatform.cpp jdk14u-jdk-14.0.1-ga/src/jdk.incubator.jpackage/unix/native/libapplauncher/PosixPlatform.cpp

--- jdk14u-jdk-14.0.1-ga.ORIG/src/jdk.incubator.jpackage/unix/native/libapplauncher/PosixPlatform.cpp 2020-03-05 13:10:05.000000000 +0100

+++ jdk14u-jdk-14.0.1-ga/src/jdk.incubator.jpackage/unix/native/libapplauncher/PosixPlatform.cpp 2021-03-20 19:15:37.959412799 +0100

@@ -33,7 +33,7 @@

#include <stdbool.h>

#include <sys/types.h>

#include <unistd.h>

-#include <sys/sysctl.h>

+#include <linux/sysctl.h>

#include <sys/file.h>

#include <sys/stat.h>

#include <sys/wait.h>

[-- Attachment #2: Type: text/html, Size: 10380 bytes --]

Re: [oe] [meta-java][PATCH] openjdk-8: use relative path to build-aux in configure.ac

[Richard Leitner]

Hi,
thanks for the patch.

Please find some comments below.

On Wed, Mar 17, 2021 at 03:58:02PM -0700, S. Lockwood-Childs wrote:
> This autoconf error has been present a long time, though it used to be non-fatal:
> 
>   autoreconf: configure.ac: creating directory $TOPDIR/common/autoconf/build-aux
>   autoreconf: error: cannot create $TOPDIR/common/autoconf/build-aux: No such file or directory
> 
> Recently it started leading to a second fatal error:
> 
>   Error in tempfile() using template $TOPDIR/common/autoconf/build-aux/XXXXXXXXXX:
>          Parent directory ($TOPDIR/common/autoconf/build-aux/) does not exist
> 
> Fix by patching configure.ac to take into account that bitbake is
> calling autoreconf directly from its parent directory rather than
> the top level of source.
> 
> Signed-off-by: S. Lockwood-Childs <sjl@vctlabs.com>
> ---
>  .../openjdk/openjdk-8-release-common.inc      |  1 +
>  .../0014-autoconf-fix-build-aux-path.patch    | 30 +++++++++++++++++++
>  2 files changed, 31 insertions(+)
>  create mode 100644 recipes-core/openjdk/patches-openjdk-8/0014-autoconf-fix-build-aux-path.patch
> 
> diff --git a/recipes-core/openjdk/openjdk-8-release-common.inc b/recipes-core/openjdk/openjdk-8-release-common.inc
> index a3747cf..db6a4ab 100644
> --- a/recipes-core/openjdk/openjdk-8-release-common.inc
> +++ b/recipes-core/openjdk/openjdk-8-release-common.inc
> @@ -10,6 +10,7 @@ PATCHES_URI = "\
>      file://0009-prevent-debuginfo-in-favour-of-openembedded-package-.patch \
>      file://0010-autoconf-remove-shell-variables-from-autoheader.patch \
>      file://0013-autoconf-remove-Werror.patch \
> +    file://0014-autoconf-fix-build-aux-path.patch \
>      ${HOTSPOT_UB_PATCH} \
>      file://2001-jdk-comparison-between-pointer-and-integer.patch \
>      file://2002-jdk-Allow-using-a-system-installed-libjpeg.patch \
> diff --git a/recipes-core/openjdk/patches-openjdk-8/0014-autoconf-fix-build-aux-path.patch b/recipes-core/openjdk/patches-openjdk-8/0014-autoconf-fix-build-aux-path.patch
> new file mode 100644
> index 0000000..45dbcd8
> --- /dev/null
> +++ b/recipes-core/openjdk/patches-openjdk-8/0014-autoconf-fix-build-aux-path.patch
> @@ -0,0 +1,30 @@
> +From 2246166945819a68d1c9facd1698c9ef430611a6 Mon Sep 17 00:00:00 2001
> +From: "S. Lockwood-Childs" <sjl@vctlabs.com>
> +Date: Wed, 17 Mar 2021 15:21:54 -0700
> +Subject: [PATCH] autoconf: fix build-aux path

Please re-apply the whole patch series (or adapt the subjects manually)
so we get a nice-and-clean [PATCH xx/yy] in all subjects.

> +
> +Unlike the upstream build wrapper script, bitbake recipe calls
> +autoconf directly from common/autoreconf directory. Adjust the
> +path to build-aux directory accordingly.

Please add an "Upstream-Status:" tag here.

> +
> +Signed-off-by: S. Lockwood-Childs <sjl@vctlabs.com>
> +---
> + common/autoconf/configure.ac | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/common/autoconf/configure.ac b/common/autoconf/configure.ac
> +index 67a230591f..00f3b0ef7e 100644
> +--- a/common/autoconf/configure.ac
> ++++ b/common/autoconf/configure.ac
> +@@ -33,7 +33,7 @@
> + AC_PREREQ([2.69])
> + AC_INIT(OpenJDK, jdk8, build-dev@openjdk.java.net,,http://openjdk.java.net)
> + 
> +-AC_CONFIG_AUX_DIR([$TOPDIR/common/autoconf/build-aux])
> ++AC_CONFIG_AUX_DIR([build-aux])
> + m4_include([build-aux/pkg.m4])
> + 
> + # Include these first...
> +-- 
> +2.17.1
> +
> -- 
> 2.20.1
> 

Apart from that the patch looks fine. I'll fire it through my automated
tests and give feedback if something fails. Apart from that I'm waiting
for a v2 from you.

Thanks again.

regards;rl