[PATCH] [sip] add sip 4.7.7 [sip] add python-sip.inc [sip] modify source URL [sip] use python-sip.inc in sip 4.7.3 [sip] cannot test 4.7.3, coz the original download source tar file is missing

Erin Yueh erin_yueh at openmoko.com
Wed Sep 17 06:33:25 CEST 2008


---
 packages/python/python-sip.inc      |   41 ++++++++++++++++++++++++++++++++
 packages/python/python-sip_4.7.3.bb |   44 +---------------------------------
 packages/python/python-sip_4.7.7.bb |    4 +++
 packages/sip/sip-native_4.7.7.bb    |   28 ++++++++++++++++++++++
 4 files changed, 75 insertions(+), 42 deletions(-)
 create mode 100644 packages/python/python-sip.inc
 create mode 100644 packages/python/python-sip_4.7.7.bb
 create mode 100644 packages/sip/sip-native_4.7.7.bb

diff --git a/packages/python/python-sip.inc b/packages/python/python-sip.inc
new file mode 100644
index 0000000..b986d52
--- /dev/null
+++ b/packages/python/python-sip.inc
@@ -0,0 +1,41 @@
+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.co.uk/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 fc87b01..81386e2 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.7.bb b/packages/python/python-sip_4.7.7.bb
new file mode 100644
index 0000000..03f34fe
--- /dev/null
+++ b/packages/python/python-sip_4.7.7.bb
@@ -0,0 +1,4 @@
+require python-sip.inc
+PR = "ml1"
+
+
diff --git a/packages/sip/sip-native_4.7.7.bb b/packages/sip/sip-native_4.7.7.bb
new file mode 100644
index 0000000..e5115a6
--- /dev/null
+++ b/packages/sip/sip-native_4.7.7.bb
@@ -0,0 +1,28 @@
+DESCRIPTION = "SIP is a C++/Python Wrapper Generator"
+SECTION = "devel"
+HOMEPAGE = "http://www.riverbankcomputing.co.uk/sip"
+AUTHOR = "Phil Thompson"
+PRIORITY = "optional"
+LICENSE = "GPL"
+
+SRC_URI = "http://www.riverbankcomputing.co.uk/static/Downloads/sip4/sip-${PV}.tar.gz"
+S = "${WORKDIR}/sip-${PV}/sipgen"
+
+inherit qt4x11 native
+
+EXTRA_QMAKEVARS_POST += "DESTDIR=${S} CONFIG=console"
+
+do_configure_prepend() {
+	cat sipgen.sbf | sed s,target,TARGET, | sed s,sources,SOURCES, | sed s,headers,HEADERS, > sipgen.pro
+}
+
+export BUILD_SYS := "${BUILD_SYS}"
+export HOST_SYS := "${HOST_SYS}"
+
+do_stage() {
+	install -m 0755 sip ${STAGING_BINDIR_NATIVE}/sip
+	cd ${WORKDIR}/sip-${PV} && python configure.py
+	install -d ${STAGING_PYDIR}/site-packages
+	install -m 0755 sip*.py ${STAGING_PYDIR}/site-packages
+}
+
-- 
1.5.6.5


--------------000901090104030700010709
Content-Type: text/x-patch;
 name="0003--pyqt-add-pyqt-4.4.3.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="0003--pyqt-add-pyqt-4.4.3.patch"



More information about the devel mailing list