All of lore.kernel.org
 help / color / mirror / Atom feed
From: Paul Eggleton <paul.eggleton@linux.intel.com>
To: yocto@yoctoproject.org
Subject: [meta-qt4][PATCH] sip: remove in favour of meta-oe recipe
Date: Thu,  6 Apr 2017 14:10:37 +1200	[thread overview]
Message-ID: <20170406021037.2392-1-paul.eggleton@linux.intel.com> (raw)

Version 4.12 of python-pyqt that we are about to upgrade to requires sip
4.19 which is already in meta-oe, so this version is no longer working.
We shouldn't really be carrying a duplicate recipe here, but on the
other hand we don't want to be adding a hard dependency on meta-oe
either. As a compromise, drop the sip recipe here and require the user
to add meta-oe in order to build it, and a corresponding note to the
README.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 README                                   |  7 +++++
 recipes-qt4/recipes-python/sip_4.16.4.bb | 54 --------------------------------
 2 files changed, 7 insertions(+), 54 deletions(-)
 delete mode 100644 recipes-qt4/recipes-python/sip_4.16.4.bb

diff --git a/README b/README
index 49c3ab2..cebdacd 100644
--- a/README
+++ b/README
@@ -23,6 +23,13 @@ subdirectory: meta
 branch: master
 revision: HEAD
 
+If you want to build python-pyqt you will also need meta-oe:
+
+URI: git://github.com/openembedded/meta-openembedded
+subdirectory: meta-oe
+branch: master
+revision: HEAD
+
 
 Maintenance
 -----------
diff --git a/recipes-qt4/recipes-python/sip_4.16.4.bb b/recipes-qt4/recipes-python/sip_4.16.4.bb
deleted file mode 100644
index 032d125..0000000
--- a/recipes-qt4/recipes-python/sip_4.16.4.bb
+++ /dev/null
@@ -1,54 +0,0 @@
-SUMMARY = "SIP is a C++/Python Wrapper Generator"
-AUTHOR = "Phil Thompson"
-HOMEPAGE = "http://www.riverbankcomputing.co.uk/sip"
-SECTION = "devel"
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://LICENSE-GPL2;md5=e91355d8a6f8bd8f7c699d62863c7303"
-DEPENDS_class-target = "qt4-x11-free python"
-
-# riverbankcomputing is upstream, but keeps only latest version, sf usually have few older
-#SRC_URI = "http://www.riverbankcomputing.com/static/Downloads/sip4/sip-${PV}.tar.gz"
-SRC_URI = "${SOURCEFORGE_MIRROR}/project/pyqt/sip/sip-${PV}/sip-${PV}.tar.gz"
-SRC_URI[md5sum] = "a9840670a064dbf8f63a8f653776fec9"
-SRC_URI[sha256sum] = "ceda443fc5e129e67a067e2cd7b73ff037f8b10b50e407baa2b1d9f2199d57f5"
-
-BBCLASSEXTEND = "native"
-
-PACKAGES += "python-sip"
-
-inherit qmake2 python-dir pythonnative distro_features_check
-# depends on qt4-x11-free
-REQUIRED_DISTRO_FEATURES = "x11"
-
-EXTRA_QMAKEVARS_POST += "CONFIG=console"
-
-export BUILD_SYS
-export HOST_SYS
-export STAGING_LIBDIR
-export STAGING_INCDIR
-
-do_configure_prepend_class-target() {
-    echo "py_platform = linux" > sip.cfg
-    echo "py_inc_dir = %(sysroot)/${includedir}/python%(py_major).%(py_minor)" >> sip.cfg
-    echo "sip_bin_dir = ${D}/${bindir}" >> sip.cfg
-    echo "sip_inc_dir = ${D}/${includedir}" >> sip.cfg
-    echo "sip_module_dir = ${D}/${libdir}/python%(py_major).%(py_minor)/site-packages" >> sip.cfg
-    echo "sip_sip_dir = ${D}/${datadir}/sip" >> sip.cfg
-    python configure.py --use-qmake --configuration sip.cfg --sysroot ${STAGING_DIR_HOST}
-}
-do_configure_prepend_class-native() {
-    echo "py_platform = linux" > sip.cfg
-    echo "py_inc_dir = ${includedir}/python%(py_major).%(py_minor)" >> sip.cfg
-    echo "sip_bin_dir = ${D}/${bindir}" >> sip.cfg
-    echo "sip_inc_dir = ${D}/${includedir}" >> sip.cfg
-    echo "sip_module_dir = ${D}/${libdir}/python%(py_major).%(py_minor)/site-packages" >> sip.cfg
-    echo "sip_sip_dir = ${D}/${datadir}/sip" >> sip.cfg
-    python configure.py --use-qmake --configuration sip.cfg --sysroot ${STAGING_DIR_NATIVE}
-}
-do_install() {
-    oe_runmake install
-}
-
-FILES_python-${BPN} = "${libdir}/${PYTHON_DIR}/site-packages/"
-FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/.debug"
-
-- 
2.9.3



                 reply	other threads:[~2017-04-06  2:11 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=20170406021037.2392-1-paul.eggleton@linux.intel.com \
    --to=paul.eggleton@linux.intel.com \
    --cc=yocto@yoctoproject.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.