From: Morgan Little <morgan.little@windriver.com>
To: <openembedded-core@lists.openembedded.org>
Subject: [PATCH 02/20] python: Update for python-native changes
Date: Fri, 13 Jul 2012 09:54:51 -0400 [thread overview]
Message-ID: <1342187709-19368-3-git-send-email-morgan.little@windriver.com> (raw)
In-Reply-To: <1342187709-19368-1-git-send-email-morgan.little@windriver.com>
Add pythonnative onto the list of inherits and update the paths to the binaries
referenced in the recipe to the new paths.
Signed-off-by: Morgan Little <morgan.little@windriver.com>
---
meta/recipes-devtools/python/python_2.7.3.bb | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/meta/recipes-devtools/python/python_2.7.3.bb b/meta/recipes-devtools/python/python_2.7.3.bb
index b06d7b7..fd0e2f7 100644
--- a/meta/recipes-devtools/python/python_2.7.3.bb
+++ b/meta/recipes-devtools/python/python_2.7.3.bb
@@ -1,6 +1,6 @@
require python.inc
DEPENDS = "python-native bzip2 db gdbm openssl readline sqlite3 zlib"
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
DISTRO_SRC_URI ?= "file://sitecustomize.py"
DISTRO_SRC_URI_linuxstdbase = ""
@@ -30,7 +30,7 @@ SRC_URI += "\
S = "${WORKDIR}/Python-${PV}"
-inherit autotools multilib_header
+inherit autotools multilib_header pythonnative
# The 3 lines below are copied from the libffi recipe, ctypes ships its own copy of the libffi sources
#Somehow gcc doesn't set __SOFTFP__ when passing -mfloatabi=softp :(
@@ -45,7 +45,7 @@ do_configure_prepend() {
do_compile() {
# regenerate platform specific files, because they depend on system headers
cd Lib/plat-linux2
- include=${STAGING_INCDIR} ${STAGING_BINDIR_NATIVE}/python \
+ include=${STAGING_INCDIR} ${STAGING_BINDIR_NATIVE}/python-native/python \
${S}/Tools/scripts/h2py.py -i '(u_long)' \
${STAGING_INCDIR}/dlfcn.h \
${STAGING_INCDIR}/linux/cdrom.h \
@@ -89,8 +89,8 @@ do_compile() {
export CROSS_COMPILE="${TARGET_PREFIX}"
- oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \
- HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \
+ oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/python-native/pgen \
+ HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python-native/python \
STAGING_LIBDIR=${STAGING_LIBDIR} \
STAGING_BASELIBDIR=${STAGING_BASELIBDIR} \
STAGING_INCDIR=${STAGING_INCDIR} \
@@ -99,8 +99,8 @@ do_compile() {
oe_libinstall -so libpython${PYTHON_MAJMIN} ${STAGING_LIBDIR}
- oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \
- HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \
+ oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/python-native/pgen \
+ HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python-native/python \
STAGING_LIBDIR=${STAGING_LIBDIR} \
STAGING_INCDIR=${STAGING_INCDIR} \
STAGING_BASELIBDIR=${STAGING_BASELIBDIR} \
@@ -115,8 +115,8 @@ do_install() {
export CROSS_COMPILE="${TARGET_PREFIX}"
- oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/pgen \
- HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python \
+ oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/python-native/pgen \
+ HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python-native/python \
CROSSPYTHONPATH=${STAGING_LIBDIR_NATIVE}/python${PYTHON_MAJMIN}/lib-dynload/ \
STAGING_LIBDIR=${STAGING_LIBDIR} \
STAGING_INCDIR=${STAGING_INCDIR} \
--
1.7.0.4
next prev parent reply other threads:[~2012-07-13 15:11 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-13 13:54 [PATCH 00/20] Change python-native path Morgan Little
2012-07-13 13:54 ` [PATCH 01/20] python-native: Put binaries in seperate directory Morgan Little
2012-07-15 3:06 ` Randy MacLeod
2012-07-13 13:54 ` Morgan Little [this message]
2012-07-13 13:54 ` [PATCH 03/20] python-dbus: Update for python-native changes Morgan Little
2012-07-13 13:54 ` [PATCH 04/20] python-gst: " Morgan Little
2012-07-13 13:54 ` [PATCH 05/20] python-pygobject: " Morgan Little
2012-07-13 13:54 ` [PATCH 06/20] python-pygtk: " Morgan Little
2012-07-13 13:54 ` [PATCH 07/20] python-pyrex-native:Update " Morgan Little
2012-07-13 13:54 ` [PATCH 08/20] python-scons-native: Update " Morgan Little
2012-07-13 13:54 ` [PATCH 09/20] python-setuptools: " Morgan Little
2012-07-16 8:50 ` Richard Purdie
2012-07-18 20:07 ` Little, Morgan
2012-07-13 13:54 ` [PATCH 10/20] telepathy-glib: " Morgan Little
2012-07-13 13:55 ` [PATCH 11/20] telepathy-python: " Morgan Little
2012-07-13 13:55 ` [PATCH 12/20] libxml2: " Morgan Little
2012-07-13 13:55 ` [PATCH 13/20] mklibs-native: " Morgan Little
2012-07-13 13:55 ` [PATCH 14/20] gnome-doc-utils: " Morgan Little
2012-07-13 13:55 ` [PATCH 15/20] mesa-common: " Morgan Little
2012-07-13 13:55 ` [PATCH 16/20] libxcb: " Morgan Little
2012-07-13 13:55 ` [PATCH 17/20] xcb-proto: " Morgan Little
2012-07-13 13:55 ` [PATCH 18/20] kernelshark: " Morgan Little
2012-07-13 13:55 ` [PATCH 19/20] trace-cmd: " Morgan Little
2012-07-13 13:55 ` [PATCH 20/20] gobject-introspection: " Morgan Little
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1342187709-19368-3-git-send-email-morgan.little@windriver.com \
--to=morgan.little@windriver.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox