summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--classes/distutils-base.bbclass0
-rw-r--r--classes/distutils.bbclass7
-rw-r--r--packages/python/python-cairo_cvs.bb2
-rw-r--r--packages/python/python-pygtk-0_0.6.12.bb4
-rw-r--r--packages/python/python-pygtk_2.2.0.bb7
-rw-r--r--packages/python/python-pygtk_2.3.96.bb7
-rw-r--r--packages/python/python-pymp3_0.3.4.bb8
-rw-r--r--packages/python/python-pyqt_3.13.bb12
-rw-r--r--packages/python/python-pyqwt_3.10.bb12
-rw-r--r--packages/python/python-quicklauncher_0.0.1.bb8
-rw-r--r--packages/python/python-scapy_0.9.17.bb6
-rw-r--r--packages/python/python-sip_4.1.1.bb42
12 files changed, 75 insertions, 40 deletions
diff --git a/classes/distutils-base.bbclass b/classes/distutils-base.bbclass
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/classes/distutils-base.bbclass
diff --git a/classes/distutils.bbclass b/classes/distutils.bbclass
index 9918502c64..a2b0e2b770 100644
--- a/classes/distutils.bbclass
+++ b/classes/distutils.bbclass
@@ -1,9 +1,4 @@
-inherit base
-EXTRA_OEMAKE = ""
-DEPENDS += "${@["python-native python", ""][(bb.data.getVar('PACKAGES', d, 1) == '')]}"
-RDEPENDS += "python-core"
-
-FILES_${PN} = "${bindir} ${libdir} ${libdir}/python2.3"
+inherit distutils-base
distutils_do_compile() {
BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
diff --git a/packages/python/python-cairo_cvs.bb b/packages/python/python-cairo_cvs.bb
index 7c2e25d732..cc870acbca 100644
--- a/packages/python/python-cairo_cvs.bb
+++ b/packages/python/python-cairo_cvs.bb
@@ -11,4 +11,4 @@ inherit autotools
SRC_URI = "cvs://anoncvs@cvs.cairographics.org/cvs/cairo;module=pycairo"
S = "${WORKDIR}/${SRCNAME}"
-FILES_${PN} = "${libdir}/python2.3/"
+FILES_${PN} = "${libdir}/${PYTHON_DIR}/"
diff --git a/packages/python/python-pygtk-0_0.6.12.bb b/packages/python/python-pygtk-0_0.6.12.bb
index 87029ec897..4975d9dc2f 100644
--- a/packages/python/python-pygtk-0_0.6.12.bb
+++ b/packages/python/python-pygtk-0_0.6.12.bb
@@ -15,9 +15,9 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/python/v1.2/${SRCNAME}-${PV}.tar.gz \
file://remove-imlib-et-al;patch=1"
S = "${WORKDIR}/${SRCNAME}-${PV}"
-inherit autotools pkgconfig
+inherit autotools pkgconfig distutils-base
-FILES_${PN} = "${libdir}/python2.3/"
+FILES_${PN} = "${libdir}/${PYTHON_DIR}/"
do_configure_prepend() {
echo ${LDFLAGS} > /tmp/ldflags
diff --git a/packages/python/python-pygtk_2.2.0.bb b/packages/python/python-pygtk_2.2.0.bb
index 22e9375900..453b323847 100644
--- a/packages/python/python-pygtk_2.2.0.bb
+++ b/packages/python/python-pygtk_2.2.0.bb
@@ -4,14 +4,13 @@ PRIORITY = "optional"
MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
DEPENDS = "gtk+ libglade"
SRCNAME = "pygtk"
-PR = "r1"
LICENSE = "LGPL"
+PR = "r2"
+
SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.2/${SRCNAME}-${PV}.tar.bz2"
S = "${WORKDIR}/${SRCNAME}-${PV}"
-inherit autotools pkgconfig
-
-FILES_${PN} = "${libdir}/python2.3/"
+inherit autotools pkgconfig distutils-base
do_stage() {
autotools_stage_includes
diff --git a/packages/python/python-pygtk_2.3.96.bb b/packages/python/python-pygtk_2.3.96.bb
index cb2f43db60..b5bc5d2666 100644
--- a/packages/python/python-pygtk_2.3.96.bb
+++ b/packages/python/python-pygtk_2.3.96.bb
@@ -4,15 +4,14 @@ PRIORITY = "optional"
MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
DEPENDS = "gtk+ libglade"
SRCNAME = "pygtk"
-PR = "r0"
LICENSE = "LGPL"
+PR = "r1"
+
SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.3/${SRCNAME}-${PV}.tar.bz2 \
file://acinclude.m4"
S = "${WORKDIR}/${SRCNAME}-${PV}"
-inherit autotools pkgconfig
-
-FILES_${PN} = "${libdir}/python2.3/"
+inherit autotools pkgconfig distutils-base
do_configure_prepend() {
install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/
diff --git a/packages/python/python-pymp3_0.3.4.bb b/packages/python/python-pymp3_0.3.4.bb
index 3b9600a7e1..000bb9712f 100644
--- a/packages/python/python-pymp3_0.3.4.bb
+++ b/packages/python/python-pymp3_0.3.4.bb
@@ -13,16 +13,16 @@ PY_FILES = "box_info.py layer.py sound_ctrl.py stack.py txt_tools.py"
do_install() {
install -d ${D}/${libdir}
- install -d ${D}/${libdir}/python2.3
- install -d ${D}/${libdir}/python2.3/site-packages
+ install -d ${D}/${libdir}/${PYTHON_DIR}
+ install -d ${D}/${libdir}/${PYTHON_DIR}/site-packages
for f in ${PY_FILES}
do
- install -m 0644 $f ${D}${libdir}/python2.3/site-packages/
+ install -m 0644 $f ${D}${libdir}/${PYTHON_DIR}/site-packages/
done
install -d ${D}/${bindir}
install -m 755 pymp3 ${D}/${bindir}/
}
-FILES_${PN} += " ${libdir}/python2.3/site-packages/"
+FILES_${PN} += " ${libdir}/${PYTHON_DIR}/site-packages/"
diff --git a/packages/python/python-pyqt_3.13.bb b/packages/python/python-pyqt_3.13.bb
index 0dcc3f32a4..b264f67f72 100644
--- a/packages/python/python-pyqt_3.13.bb
+++ b/packages/python/python-pyqt_3.13.bb
@@ -26,9 +26,9 @@ EXTRA_QMAKEVARS_POST = " QMAKE_UIC=${STAGING_BINDIR}/uic QMAKE_MOC=${STAGING_BIN
DESTDIR= VERSION=1.0.0 \
DEFINES=SIP_MAKE_DLL DEFINES+=SIP_QT_SUPPORT DEFINES+=QWS \
INCLUDEPATH=. \
- INCLUDEPATH+=${STAGING_INCDIR}/python2.3 \
+ INCLUDEPATH+=${STAGING_INCDIR}/${PYTHON_DIR} \
INCLUDEPATH+=${STAGING_INCDIR} \
- LIBS+=-L${STAGING_LIBDIR}/python2.3/site-packages \
+ LIBS+=-L${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages \
LIBS+=-L${QTDIR}/lib LIBS+=-lqte LIBS+=-lqpe "
do_configure_prepend() {
@@ -40,16 +40,16 @@ do_stage() {
for module in ${SIP_MODULES}
do
install -m 0644 ${S}/sip/${module}/*.sip ${STAGING_SIPDIR}/qt/
- install -m 0755 ${module}/lib${module}.so ${STAGING_LIBDIR}/python2.3/site-packages/${module}.so
+ install -m 0755 ${module}/lib${module}.so ${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/${module}.so
done
}
do_install() {
- install -d ${D}/${libdir}/python2.3/site-packages/
+ install -d ${D}/${libdir}/${PYTHON_DIR}/site-packages/
for module in ${SIP_MODULES}
do
- install -m 0755 ${module}/lib${module}.so ${D}/${libdir}/python2.3/site-packages/${module}.so
+ install -m 0755 ${module}/lib${module}.so ${D}/${libdir}/${PYTHON_DIR}/site-packages/${module}.so
done
}
-FILES_${PN} = "${libdir}/python2.3/site-packages"
+FILES_${PN} = "${libdir}/${PYTHON_DIR}/site-packages"
diff --git a/packages/python/python-pyqwt_3.10.bb b/packages/python/python-pyqwt_3.10.bb
index 1f41ab0459..cf8543f6c8 100644
--- a/packages/python/python-pyqwt_3.10.bb
+++ b/packages/python/python-pyqwt_3.10.bb
@@ -26,9 +26,9 @@ EXTRA_QMAKEVARS_POST += "CONFIG=qt CONFIG+=warn_on CONFIG+=release \
TARGET=qwt DESTDIR= VERSION=1.0.0 \
DEFINES=SIP_MAKE_DLL DEFINES+=SIP_QT_SUPPORT DEFINES+=HAS_NUMERIC DEFINES+=QWS \
INCLUDEPATH+=../numpy \
- INCLUDEPATH+=${STAGING_INCDIR}/python2.3 \
+ INCLUDEPATH+=${STAGING_INCDIR}/${PYTHON_DIR} \
INCLUDEPATH+=${STAGING_INCDIR} \
- LIBS+=-L${STAGING_LIBDIR}/python2.3/site-packages \
+ LIBS+=-L${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages \
LIBS+=-L${QTDIR}/lib LIBS+=-lqte LIBS+=-lqpe "
do_generate_prepend() {
@@ -49,16 +49,16 @@ do_stage() {
for module in ${SIP_MODULES}
do
install -m 0644 ${S}/sip/${module}/*.sip ${STAGING_SIPDIR}/qt/
- install -m 0755 ${module}/lib${module}.so ${STAGING_LIBDIR}/python2.3/site-packages/${module}.so
+ install -m 0755 ${module}/lib${module}.so ${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/${module}.so
done
}
do_install() {
- install -d ${D}/${libdir}/python2.3/site-packages/
+ install -d ${D}/${libdir}/${PYTHON_DIR}/site-packages/
for module in ${SIP_MODULES}
do
- install -m 0755 ${module}/lib${module}.so ${D}/${libdir}/python2.3/site-packages/${module}.so
+ install -m 0755 ${module}/lib${module}.so ${D}/${libdir}/${PYTHON_DIR}/site-packages/${module}.so
done
}
-FILES_${PN} = "/usr/lib/python2.3/site-packages"
+FILES_${PN} = "/usr/lib/${PYTHON_DIR}/site-packages"
diff --git a/packages/python/python-quicklauncher_0.0.1.bb b/packages/python/python-quicklauncher_0.0.1.bb
index b3b8139448..aa294caeee 100644
--- a/packages/python/python-quicklauncher_0.0.1.bb
+++ b/packages/python/python-quicklauncher_0.0.1.bb
@@ -18,10 +18,10 @@ do_compile() {
#
do_install() {
- install -d ${D}/${libdir}/python2.3/
- install -m 0755 quicklauncher.py ${D}/${libdir}/python2.3/
- install -d ${D}/${libdir}/python2.3/site-packages/quicklauncher/
- install -m 0755 testapp.py ${D}/${libdir}/python2.3/site-packages/quicklauncher/
+ install -d ${D}/${libdir}/${PYTHON_DIR}/
+ install -m 0755 quicklauncher.py ${D}/${libdir}/${PYTHON_DIR}/
+ install -d ${D}/${libdir}/${PYTHON_DIR}/site-packages/quicklauncher/
+ install -m 0755 testapp.py ${D}/${libdir}/${PYTHON_DIR}/site-packages/quicklauncher/
}
diff --git a/packages/python/python-scapy_0.9.17.bb b/packages/python/python-scapy_0.9.17.bb
index 3a42abe794..278fc88a86 100644
--- a/packages/python/python-scapy_0.9.17.bb
+++ b/packages/python/python-scapy_0.9.17.bb
@@ -13,9 +13,9 @@ SRC_URI = "http://www.cartel-securite.fr/pbiondi/python/scapy-${PV}.tar.gz"
S = "${WORKDIR}/${SRCNAME}-${PV}"
do_install() {
- install -d ${D}/${libdir}/python2.3
- install -m 0755 ${S}/scapy.py ${D}/${libdir}/python2.3/
+ install -d ${D}/${libdir}/${PYTHON_DIR}
+ install -m 0755 ${S}/scapy.py ${D}/${libdir}/${PYTHON_DIR}/
}
-FILES_${PN} = "${libdir}/python2.3/"
+FILES_${PN} = "${libdir}/${PYTHON_DIR}/"
diff --git a/packages/python/python-sip_4.1.1.bb b/packages/python/python-sip_4.1.1.bb
index e69de29bb2..071e155276 100644
--- a/packages/python/python-sip_4.1.1.bb
+++ b/packages/python/python-sip_4.1.1.bb
@@ -0,0 +1,42 @@
+DESCRIPTION = "Runtime helper for sip-generated python wrapper libraries"
+SECTION = "devel/python"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+DEPENDS = "virtual/libqte2 python"
+RDEPENDS = "python-core"
+PR = "ml1"
+
+SRC_URI = "http://www.vanille.de/mirror/sip-${PV}.tar.gz"
+S = "${WORKDIR}/sip-${PV}/siplib"
+
+inherit qmake
+
+EXTRA_QMAKEVARS_POST = " TEMPLATE=lib \
+ CONFIG=qt \
+ 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}/${PYTHON_DIR}/site-packages/
+ oe_libinstall -so libsip ${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/
+ install -m 0644 sip.h ${STAGING_INCDIR}/sip.h
+}
+
+do_install() {
+ install -d ${D}/${libdir}/${PYTHON_DIR}/site-packages/
+ install libsip.so.1.0.0 ${D}/${libdir}/${PYTHON_DIR}/site-packages/sip.so
+}
+
+FILES_${PN} = "${libdir}/${PYTHON_DIR}/site-packages/sip.so"
+
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-28 18:55:35 +0000