summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/python
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/python')
-rw-r--r--meta/recipes-devtools/python/python-imaging_1.1.7.bb4
-rw-r--r--meta/recipes-devtools/python/python-smartpm_1.4.1.bb12
-rw-r--r--meta/recipes-devtools/python/python.inc2
3 files changed, 9 insertions, 9 deletions
diff --git a/meta/recipes-devtools/python/python-imaging_1.1.7.bb b/meta/recipes-devtools/python/python-imaging_1.1.7.bb
index ed8cfcc212..a678328275 100644
--- a/meta/recipes-devtools/python/python-imaging_1.1.7.bb
+++ b/meta/recipes-devtools/python/python-imaging_1.1.7.bb
@@ -25,14 +25,14 @@ inherit distutils
25do_compile() { 25do_compile() {
26 export STAGING_LIBDIR=${STAGING_LIBDIR} 26 export STAGING_LIBDIR=${STAGING_LIBDIR}
27 export STAGING_INCDIR=${STAGING_INCDIR} 27 export STAGING_INCDIR=${STAGING_INCDIR}
28 export LCMS_ENABLED=${@base_contains('PACKAGECONFIG', 'lcms', 'True', 'False', d)} 28 export LCMS_ENABLED=${@bb.utils.contains('PACKAGECONFIG', 'lcms', 'True', 'False', d)}
29 distutils_do_compile 29 distutils_do_compile
30} 30}
31 31
32do_install() { 32do_install() {
33 export STAGING_LIBDIR=${STAGING_LIBDIR} 33 export STAGING_LIBDIR=${STAGING_LIBDIR}
34 export STAGING_INCDIR=${STAGING_INCDIR} 34 export STAGING_INCDIR=${STAGING_INCDIR}
35 export LCMS_ENABLED=${@base_contains('PACKAGECONFIG', 'lcms', 'True', 'False', d)} 35 export LCMS_ENABLED=${@bb.utils.contains('PACKAGECONFIG', 'lcms', 'True', 'False', d)}
36 distutils_do_install 36 distutils_do_install
37 install -d ${D}${datadir}/doc/${BPN}/html/ 37 install -d ${D}${datadir}/doc/${BPN}/html/
38 install -m 0644 ${S}/README ${D}${datadir}/doc/${BPN}/ 38 install -m 0644 ${S}/README ${D}${datadir}/doc/${BPN}/
diff --git a/meta/recipes-devtools/python/python-smartpm_1.4.1.bb b/meta/recipes-devtools/python/python-smartpm_1.4.1.bb
index 464c5c5571..09715794b3 100644
--- a/meta/recipes-devtools/python/python-smartpm_1.4.1.bb
+++ b/meta/recipes-devtools/python/python-smartpm_1.4.1.bb
@@ -85,16 +85,16 @@ do_install_append() {
85 # Disable zypper channel support 85 # Disable zypper channel support
86 rm -f ${D}${libdir}/python*/site-packages/smart/plugins/zyppchannelsync.py* 86 rm -f ${D}${libdir}/python*/site-packages/smart/plugins/zyppchannelsync.py*
87 87
88 if [ -z "${@base_contains('PACKAGECONFIG', 'rpm', 'rpm', '', d)}" ]; then 88 if [ -z "${@bb.utils.contains('PACKAGECONFIG', 'rpm', 'rpm', '', d)}" ]; then
89 rm -f ${D}${libdir}/python*/site-packages/smart/plugins/rpmdir.py* 89 rm -f ${D}${libdir}/python*/site-packages/smart/plugins/rpmdir.py*
90 rm -rf ${D}${libdir}/python*/site-packages/smart/backends/rpm 90 rm -rf ${D}${libdir}/python*/site-packages/smart/backends/rpm
91 fi 91 fi
92 92
93 if [ -z "${@base_contains('PACKAGECONFIG', 'qt4', 'qt4', '', d)}" ]; then 93 if [ -z "${@bb.utils.contains('PACKAGECONFIG', 'qt4', 'qt4', '', d)}" ]; then
94 rm -rf ${D}${libdir}/python*/site-packages/smart/interfaces/qt4 94 rm -rf ${D}${libdir}/python*/site-packages/smart/interfaces/qt4
95 fi 95 fi
96 96
97 if [ -z "${@base_contains('PACKAGECONFIG', 'gtk+', 'gtk', '', d)}" ]; then 97 if [ -z "${@bb.utils.contains('PACKAGECONFIG', 'gtk+', 'gtk', '', d)}" ]; then
98 rm -rf ${D}${libdir}/python*/site-packages/smart/interfaces/gtk 98 rm -rf ${D}${libdir}/python*/site-packages/smart/interfaces/gtk
99 fi 99 fi
100} 100}
@@ -115,9 +115,9 @@ do_install_append_class-nativesdk() {
115} 115}
116 116
117PACKAGES = "${PN}-dev ${PN}-dbg ${PN}-doc smartpm \ 117PACKAGES = "${PN}-dev ${PN}-dbg ${PN}-doc smartpm \
118 ${@base_contains('PACKAGECONFIG', 'rpm', '${PN}-backend-rpm', '', d)} \ 118 ${@bb.utils.contains('PACKAGECONFIG', 'rpm', '${PN}-backend-rpm', '', d)} \
119 ${@base_contains('PACKAGECONFIG', 'qt4', '${PN}-interface-qt4', '', d)} \ 119 ${@bb.utils.contains('PACKAGECONFIG', 'qt4', '${PN}-interface-qt4', '', d)} \
120 ${@base_contains('PACKAGECONFIG', 'gtk', '${PN}-interface-gtk', '', d)} \ 120 ${@bb.utils.contains('PACKAGECONFIG', 'gtk', '${PN}-interface-gtk', '', d)} \
121 ${PN}-interface-images ${PN}" 121 ${PN}-interface-images ${PN}"
122 122
123RDEPENDS_smartpm = "${PN}" 123RDEPENDS_smartpm = "${PN}"
diff --git a/meta/recipes-devtools/python/python.inc b/meta/recipes-devtools/python/python.inc
index 90079a29c8..19942baeb0 100644
--- a/meta/recipes-devtools/python/python.inc
+++ b/meta/recipes-devtools/python/python.inc
@@ -25,7 +25,7 @@ EXTRA_OECONF = "\
25 --without-cxx-main \ 25 --without-cxx-main \
26 --with-signal-module \ 26 --with-signal-module \
27 --enable-shared \ 27 --enable-shared \
28 --enable-ipv6=${@base_contains('DISTRO_FEATURES', 'ipv6', 'yes', 'no', d)} \ 28 --enable-ipv6=${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'yes', 'no', d)} \
29 ac_cv_header_bluetooth_bluetooth_h=no ac_cv_header_bluetooth_h=no \ 29 ac_cv_header_bluetooth_bluetooth_h=no ac_cv_header_bluetooth_h=no \
30 ${PYTHONLSBOPTS} \ 30 ${PYTHONLSBOPTS} \
31" 31"