aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael 'Mickey' Lauer <mickey@vanille-media.de>2011-05-03 20:12:16 +0200
committerMichael 'Mickey' Lauer <mickey@vanille-media.de>2011-05-03 20:17:00 +0200
commit6e4f126a92c039adc2ac5219f6c89958ce2794ba (patch)
treee655fd34024d019e7fb733a645e35b382523ff4b
parent4de1e9814a057661535b27aa2821953509289f86 (diff)
downloadopenembedded-6e4f126a92c039adc2ac5219f6c89958ce2794ba.tar.gz
openembedded-6e4f126a92c039adc2ac5219f6c89958ce2794ba.tar.bz2
openembedded-6e4f126a92c039adc2ac5219f6c89958ce2794ba.zip
sip-native: 4.12 -> 4.12.1; also remove version 4.7.9, which no longer is relevant
sip is mereley used for PyQt bindings and the corresponding Qt version (4.4.x) has been removed many months ago.
-rw-r--r--recipes/sip/sip-native_4.12.1.bb (renamed from recipes/sip/sip-native_4.12.bb)6
-rw-r--r--recipes/sip/sip-native_4.7.9.bb36
2 files changed, 2 insertions, 40 deletions
diff --git a/recipes/sip/sip-native_4.12.bb b/recipes/sip/sip-native_4.12.1.bb
index 47e870864b..cd4329266c 100644
--- a/recipes/sip/sip-native_4.12.bb
+++ b/recipes/sip/sip-native_4.12.1.bb
@@ -7,9 +7,8 @@ LICENSE = "GPL"
PR = "r0"
SRC_URI = "http://www.riverbankcomputing.co.uk/static/Downloads/sip4/sip-${PV}.tar.gz"
-SRC_URI[md5sum] = "8a0998fbaf34bdab2c15af3d4fa3bc0e"
-SRC_URI[sha256sum] = "9a0d24aec5328fd038be13f94de5c710b767caeb1dfd869e52c69d98b8656168"
-
+SRC_URI[md5sum] = "0f8e8305b14c1812191de2e0ee22fea9"
+SRC_URI[sha256sum] = "e9d66e8830c2a58e6c17b9952710f67d495ddb84ce6f3d89400c8b52913381b5"
S = "${WORKDIR}/sip-${PV}/sipgen"
inherit qt4x11 native python-dir
@@ -32,5 +31,4 @@ do_install() {
install -m 0755 sip*.py ${D}${PYTHON_SITEPACKAGES_DIR}
}
-DEFAULT_PREFERENCE = "-1"
NATIVE_INSTALL_WORKS = "1"
diff --git a/recipes/sip/sip-native_4.7.9.bb b/recipes/sip/sip-native_4.7.9.bb
deleted file mode 100644
index 09d9056156..0000000000
--- a/recipes/sip/sip-native_4.7.9.bb
+++ /dev/null
@@ -1,36 +0,0 @@
-DESCRIPTION = "SIP is a C++/Python Wrapper Generator"
-AUTHOR = "Phil Thompson"
-HOMEPAGE = "http://www.riverbankcomputing.co.uk/sip"
-SECTION = "devel"
-PRIORITY = "optional"
-LICENSE = "GPL"
-PR = "ml1"
-
-SRC_URI = "http://www.riverbankcomputing.co.uk/static/Downloads/sip4/sip-${PV}.tar.gz"
-SRC_URI[md5sum] = "597d7ff7edb42a18421c806ffd18a136"
-SRC_URI[sha256sum] = "7faaccb6f17296399051bd076a7f41e0f6d95a28eda3e30468f1bd7cf45898e1"
-
-S = "${WORKDIR}/sip-${PV}/sipgen"
-
-inherit qt4x11 native python-dir
-
-EXTRA_QMAKEVARS_POST += "DESTDIR=${S} CONFIG=console"
-
-export BUILD_SYS
-export HOST_SYS
-export STAGING_LIBDIR
-export STAGING_INCDIR
-
-do_configure_prepend() {
- cat sipgen.sbf | sed s,target,TARGET, | sed s,sources,SOURCES, | sed s,headers,HEADERS, > sipgen.pro
-}
-do_install() {
- install -d ${D}${bindir}
- install -m 0755 sip ${D}${bindir}/sip
- cd ${WORKDIR}/sip-${PV} && python configure.py
- install -d ${D}${PYTHON_SITEPACKAGES_DIR}
- install -m 0755 sip*.py ${D}${PYTHON_SITEPACKAGES_DIR}
-}
-
-DEFAULT_PREFERENCE = "-1"
-NATIVE_INSTALL_WORKS = "1"