On 07/07/2013 08:30 PM, jackie.hu...@windriver.com wrote:
From: Jackie Huang <jackie.hu...@windriver.com>
Fix the munging of python scripts so that they'll work
on the target, we don't want ${PYTHON}, because that is
the path on the host, not the target.
Signed-off-by: David Borman <david.bor...@windriver.com>
Signed-off-by: Jesse Zhang <sen.zh...@windriver.com>
Signed-off-by: Jackie Huang <jackie.hu...@windriver.com>
---
.../glib-2.0/glib-2.0/glib2-python-ref.patch | 33 ++++++++++++++++++++
meta/recipes-core/glib-2.0/glib-2.0_2.36.2.bb | 1 +
2 files changed, 34 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/glib2-python-ref.patch
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/glib2-python-ref.patch
b/meta/recipes-core/glib-2.0/glib-2.0/glib2-python-ref.patch
new file mode 100644
index 0000000..d2f8d44
--- /dev/null
+++ b/meta/recipes-core/glib-2.0/glib-2.0/glib2-python-ref.patch
@@ -0,0 +1,33 @@
+glib: fix the python script munging for cross compile
+
+Fix the munging of python scripts so that they'll work
+on the target, we don't want ${PYTHON}, because that is
+the path on the host, not the target.
+
+Upstream-status: Inappropriate [ embedded specific ]
+
+Signed-off-by: David Borman <david.bor...@windriver.com>
+Signed-off-by: Jesse Zhang <sen.zh...@windriver.com>
+
+--- glib-2.26.0/glib/Makefile.am
++++ glib-2.26.0/glib/Makefile.am
+@@ -413,7 +413,7 @@
+ mv -f "$(DESTDIR)$(bindir)/$$sf" "$(DESTDIR)$(bindir)/$$sf".tmp \
+ && sed < "$(DESTDIR)$(bindir)/$$sf".tmp > "$(DESTDIR)$(bindir)/$$sf" \
+ -e '1,24s|^ *#@PKGINSTALL_CONFIGVARS_IN24LINES@| ${CONFIGVARS}|' \
+- -e '1,1s|#! /usr/bin/env
python\([0-9]\+\(\.[0-9]\+\)\?\)\?|#!${PYTHON}|' \
++ -e '1,1s|#! /usr/bin/env
python\([0-9]\+\(\.[0-9]\+\)\?\)\?|#!/usr/bin/python|' \
I am not sure hardcoding in /usr/bin/pyhton is correct here either, we
typically use the "/usr/bin/env python", so why not clean up the #! to that?
Sau!
+ || exit $$? ; \
+ chmod a+x $(DESTDIR)$(bindir)/$$sf ; \
+ rm -f "$(DESTDIR)$(bindir)/$$sf".tmp ; \
+--- glib-2.26.0/glib/Makefile.in
++++ glib-2.26.0/glib/Makefile.in
+@@ -1759,7 +1759,7 @@
+ @OS_UNIX_TRUE@ mv -f "$(DESTDIR)$(bindir)/$$sf"
"$(DESTDIR)$(bindir)/$$sf".tmp \
+ @OS_UNIX_TRUE@ && sed < "$(DESTDIR)$(bindir)/$$sf".tmp >
"$(DESTDIR)$(bindir)/$$sf" \
+ @OS_UNIX_TRUE@ -e '1,24s|^ *#@PKGINSTALL_CONFIGVARS_IN24LINES@|
${CONFIGVARS}|' \
+-@OS_UNIX_TRUE@ -e '1,1s|#! /usr/bin/env
python\([0-9]\+\(\.[0-9]\+\)\?\)\?|#!${PYTHON}|' \
++@OS_UNIX_TRUE@ -e '1,1s|#! /usr/bin/env
python\([0-9]\+\(\.[0-9]\+\)\?\)\?|#!/usr/bin/python|' \
+ @OS_UNIX_TRUE@ || exit $$? ; \
+ @OS_UNIX_TRUE@ chmod a+x $(DESTDIR)$(bindir)/$$sf ; \
+ @OS_UNIX_TRUE@ rm -f "$(DESTDIR)$(bindir)/$$sf".tmp ; \
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.36.2.bb
b/meta/recipes-core/glib-2.0/glib-2.0_2.36.2.bb
index d9d8932..ffe34ac 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.36.2.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.36.2.bb
@@ -14,6 +14,7 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz
\
file://fix-conflicting-rand.patch \
file://Makefile-ptest.patch \
file://add-march-i486-into-CFLAGS-automatically.patch \
+ file://glib2-python-ref.patch \
file://run-ptest \
"
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
