diff options
Diffstat (limited to 'recipes-core/openjdk/patches-openjdk-8/0004-don-t-expect-fqpn-for-make.patch')
-rw-r--r-- | recipes-core/openjdk/patches-openjdk-8/0004-don-t-expect-fqpn-for-make.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/recipes-core/openjdk/patches-openjdk-8/0004-don-t-expect-fqpn-for-make.patch b/recipes-core/openjdk/patches-openjdk-8/0004-don-t-expect-fqpn-for-make.patch new file mode 100644 index 0000000..db00b24 --- /dev/null +++ b/recipes-core/openjdk/patches-openjdk-8/0004-don-t-expect-fqpn-for-make.patch | |||
@@ -0,0 +1,33 @@ | |||
1 | From f4c93547119c7550626e1b2ae2b750ea4f83b3fe Mon Sep 17 00:00:00 2001 | ||
2 | From: Jens Rehsack <rehsack@gmail.com> | ||
3 | Date: Thu, 2 Jan 2020 13:42:43 +0100 | ||
4 | Subject: [PATCH 04/10] don't expect fqpn for make | ||
5 | |||
6 | Signed-off-by: Richard Leitner <richard.leitner@skidata.com> | ||
7 | --- | ||
8 | common/autoconf/basics.m4 | 8 +++++--- | ||
9 | 1 file changed, 5 insertions(+), 3 deletions(-) | ||
10 | |||
11 | diff --git a/common/autoconf/basics.m4 b/common/autoconf/basics.m4 | ||
12 | index 4ee9cdd..c20ea76 100644 | ||
13 | --- a/common/autoconf/basics.m4 | ||
14 | +++ b/common/autoconf/basics.m4 | ||
15 | @@ -740,10 +740,12 @@ AC_DEFUN([BASIC_CHECK_GNU_MAKE], | ||
16 | # We need to find a recent version of GNU make. Especially on Solaris, this can be tricky. | ||
17 | if test "x$MAKE" != x; then | ||
18 | # User has supplied a make, test it. | ||
19 | - if test ! -f "$MAKE"; then | ||
20 | - AC_MSG_ERROR([The specified make (by MAKE=$MAKE) is not found.]) | ||
21 | + if test `dirname "$MAKE"` = "." && ! test -f "$MAKE"; then | ||
22 | + AC_PATH_PROGS(CHECK_MAKE, $MAKE) | ||
23 | + else | ||
24 | + CHECK_MAKE="${MAKE}" | ||
25 | fi | ||
26 | - BASIC_CHECK_MAKE_VERSION("$MAKE", [user supplied MAKE=$MAKE]) | ||
27 | + BASIC_CHECK_MAKE_VERSION("$CHECK_MAKE", [user supplied MAKE=$MAKE]) | ||
28 | if test "x$FOUND_MAKE" = x; then | ||
29 | AC_MSG_ERROR([The specified make (by MAKE=$MAKE) is not GNU make 3.81 or newer.]) | ||
30 | fi | ||
31 | -- | ||
32 | 2.24.1 | ||
33 | |||