basesystem-jjsandbox/ToshikazuOhiwa/master-jj

recipes

1 files changed, 14 insertions, 4 deletions

diff --git a/external/meta-openembedded/meta-python/recipes-devtools/python/python-m2crypto.inc b/external/meta-openembedded/meta-python/recipes-devtools/python/python-m2crypto.inc
index a36ab8a7..81c81645 100644
--- a/external/meta-openembedded/meta-python/recipes-devtools/python/python-m2crypto.inc
+++ b/external/meta-openembedded/meta-python/recipes-devtools/python/python-m2crypto.inc
@@ -17,7 +17,17 @@ PYPI_PACKAGE = "M2Crypto"
 inherit pypi siteinfo
 
 DEPENDS += "openssl swig-native"
-RDEPENDS_${PN} += "python-typing"
+RDEPENDS_${PN} += "\
+  ${PYTHON_PN}-datetime \
+  ${PYTHON_PN}-distutils \
+  ${PYTHON_PN}-logging \
+  ${PYTHON_PN}-netclient \
+  ${PYTHON_PN}-netserver \
+  ${PYTHON_PN}-numbers \
+  ${PYTHON_PN}-smtpd \
+  ${PYTHON_PN}-typing \
+  ${PYTHON_PN}-xmlrpc \
+"
 
 DISTUTILS_BUILD_ARGS += "build_ext --openssl=${STAGING_EXECPREFIXDIR} -I${STAGING_INCDIR}"
 DISTUTILS_INSTALL_ARGS += "build_ext --openssl=${STAGING_EXECPREFIXDIR}"
@@ -32,7 +42,7 @@ export SWIG_FEATURES
 #
 do_configure_prepend() {
     ${CPP} -dM - < /dev/null | grep -v '__\(STDC\|REGISTER_PREFIX\|GNUC\|STDC_HOSTED\)__' \
-    | sed 's/^\(#define \([^ ]*\) .*\)$/#undef \2\n\1/' > SWIG/gcc_macros.h
+    | sed 's/^\(#define \([^ ]*\) .*\)$/#undef \2\n\1/' > ${S}/SWIG/gcc_macros.h
 
     if [ "${SITEINFO_BITS}" = "64" ];then
         bit="64"
@@ -42,11 +52,11 @@ do_configure_prepend() {
 
     if [ -e ${STAGING_INCDIR}/openssl/opensslconf-${bit}.h ] ;then
         for i in SWIG/_ec.i SWIG/_evp.i; do
-            sed -i -e "s/opensslconf.*\./opensslconf-${bit}\./" "$i"
+            sed -i -e "s/opensslconf.*\./opensslconf-${bit}\./" "${S}/$i"
         done
     elif [ -e ${STAGING_INCDIR}/openssl/opensslconf-n${bit}.h ] ;then
         for i in SWIG/_ec.i SWIG/_evp.i; do
-            sed -i -e "s/opensslconf.*\./opensslconf-n${bit}\./" "$i"
+            sed -i -e "s/opensslconf.*\./opensslconf-n${bit}\./" "${S}/$i"
         done
     fi
 }