summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2005-02-09 11:01:56 +0000
committerMichael Lauer <mickey@vanille-media.de>2005-02-09 11:01:56 +0000
commit5d7dc2d94e88f492539761b4909a69955a5142b0 (patch)
tree0c922779ffcadcf5d2aab29530980bad1351a22f
parentead81927963fb9513ffb18bc50d7f4ced7198117 (diff)
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2005/02/09 02:42:08+01:00 uni-frankfurt.de!mickeyl update python-numeric to v23.7 2005/02/09 02:02:21+01:00 uni-frankfurt.de!mickeyl fix qwt 4.2 compilage against 2.3.10. Yes, QT_VERSION again (or still *sigh*) 2005/02/09 01:44:39+01:00 uni-frankfurt.de!mickeyl fix PyQt compilage against QtE 2.3.10 (QT_VERSION again *sigh*) BKrev: 4209eda4ikLKONxgarptvjIfCJ5yOA
-rw-r--r--packages/python/python-numarray_1.0.bb11
-rw-r--r--packages/python/python-numarray_1.1.1.bb (renamed from packages/qwt/qwt-pyqwt-20040505.bb)0
-rw-r--r--packages/python/python-numeric/no-lapack.patch37
-rw-r--r--packages/python/python-numeric_23.3.bb17
-rw-r--r--packages/python/python-numeric_23.7.bb0
-rw-r--r--packages/python/python-pyqt-3.13/qt2-fix.patch0
-rw-r--r--packages/python/python-pyqt_3.13.bb3
-rw-r--r--packages/qwt/files/qt2-fix.patch0
-rw-r--r--packages/qwt/qwt_4.2.0rc1.bb27
9 files changed, 46 insertions, 49 deletions
diff --git a/packages/python/python-numarray_1.0.bb b/packages/python/python-numarray_1.0.bb
deleted file mode 100644
index f21c377da2..0000000000
--- a/packages/python/python-numarray_1.0.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-DESCRIPTION = "Next Generation sophisticated Numeric Processing Package for Python"
-SECTION = "devel/python"
-PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-LICENSE = "PYRAF"
-SRCNAME = "numarray"
-
-SRC_URI = ${SOURCEFORGE_MIRROR}/numpy/${SRCNAME}-${PV}.tar.gz
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-inherit distutils
diff --git a/packages/qwt/qwt-pyqwt-20040505.bb b/packages/python/python-numarray_1.1.1.bb
index e69de29bb2..e69de29bb2 100644
--- a/packages/qwt/qwt-pyqwt-20040505.bb
+++ b/packages/python/python-numarray_1.1.1.bb
diff --git a/packages/python/python-numeric/no-lapack.patch b/packages/python/python-numeric/no-lapack.patch
index d27c666ff4..c1916b8b9f 100644
--- a/packages/python/python-numeric/no-lapack.patch
+++ b/packages/python/python-numeric/no-lapack.patch
@@ -3,34 +3,31 @@
# Patch managed by http://www.holgerschurig.de/patcher.html
#
---- Numeric-23.3/setup.py~no-lapack
-+++ Numeric-23.3/setup.py
-@@ -32,22 +32,22 @@
+--- Numeric-23.7/setup.py~nolapack
++++ Numeric-23.7/setup.py
+@@ -32,7 +32,7 @@
mathlibs = []
# delete all but the first one in this list if using your own LAPACK/BLAS
-sourcelist = [os.path.join('Src', 'lapack_litemodule.c'),
-+sourcelist = [] # os.path.join('Src', 'lapack_litemodule.c'),
- # os.path.join('Src', 'blas_lite.c'),
- # os.path.join('Src', 'f2c_lite.c'),
- # os.path.join('Src', 'zlapack_lite.c'),
- # os.path.join('Src', 'dlapack_lite.c')
-- ]
-+
++sourcelist = [
+ #os.path.join('Src', 'blas_lite.c'),
+ #os.path.join('Src', 'f2c_lite.c'),
+ #os.path.join('Src', 'zlapack_lite.c'),
+@@ -40,12 +40,12 @@
+ ]
# set these to use your own BLAS;
-library_dirs_list = ['/usr/lib/atlas']
-libraries_list = ['lapack', 'cblas', 'f77blas', 'atlas', 'g2c']
-+library_dirs_list = [] # '/usr/lib/atlas']
-+libraries_list = [] # 'lapack', 'cblas', 'f77blas', 'atlas', 'g2c']
- # if you also set `use_dotblas` (see below), you'll need:
- # ['lapack', 'cblas', 'f77blas', 'atlas', 'g2c']
++library_dirs_list = []
++libraries_list = []
# set to true (1), if you also want BLAS optimized matrixmultiply/dot/innerproduct
--use_dotblas = 1
--include_dirs = ['/usr/include/atlas'] # You may need to set this to find cblas.h
+-use_dotblas = 1
+-include_dirs = ['/usr/include/atlas']
+use_dotblas = 0
-+include_dirs = [] # '/usr/include/atlas'] # You may need to set this to find cblas.h
- # e.g. on UNIX using ATLAS this should be ['/usr/include/atlas']
-
- # The packages are split in this way to allow future optional inclusion
++include_dirs = []
+ # You may need to set this to find cblas.h
+ # e.g. on UNIX using ATLAS this should be ['/usr/include/atlas']
+ extra_link_args = []
diff --git a/packages/python/python-numeric_23.3.bb b/packages/python/python-numeric_23.3.bb
deleted file mode 100644
index 7026bfbee8..0000000000
--- a/packages/python/python-numeric_23.3.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-DESCRIPTION = "A sophisticated Numeric Processing Package for Python"
-SECTION = "devel/python"
-PRIORITY = "optional"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-LICENSE = "PYRAF"
-PR = "ml1"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/numpy/Numeric-${PV}.tar.gz \
- file://no-lapack.patch;patch=1"
-S = "${WORKDIR}/Numeric-${PV}"
-
-inherit distutils
-
-do_stage() {
- cp -a Include/Numeric ${STAGING_INCDIR}
-}
-
diff --git a/packages/python/python-numeric_23.7.bb b/packages/python/python-numeric_23.7.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/python/python-numeric_23.7.bb
diff --git a/packages/python/python-pyqt-3.13/qt2-fix.patch b/packages/python/python-pyqt-3.13/qt2-fix.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/python/python-pyqt-3.13/qt2-fix.patch
diff --git a/packages/python/python-pyqt_3.13.bb b/packages/python/python-pyqt_3.13.bb
index 633a0e5cdd..a1cc6a6bfb 100644
--- a/packages/python/python-pyqt_3.13.bb
+++ b/packages/python/python-pyqt_3.13.bb
@@ -7,9 +7,10 @@ LICENSE = "GPL"
RDEPENDS = "python-core python-sip"
DEPENDS = "virtual/libqte2 virtual/libqpe"
SRCNAME = "pyqt"
-PR = "ml2"
+PR = "ml3"
SRC_URI = "http://www.vanille.de/mirror/PyQt-x11-gpl-${PV}.tar.gz \
+ file://qt2-fix.patch;patch=1 \
file://features"
S = "${WORKDIR}/PyQt-x11-gpl-${PV}"
diff --git a/packages/qwt/files/qt2-fix.patch b/packages/qwt/files/qt2-fix.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/qwt/files/qt2-fix.patch
diff --git a/packages/qwt/qwt_4.2.0rc1.bb b/packages/qwt/qwt_4.2.0rc1.bb
index e69de29bb2..39dcdb0ddb 100644
--- a/packages/qwt/qwt_4.2.0rc1.bb
+++ b/packages/qwt/qwt_4.2.0rc1.bb
@@ -0,0 +1,27 @@
+DESCRIPTION = "Qt Widget Extension for Technical Applications"
+SECTION = "libs"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+DEPENDS = "virtual/libqte2"
+PR = "r1"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/qwt/qwt-${PV}.tgz \
+ file://qt2-fix.patch;patch=1"
+
+inherit qmake
+
+EXTRA_QMAKEVARS_POST = "CONFIG-=thread"
+
+do_stage() {
+ oe_libinstall -so -C lib libqwt ${STAGING_LIBDIR}
+ cp -a include/* ${STAGING_INCDIR}
+}
+
+do_install() {
+ install -d ${D}/${libdir} \
+ ${D}/${includedir}
+ oe_libinstall -so -C lib libqwt ${D}/${libdir}
+ cp -a include/* ${D}/${includedir}
+}
+