[oe,meta-browser] firefox: Fix missing references to hardcoded PYTHON

Message ID 20170703172326.9061-1-raj.khem@gmail.com
State New
Headers show

Commit Message

Khem Raj July 3, 2017, 5:23 p.m.
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@gmail.com>

---
 .../firefox/firefox/fix-python-path.patch          | 27 +++++++++++++++-------
 1 file changed, 19 insertions(+), 8 deletions(-)

-- 
2.13.2

-- 
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Patch

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@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