From 1ff02d0de0da0e7922c395c9031b0ee4fa7448e0 Mon Sep 17 00:00:00 2001 From: Jacob Kroon Date: Thu, 12 Dec 2019 13:00:54 +0100 Subject: cacao: Use python3 in java wrapper script OE-Core has dropped python2 so switch to using python3. Signed-off-by: Jacob Kroon Signed-off-by: Richard Leitner --- .../cacao-1.6.1-do-not-rely-on-absolute-paths.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'recipes-core/cacao') diff --git a/recipes-core/cacao/cacao-2d6f6c14daf9/cacao-1.6.1-do-not-rely-on-absolute-paths.patch b/recipes-core/cacao/cacao-2d6f6c14daf9/cacao-1.6.1-do-not-rely-on-absolute-paths.patch index 2b046cf..665377b 100644 --- a/recipes-core/cacao/cacao-2d6f6c14daf9/cacao-1.6.1-do-not-rely-on-absolute-paths.patch +++ b/recipes-core/cacao/cacao-2d6f6c14daf9/cacao-1.6.1-do-not-rely-on-absolute-paths.patch @@ -27,8 +27,8 @@ index 0790f02..2118de7 100644 + +# if this shell script is invoked through symlink, we get invalid paths. As getting the real path to this file is +# very painful using only /bin/sh, python is used instead. -+PYTHON_STR="import os; print os.path.dirname(os.path.realpath(os.readlink(\"${CURRENT_DIR}/java\"))) if os.path.islink(\"${CURRENT_DIR}/java\") else \"${CURRENT_DIR}\"" -+REAL_DIR=`python -c "${PYTHON_STR}"` ++PYTHON_STR="import os; print(os.path.dirname(os.path.realpath(os.readlink(\"${CURRENT_DIR}/java\"))) if os.path.islink(\"${CURRENT_DIR}/java\") else \"${CURRENT_DIR}\")" ++REAL_DIR=`python3 -c "${PYTHON_STR}"` + +PARENT_DIR=`dirname ${REAL_DIR}` + -- cgit v1.2.3-54-g00ecf