[oe] [meta-java][PATCH] cacao: Use python3 in java wrapper script

Jacob Kroon jacob.kroon at gmail.com
Thu Dec 12 12:00:54 UTC 2019


OE-Core has dropped python2 so switch to using python3.

Signed-off-by: Jacob Kroon <jacob.kroon at gmail.com>
---
 .../cacao-1.6.1-do-not-rely-on-absolute-paths.patch           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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}`
 +
-- 
2.23.0



More information about the Openembedded-devel mailing list