summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael 'Mickey' Lauer <mickey@vanille-media.de>2008-11-17 20:55:29 +0100
committerMichael 'Mickey' Lauer <mickey@vanille-media.de>2008-11-17 23:15:18 +0100
commit27843e9fca3ce747abc3b6621f5277dbdf5b8eb5 (patch)
tree49d7c31863c15b901daed5e1b7817a86acde4a92
parente5ec376d033256003416ec4be125af99e4cc75a4 (diff)
python-sip: refactor to .inc and add 4.7.8 - thanks Erin Yueh.
-rw-r--r--packages/python/python-sip.inc42
-rw-r--r--packages/python/python-sip_4.7.3.bb44
-rw-r--r--packages/python/python-sip_4.7.8.bb2
3 files changed, 46 insertions, 42 deletions
diff --git a/packages/python/python-sip.inc b/packages/python/python-sip.inc
new file mode 100644
index 0000000000..1267d07f59
--- /dev/null
+++ b/packages/python/python-sip.inc
@@ -0,0 +1,42 @@
+DESCRIPTION = "Runtime helper for sip-generated python wrapper libraries"
+SECTION = "devel/python"
+HOMEPAGE = "http://www.riverbankcomputing.co.uk/sip"
+AUTHOR = "Phil Thompson"
+LICENSE = "GPL"
+DEPENDS = "python"
+RDEPENDS = "python-core"
+
+SRC_URI = "http://www.riverbankcomputing.com/static/Downloads/sip4/sip-${PV}.tar.gz"
+
+S = "${WORKDIR}/sip-${PV}/siplib"
+
+inherit qt4x11 distutils-base
+
+EXTRA_QMAKEVARS_POST += " TEMPLATE=lib \
+ CONFIG=console \
+ DESTDIR= \
+ VERSION=1.0.0 \
+ TARGET=sip \
+ DEFINES=SIP_QT_SUPPORT \
+ INCLUDEPATH+=. \
+ INCLUDEPATH+=${STAGING_INCDIR}/${PYTHON_DIR} \
+ INCLUDEPATH+=${STAGING_INCDIR}"
+
+
+do_configure_prepend() {
+ cat siplib.sbf | sed s,target,TARGET, | sed s,sources,SOURCES, | sed s,headers,HEADERS, > siplib.pro
+}
+
+do_stage() {
+ install -d ${STAGING_LIBDIR_NATIVE}/${PYTHON_DIR}/site-packages/
+ # sipconfig.py sipdistutils.py
+ install -m 0644 sip.h ${STAGING_INCDIR}/sip.h
+}
+
+do_install() {
+ install -d ${D}${libdir}/${PYTHON_DIR}/site-packages/
+ install -m 0755 libsip.so.1.0.0 ${D}${libdir}/${PYTHON_DIR}/site-packages/sip.so
+}
+
+FILES_${PN} = "${libdir}/${PYTHON_DIR}/site-packages/sip.so"
+
diff --git a/packages/python/python-sip_4.7.3.bb b/packages/python/python-sip_4.7.3.bb
index fc87b01e53..81386e20c2 100644
--- a/packages/python/python-sip_4.7.3.bb
+++ b/packages/python/python-sip_4.7.3.bb
@@ -1,42 +1,2 @@
-DESCRIPTION = "Runtime helper for sip-generated python wrapper libraries"
-SECTION = "devel/python"
-HOMEPAGE = "http://www.riverbankcomputing.co.uk/sip"
-AUTHOR = "Phil Thompson"
-LICENSE = "GPL"
-DEPENDS = "python"
-RDEPENDS = "python-core"
-PR = "ml0"
-
-SRC_URI = "http://www.riverbankcomputing.com/Downloads/sip4/sip-${PV}.tar.gz"
-S = "${WORKDIR}/sip-${PV}/siplib"
-
-inherit qt4x11 distutils-base
-
-EXTRA_QMAKEVARS_POST += " TEMPLATE=lib \
- CONFIG=console \
- DESTDIR= \
- VERSION=1.0.0 \
- TARGET=sip \
- DEFINES=SIP_QT_SUPPORT \
- INCLUDEPATH+=. \
- INCLUDEPATH+=${STAGING_INCDIR}/${PYTHON_DIR} \
- INCLUDEPATH+=${STAGING_INCDIR}"
-
-
-do_configure_prepend() {
- cat siplib.sbf | sed s,target,TARGET, | sed s,sources,SOURCES, | sed s,headers,HEADERS, > siplib.pro
-}
-
-do_stage() {
- install -d ${STAGING_LIBDIR_NATIVE}/${PYTHON_DIR}/site-packages/
- # sipconfig.py sipdistutils.py
- install -m 0644 sip.h ${STAGING_INCDIR}/sip.h
-}
-
-do_install() {
- install -d ${D}${libdir}/${PYTHON_DIR}/site-packages/
- install -m 0755 libsip.so.1.0.0 ${D}${libdir}/${PYTHON_DIR}/site-packages/sip.so
-}
-
-FILES_${PN} = "${libdir}/${PYTHON_DIR}/site-packages/sip.so"
-
+require python-sip.inc
+PR = "ml1"
diff --git a/packages/python/python-sip_4.7.8.bb b/packages/python/python-sip_4.7.8.bb
new file mode 100644
index 0000000000..db88ba974b
--- /dev/null
+++ b/packages/python/python-sip_4.7.8.bb
@@ -0,0 +1,2 @@
+require python-sip.inc
+PR = "ml0"