[oe] [meta-browser][PATCH] firefox: Fix missing references to hardcoded PYTHON
Khem Raj
raj.khem at gmail.com
Mon Jul 3 17:23:26 UTC 2017
Since OE cross compiles we sometimes will run into this issue
https://bugzilla.mozilla.org/show_bug.cgi?id=1243321
This fix enhances the existing patch to use PYTHON variable
itself to compute the python binary name and uses usr/bin/env
to find it instead of hardcoding it.
Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
.../firefox/firefox/fix-python-path.patch | 27 +++++++++++++++-------
1 file changed, 19 insertions(+), 8 deletions(-)
diff --git a/recipes-mozilla/firefox/firefox/fix-python-path.patch b/recipes-mozilla/firefox/firefox/fix-python-path.patch
index 544c611..963fbae 100644
--- a/recipes-mozilla/firefox/firefox/fix-python-path.patch
+++ b/recipes-mozilla/firefox/firefox/fix-python-path.patch
@@ -9,18 +9,29 @@ Signed-off-by: Fabio Berton <fabio.berton at ossystems.com.br>
js/src/configure | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/js/src/configure b/js/src/configure
-index cce5430..780d201 100755
---- a/js/src/configure
-+++ b/js/src/configure
-@@ -15933,7 +15933,7 @@ echo creating $CONFIG_STATUS
+Index: firefox-45.9.0esr/js/src/configure
+===================================================================
+--- firefox-45.9.0esr.orig/js/src/configure
++++ firefox-45.9.0esr/js/src/configure
+@@ -17061,7 +17061,7 @@ echo creating $CONFIG_STATUS
extra_python_path=${COMM_BUILD:+"'mozilla', "}
cat > $CONFIG_STATUS <<EOF
-#!${PYTHON}
-+#!/usr/bin/python
++#!/usr/bin/env `basename $PYTHON`
+ # coding=$encoding
+
+ import os
+Index: firefox-45.9.0esr/configure
+===================================================================
+--- firefox-45.9.0esr.orig/configure
++++ firefox-45.9.0esr/configure
+@@ -30461,7 +30461,7 @@ echo creating $CONFIG_STATUS
+ extra_python_path=${COMM_BUILD:+"'mozilla', "}
+
+ cat > $CONFIG_STATUS <<EOF
+-#!${PYTHON}
++#!/usr/bin/env `basename ${PYTHON}`
# coding=$encoding
import os
---
-2.1.4
--
2.13.2
More information about the Openembedded-devel
mailing list