diff options
author | André Draszik <andre.draszik@jci.com> | 2018-03-05 09:30:55 +0000 |
---|---|---|
committer | Maxin B. John <maxin.john@intel.com> | 2018-03-05 13:55:30 +0200 |
commit | 9520a8d47a679f7273f011450b15da5f4acd2313 (patch) | |
tree | 3543bcc6e0b4ebb490cad4498efc76446a1204b1 /recipes-core/openjdk/patches-openjdk-8/openjdk8-find-compiler-fix-env-respect.patch | |
parent | 29c72c6dd6e836c2f55734626dbd780dd8db56a7 (diff) | |
download | meta-java-9520a8d47a679f7273f011450b15da5f4acd2313.tar.gz |
openjdk-8: Upgrade to u162b12
- openjdk8-fix-zero-mode-crash.patch was a backport -> dropped
- remaining patches -> refreshed
- license checksum change due to address change in license file
(see patch)
Signed-off-by: André Draszik <andre.draszik@jci.com>
Signed-off-by: Maxin B. John <maxin.john@intel.com>
Diffstat (limited to 'recipes-core/openjdk/patches-openjdk-8/openjdk8-find-compiler-fix-env-respect.patch')
-rw-r--r-- | recipes-core/openjdk/patches-openjdk-8/openjdk8-find-compiler-fix-env-respect.patch | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/recipes-core/openjdk/patches-openjdk-8/openjdk8-find-compiler-fix-env-respect.patch b/recipes-core/openjdk/patches-openjdk-8/openjdk8-find-compiler-fix-env-respect.patch index 0750dac..91d258d 100644 --- a/recipes-core/openjdk/patches-openjdk-8/openjdk8-find-compiler-fix-env-respect.patch +++ b/recipes-core/openjdk/patches-openjdk-8/openjdk8-find-compiler-fix-env-respect.patch | |||
@@ -1,18 +1,18 @@ | |||
1 | --- common/autoconf/toolchain.m4.orig 2015-08-07 20:52:38.000000000 +0200 | 1 | --- common/autoconf/toolchain.m4.orig |
2 | +++ common/autoconf/toolchain.m4 2015-10-27 13:57:19.708566525 +0100 | 2 | +++ common/autoconf/toolchain.m4 |
3 | @@ -27,7 +27,7 @@ | 3 | @@ -77,7 +77,7 @@ AC_DEFUN([TOOLCHAIN_CHECK_COMPILER_VERSI |
4 | # $2 = human readable name of compiler (C or C++) | 4 | # $2 = human readable name of compiler (C or C++) |
5 | AC_DEFUN([TOOLCHAIN_CHECK_COMPILER_VERSION], | 5 | AC_DEFUN([TOOLCHAIN_EXTRACT_COMPILER_VERSION], |
6 | [ | 6 | [ |
7 | - COMPILER=[$]$1 | 7 | - COMPILER=[$]$1 |
8 | + COMPILER="[$]$1" | 8 | + COMPILER="[$]$1" |
9 | COMPILER_NAME=$2 | 9 | COMPILER_NAME=$2 |
10 | 10 | ||
11 | if test "x$OPENJDK_TARGET_OS" = xsolaris; then | 11 | if test "x$OPENJDK_TARGET_OS" = xsolaris; then |
12 | @@ -123,64 +123,37 @@ | 12 | @@ -174,64 +174,37 @@ AC_DEFUN([TOOLCHAIN_FIND_COMPILER], |
13 | [ | 13 | [ |
14 | COMPILER_NAME=$2 | 14 | COMPILER_NAME=$2 |
15 | 15 | ||
16 | - $1= | 16 | - $1= |
17 | + FOUND_$1= | 17 | + FOUND_$1= |
18 | + | 18 | + |
@@ -31,7 +31,7 @@ | |||
31 | + FOUND_$1=$TOOLS_DIR_$1 | 31 | + FOUND_$1=$TOOLS_DIR_$1 |
32 | PATH="$PATH_save" | 32 | PATH="$PATH_save" |
33 | fi | 33 | fi |
34 | 34 | ||
35 | # AC_PATH_PROGS can't be run multiple times with the same variable, | 35 | # AC_PATH_PROGS can't be run multiple times with the same variable, |
36 | # so create a new name for this run. | 36 | # so create a new name for this run. |
37 | - if test "x[$]$1" = x; then | 37 | - if test "x[$]$1" = x; then |
@@ -40,7 +40,7 @@ | |||
40 | - $1=$POTENTIAL_$1 | 40 | - $1=$POTENTIAL_$1 |
41 | + FOUND_$1=$POTENTIAL_$1 | 41 | + FOUND_$1=$POTENTIAL_$1 |
42 | fi | 42 | fi |
43 | 43 | ||
44 | - if test "x[$]$1" = x; then | 44 | - if test "x[$]$1" = x; then |
45 | + if test "x[$]FOUND_$1" = x; then | 45 | + if test "x[$]FOUND_$1" = x; then |
46 | HELP_MSG_MISSING_DEPENDENCY([devkit]) | 46 | HELP_MSG_MISSING_DEPENDENCY([devkit]) |
@@ -86,10 +86,10 @@ | |||
86 | + TEST_COMPILER="[$]FOUND_$1" | 86 | + TEST_COMPILER="[$]FOUND_$1" |
87 | + | 87 | + |
88 | + $1="$TEST_COMPILER" | 88 | + $1="$TEST_COMPILER" |
89 | TOOLCHAIN_CHECK_COMPILER_VERSION([$1], [$COMPILER_NAME]) | 89 | TOOLCHAIN_EXTRACT_COMPILER_VERSION([$1], [$COMPILER_NAME]) |
90 | ]) | 90 | ]) |
91 | 91 | ||
92 | @@ -214,12 +187,12 @@ | 92 | @@ -265,12 +238,12 @@ AC_DEFUN([TOOLCHAIN_SETUP_PATHS], |
93 | # otherwise we might pick up cross-compilers which don't use standard naming. | 93 | # otherwise we might pick up cross-compilers which don't use standard naming. |
94 | # Otherwise, we'll set the BUILD_tools to the native tools, but that'll have | 94 | # Otherwise, we'll set the BUILD_tools to the native tools, but that'll have |
95 | # to wait until they are properly discovered. | 95 | # to wait until they are properly discovered. |
@@ -108,12 +108,12 @@ | |||
108 | fi | 108 | fi |
109 | AC_SUBST(BUILD_CC) | 109 | AC_SUBST(BUILD_CC) |
110 | AC_SUBST(BUILD_CXX) | 110 | AC_SUBST(BUILD_CXX) |
111 | --- common/autoconf/basics.m4.orig 2015-08-31 15:03:54.942975387 +0200 | 111 | --- common/autoconf/basics.m4.orig |
112 | +++ common/autoconf/basics.m4 2015-08-31 15:02:25.090975049 +0200 | 112 | +++ common/autoconf/basics.m4 |
113 | @@ -171,8 +171,15 @@ | 113 | @@ -171,8 +171,15 @@ AC_DEFUN([BASIC_REMOVE_SYMBOLIC_LINKS], |
114 | fi | 114 | fi |
115 | fi | 115 | fi |
116 | 116 | ||
117 | + # First separate the path from the arguments. This will split at the first | 117 | + # First separate the path from the arguments. This will split at the first |
118 | + # space. | 118 | + # space. |
119 | + complete="[$]$1" | 119 | + complete="[$]$1" |
@@ -127,7 +127,7 @@ | |||
127 | else | 127 | else |
128 | # Save the current directory for restoring afterwards | 128 | # Save the current directory for restoring afterwards |
129 | STARTDIR=$PWD | 129 | STARTDIR=$PWD |
130 | @@ -198,8 +205,9 @@ | 130 | @@ -198,8 +205,9 @@ AC_DEFUN([BASIC_REMOVE_SYMBOLIC_LINKS], |
131 | let COUNTER=COUNTER+1 | 131 | let COUNTER=COUNTER+1 |
132 | done | 132 | done |
133 | cd $STARTDIR | 133 | cd $STARTDIR |
@@ -137,4 +137,4 @@ | |||
137 | + $1="$new_path ${arguments% *}" | 137 | + $1="$new_path ${arguments% *}" |
138 | fi | 138 | fi |
139 | ]) | 139 | ]) |
140 | 140 | ||