Merge pull request meta-rust#47 from kraj/kraj/master

firefox: Fix missing references to hardcoded PYTHON
webdino · Jul 3, 2017 · 0376ff8 · 0376ff8
2 parents 748d872 + ba76a6b
commit 0376ff8
Showing 1 changed file with 19 additions and 8 deletions.
diff --git 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