[weasel-commit] Source: numpy=1.3.0-1
- From: rbuilder@xxxxxxxxx
- To: weasel-commit@xxxxxxxxxxxxx
- Date: Mon, 25 Jan 2010 17:01:03 -0500
================================
numpy:source=1.3.0-1
cvc rdiff numpy -1 /weasel.rpath.org@wgl:3-devel/1.3.0-1
================================
1.3.0-1 Filip Brcic (brcha@xxxxxxx) Mon Jan 25 17:00:50 2010
numpy 1.3.0
numpy-1.3.0.tar.gz: new
numpy-1.1.0-f2py.patch: new
--- /dev/null
+++ numpy-1.1.0-f2py.patch
@@ -0,0 +36 @@
+diff -Nur numpy/f2py/f2py.1 numpy/f2py.new/f2py.1
+--- numpy/f2py/f2py.1 2006-07-26 21:04:19.000000000 +0100
++++ numpy/f2py.new/f2py.1 2007-02-14 12:16:47.000000000 +0000
+@@ -184,7 +184,7 @@
+
+ Optional Numarray 0.9 or higher partially supported.
+
+-numpy_distutils from Scipy (can be downloaded from F2PY homepage)
++numpy_distutils from Numpy (can be downloaded from F2PY homepage)
+ .SH "SEE ALSO"
+ python(1)
+ .SH BUGS
+@@ -200,10 +200,8 @@
+
+ Mailing list: http://cens.ioc.ee/mailman/listinfo/f2py-users/
+
+-Scipy website: http://www.numpy.org
++Numpy website: http://numeric.numpy.org
+ .SH COPYRIGHT
+ Copyright (c) 1999, 2000, 2001, 2002, 2003, 2004, 2005 Pearu Peterson
+ .SH LICENSE
+ NumPy License
+-.SH VERSION
+-2.45.241
+diff -Nur numpy/f2py/setup.py numpy/f2py.new/setup.py
+--- numpy/f2py/setup.py 2006-10-03 05:35:22.000000000 +0100
++++ numpy/f2py.new/setup.py 2007-02-14 12:16:41.000000000 +0000
+@@ -35,8 +35,7 @@
+
+ config.add_data_files('src/fortranobject.c',
+ 'src/fortranobject.h',
+- 'f2py.1'
+ )
+
+ config.make_svn_version_py()
+
numpy-1.3.0-alpha.patch: new
--- /dev/null
+++ numpy-1.3.0-alpha.patch
@@ -0,0 +24 @@
+diff -ur numpy-1.3.0.orig/numpy/core/include/numpy/npy_cpu.h
numpy-1.3.0/numpy/core/include/numpy/npy_cpu.h
+--- numpy-1.3.0.orig/numpy/core/include/numpy/npy_cpu.h 2009-07-22
16:22:51.000000000 +0200
++++ numpy-1.3.0/numpy/core/include/numpy/npy_cpu.h 2009-07-22
16:23:18.000000000 +0200
+@@ -44,6 +44,8 @@
+ #define NPY_CPU_IA64
+ #elif defined(__hppa__)
+ #define NPY_CPU_PARISC
++#elif defined(__alpha__)
++ #define NPY_CPU_ALPHA
+ #else
+ #error Unknown CPU, please report this to numpy maintainers with \
+ information about your platform (OS, CPU and compiler)
+diff -ur numpy-1.3.0.orig/numpy/core/include/numpy/npy_endian.h
numpy-1.3.0/numpy/core/include/numpy/npy_endian.h
+--- numpy-1.3.0.orig/numpy/core/include/numpy/npy_endian.h 2009-07-22
16:22:51.000000000 +0200
++++ numpy-1.3.0/numpy/core/include/numpy/npy_endian.h 2009-07-22
16:23:04.000000000 +0200
+@@ -22,7 +22,7 @@
+ #include "npy_cpu.h"
+
+ #if defined(NPY_CPU_X86) || defined(NPY_CPU_AMD64)\
+- || defined(NPY_CPU_IA64)
++ || defined(NPY_CPU_IA64) || defined(NPY_CPU_ALPHA)
+ #define NPY_LITTLE_ENDIAN
+ #define NPY_BYTE_ORDER 1234
+ #elif defined(NPY_CPU_PPC) || defined(NPY_CPU_SPARC)\
numpy-1.3.0-parisc.patch: new
--- /dev/null
+++ numpy-1.3.0-parisc.patch
@@ -0,0 +12 @@
+--- numpy-1.3.0/numpy/core/include/numpy/npy_cpu.h.orig 2009-04-05
10:09:20.000000000 +0200
++++ numpy-1.3.0/numpy/core/include/numpy/npy_cpu.h 2009-07-15
17:13:35.000000000 +0200
+@@ -42,8 +42,7 @@
+ #define NPY_CPU_S390
+ #elif defined(__ia64)
+ #define NPY_CPU_IA64
+-#elif defined(__parisc__)
+- /* XXX: Not sure about this one... */
++#elif defined(__hppa__)
+ #define NPY_CPU_PARISC
+ #else
+ #error Unknown CPU, please report this to numpy maintainers with \
numpy.recipe: new
--- /dev/null
+++ numpy.recipe
@@ -0,0 +87 @@
+#
+# Copyright (c) 2010 Filip Brcic <brcha@xxxxxxxxxxxx>
+# Distributed under the terms of the GNU General Public License v3
+#
+
+loadSuperClass('python')
+class Numpy(CPackageRecipe, Python.VersionMixIn):
+ name = 'numpy'
+ version = '1.3.0'
+
+ buildRequires = [
+ 'blas-reference:devellib', 'gcc-fortran:devellib',
+ 'lapack-reference:devellib', 'pyrex:python', 'python:devel',
+ ]
+
+ shortDesc = 'Numerical Python'
+ longDesc = 'Fast array and numerical python library'
+ url = 'http://numpy.scipy.org/'
+ licenses = [ 'BSD' ]
+ categories = [ 'Development/Python' ]
+
+ def setup(r):
+ r.setDefaultPython()
+ r.addArchive('mirror://sourceforge/numpy/')
+
+ for p in [ 'numpy-1.1.0-f2py.patch',
+ 'numpy-1.3.0-parisc.patch',
+ 'numpy-1.3.0-alpha.patch',
+ 'numpy-1.3.0-arm-sh.patch',
+ 'numpy-1.3.0-fenv-freebsd.patch',
+ ]:
+ r.addPatch(p)
+
+ r.Replace(("'f77blas'", "'blas'"),
+ ("'ptf77blas'", "'blas'"),
+ ("'ptcblas'", "'cblas'"),
+ ("'lapack_atlas'", "'lapack'"),
+ 'numpy/distutils/system_info.py')
+
+ r.macros.ldflags += ' -shared'
+
+ r.macros.fflags = r.macros.cflags
+ r.macros.fflags += ' -fPIC'
+
+ r.macros.ldflags += ' $(pkg-config --libs-only-other cblas lapack)'
+
+ r.Run("sed -i -e '/NO_ATLAS_INFO/,+1d' numpy/core/setup.py")
+
+ r.Create('site.cfg', contents="""
+[atlas]
+include_dirs = $(pkg-config --cflags-only-I \
+ cblas | sed -e 's/^-I//' -e 's/ -I/:/g')
+library_dirs = $(pkg-config --libs-only-L \
+ cblas blas lapack | sed -e \
+ 's/^-L//' -e 's/ -L/:/g' -e 's/ //g'):%(libdir)s
+atlas_libs = $(pkg-config --libs-only-l \
+ cblas blas | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
+lapack_libs = $(pkg-config --libs-only-l \
+ lapack | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
+[blas_opt]
+include_dirs = $(pkg-config --cflags-only-I \
+ cblas | sed -e 's/^-I//' -e 's/ -I/:/g')
+library_dirs = $(pkg-config --libs-only-L \
+ cblas blas | sed -e 's/^-L//' -e 's/ -L/:/g' \
+ -e 's/ //g'):%(libdir)s
+libraries = $(pkg-config --libs-only-l \
+ cblas blas | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
+[lapack_opt]
+library_dirs = $(pkg-config --libs-only-L \
+ lapack | sed -e 's/^-L//' -e 's/ -L/:/g' \
+ -e 's/ //g'):%(libdir)s
+libraries = $(pkg-config --libs-only-l \
+ lapack | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
+""")
+
+ r.Environment('FFLAGS', '%(fflags)s')
+ r.Environment('ED', '%(destdir)s')
+
+ r.PythonSetup('config_fc --noopt --noarch')
+
+ r.Remove('%(sitepkgs)s/%(name)s/*.txt')
+
+ r.Doc('numpy/f2py/docs/*.txt', dir='f2py')
+
+ r.Install('numpy/f2py/f2py.1', '%(mandir)s/man1/')
+
+ r.Doc('THANKS.txt', 'DEV_README.txt', 'COMPATIBILITY')
numpy-1.3.0-arm-sh.patch: new
--- /dev/null
+++ numpy-1.3.0-arm-sh.patch
@@ -0,0 +50 @@
+diff -urNp numpy-1.3.0-old/numpy/core/include/numpy/npy_cpu.h
numpy-1.3.0-new/numpy/core/include/numpy/npy_cpu.h
+--- numpy-1.3.0-old/numpy/core/include/numpy/npy_cpu.h 2009-08-16
17:49:39.000000000 +0530
++++ numpy-1.3.0-new/numpy/core/include/numpy/npy_cpu.h 2009-08-16
17:49:19.000000000 +0530
+@@ -9,6 +9,10 @@
+ * NPY_CPU_S390
+ * NPY_CPU_IA64
+ * NPY_CPU_PARISC
++ * NPY_CPU_ARMEL
++ * NPY_CPU_ARMEB
++ * NPY_CPU_SH_LE
++ * NPY_CPU_SH_BE
+ */
+ #ifndef _NPY_CPUARCH_H_
+ #define _NPY_CPUARCH_H_
+@@ -46,6 +50,14 @@
+ #define NPY_CPU_PARISC
+ #elif defined(__alpha__)
+ #define NPY_CPU_ALPHA
++#elif defined(__arm__) && defined(__ARMEL__)
++ #define NPY_CPU_ARMEL
++#elif defined(__arm__) && defined(__ARMEB__)
++ #define NPY_CPU_ARMEB
++#elif defined(__sh__) && defined(__LITTLE_ENDIAN__)
++ #define NPY_CPU_SH_LE
++#elif defined(__sh__) && defined(__BIG_ENDIAN__)
++ #define NPY_CPU_SH_BE
+ #else
+ #error Unknown CPU, please report this to numpy maintainers with \
+ information about your platform (OS, CPU and compiler)
+diff -urNp numpy-1.3.0-old/numpy/core/include/numpy/npy_endian.h
numpy-1.3.0-new/numpy/core/include/numpy/npy_endian.h
+--- numpy-1.3.0-old/numpy/core/include/numpy/npy_endian.h 2009-08-16
17:49:46.000000000 +0530
++++ numpy-1.3.0-new/numpy/core/include/numpy/npy_endian.h 2009-08-16
17:48:39.000000000 +0530
+@@ -22,11 +22,15 @@
+ #include "npy_cpu.h"
+
+ #if defined(NPY_CPU_X86) || defined(NPY_CPU_AMD64)\
+- || defined(NPY_CPU_IA64) || defined(NPY_CPU_ALPHA)
++ || defined(NPY_CPU_IA64) || defined(NPY_CPU_ALPHA)\
++ || defined(NPY_CPU_ARMEL)\
++ || defined(NPY_CPU_SH_LE)
+ #define NPY_LITTLE_ENDIAN
+ #define NPY_BYTE_ORDER 1234
+ #elif defined(NPY_CPU_PPC) || defined(NPY_CPU_SPARC)\
+- || defined(NPY_CPU_S390) || defined(NPY_CPU_PARISC)
++ || defined(NPY_CPU_S390) || defined(NPY_CPU_PARISC)\
++ || defined(NPY_CPU_ARMEB)\
++ || defined(NPY_CPU_SH_BE)
+ #define NPY_BIG_ENDIAN
+ #define NPY_BYTE_ORDER 4321
+ #else
numpy-1.3.0-fenv-freebsd.patch: new
--- /dev/null
+++ numpy-1.3.0-fenv-freebsd.patch
@@ -0,0 +28 @@
+--- numpy/core/include/numpy/ufuncobject.h.orig 2009-07-28 15:04:42
-0400
++++ numpy/core/include/numpy/ufuncobject.h 2009-07-28 15:05:58 -0400
+@@ -318,8 +318,10 @@
+
+ #elif defined(__GLIBC__) || defined(__APPLE__) || defined(__CYGWIN__) ||
defined(__MINGW32__) || (defined(__FreeBSD__) && (__FreeBSD_version >= 502114))
+
+-#if defined(__GLIBC__) || defined(__APPLE__) || defined(__MINGW32__) ||
defined(__FreeBSD__)
++#if defined(__GLIBC__) || defined(__APPLE__) || defined(__MINGW32__)
+ #include <fenv.h>
++#elif defined(__FreeBSD__)
++#include "fenv/fenv.h"
+ #elif defined(__CYGWIN__)
+ #include "fenv/fenv.c"
+ #endif
+--- numpy/numarray/_capi.c.orig 2009-07-28 15:18:13 -0400
++++ numpy/numarray/_capi.c 2009-07-28 15:19:04 -0400
+@@ -8,8 +8,10 @@
+ #include <sys/param.h>
+ #endif
+
+-#if defined(__GLIBC__) || defined(__APPLE__) || defined(__MINGW32__) ||
(defined(__FreeBSD__) && (__FreeBSD_version >= 502114))
++#if defined(__GLIBC__) || defined(__APPLE__) || defined(__MINGW32__)
+ #include <fenv.h>
++#elif (defined(__FreeBSD__) && (__FreeBSD_version >= 502114))
++#include "numpy/fenv/fenv.h"
+ #elif defined(__CYGWIN__)
+ #include "numpy/fenv/fenv.h"
+ #include "numpy/fenv/fenv.c"
Committed by: brcha
Other related posts:
- » [weasel-commit] Source: numpy=1.3.0-1 - rbuilder
