mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-04-20 11:38:34 +00:00
Code Issues Projects Releases Wiki Activity

python-efl: fix do_configure_prepend to be reentrant

Browse Source 
* without '=' it added ${STAGING_DIR_HOST} prefix again when
  do_configure was executed twice in the same WORKDIR
  causing issues when looking for header files in python-edje,
  python-ecore, python-elementary and python-emotion
  ./python-edje/configure.ac:CYTHON_EDJE_INCLUDEDIR=`$PKG_CONFIG --variable=includedir "python-evas >= ${python_evas_version}"`
  ./python-ecore/configure.ac:CYTHON_ECORE_EVAS_INCLUDEDIR=""
  ./python-ecore/configure.ac:CYTHON_ECORE_EVAS_INCLUDEDIR=`$PKG_CONFIG --variable=includedir "python-evas >= ${python_evas_version}"`
  ./python-elementary/configure.ac:CYTHON_ELEMENTARY_INCLUDEDIR=`$PKG_CONFIG --variable=includedir "python-evas >= ${python_evas_version}"`
  ./python-emotion/configure.ac:CYTHON_EMOTION_INCLUDEDIR=`$PKG_CONFIG --variable=includedir "python-evas >= ${python_evas_version}"`

* config.log diffs confirms duplicated ${STAGING_DIR_HOST} prefix
  < CYTHON_ECORE_EVAS_INCLUDEDIR='/OE/jansa-test/shr-core/tmp-eglibc/sysroots/tuna/usr/include/python-evas'
  ---
  > CYTHON_ECORE_EVAS_INCLUDEDIR='/OE/jansa-test/shr-core/tmp-eglibc/sysroots/tuna/OE/jansa-test/shr-core/tmp-eglibc/sysroots/tuna/usr/include/python-evas'

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Martin Jansa
2012-12-04 18:27:34 +01:00
parent c08c78bb97
commit 7199752c68
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
meta-efl/recipes-devtools/python/python-efl.inc
View File

@@ -6,7 +6,7 @@ AUTHOR = "Gustavo Sverzut Barbieri <barbieri@gmail.com>"
# the extension modules.
DEPENDS = "python-cython-native python-pyrex-native python-numeric eina"
RDEPENDS_${PN} += "python-lang"
INC_PR = "r0"
INC_PR = "r1"
# necessary to let the call for python-config succeed
export BUILD_SYS
@@ -24,7 +24,7 @@ S = "${WORKDIR}/${SRCNAME}-${SRCVER}"
do_configure_prepend() {
# prefix CYTHON_.*_INCLUDEDIR with path to STAGING_DIR_HOST also use $PKG_CONFIG instead of pkg-config directly
sed -i "s#\`\$PKG_CONFIG --variable=includedir \"python-evas#${STAGING_DIR_HOST}\`\$PKG_CONFIG --variable=includedir \"python-evas#g" ${S}/configure.ac
sed -i "s#=\`\$PKG_CONFIG --variable=includedir \"python-evas#=${STAGING_DIR_HOST}\`\$PKG_CONFIG --variable=includedir \"python-evas#g" ${S}/configure.ac
}
do_install_append() {