[Python-modules-commits] r30473 - in packages/numpy/trunk/debian (3 files)
jtaylor-guest at users.alioth.debian.org
jtaylor-guest at users.alioth.debian.org
Tue Sep 2 20:04:47 UTC 2014
Date: Tuesday, September 2, 2014 @ 20:04:46
Author: jtaylor-guest
Revision: 30473
drop upstream applied ppc64el_cpu_config.patch
Modified:
packages/numpy/trunk/debian/changelog
packages/numpy/trunk/debian/patches/series
Deleted:
packages/numpy/trunk/debian/patches/ppc64el_cpu_config.patch
Modified: packages/numpy/trunk/debian/changelog
===================================================================
--- packages/numpy/trunk/debian/changelog 2014-09-02 20:04:43 UTC (rev 30472)
+++ packages/numpy/trunk/debian/changelog 2014-09-02 20:04:46 UTC (rev 30473)
@@ -5,6 +5,7 @@
f2py documentation moved to same tree as the rest
* debian/python{,}3-numpy.install:
oldnumeric and numarray have been removed
+ * drop upstream applied ppc64el_cpu_config.patch
-- Julian Taylor <jtaylor.debian at googlemail.com> Thu, 27 Aug 2014 19:35:20 +0200
Deleted: packages/numpy/trunk/debian/patches/ppc64el_cpu_config.patch
===================================================================
--- packages/numpy/trunk/debian/patches/ppc64el_cpu_config.patch 2014-09-02 20:04:43 UTC (rev 30472)
+++ packages/numpy/trunk/debian/patches/ppc64el_cpu_config.patch 2014-09-02 20:04:46 UTC (rev 30473)
@@ -1,110 +0,0 @@
-Description: support ppc64el long double format
-Origin: 2ba74c397a5d840665d07f4fc3b2fa00214d1fcd
-Applied-Upstream: 1.9.0
---- a/numpy/core/include/numpy/npy_cpu.h
-+++ b/numpy/core/include/numpy/npy_cpu.h
-@@ -5,6 +5,7 @@
- * NPY_CPU_AMD64
- * NPY_CPU_PPC
- * NPY_CPU_PPC64
-+ * NPY_CPU_PPC64LE
- * NPY_CPU_SPARC
- * NPY_CPU_S390
- * NPY_CPU_IA64
-@@ -41,6 +42,8 @@
- * _ARCH_PPC is used by at least gcc on AIX
- */
- #define NPY_CPU_PPC
-+#elif defined(__ppc64le__)
-+ #define NPY_CPU_PPC64LE
- #elif defined(__ppc64__)
- #define NPY_CPU_PPC64
- #elif defined(__sparc__) || defined(__sparc)
---- a/numpy/core/include/numpy/npy_endian.h
-+++ b/numpy/core/include/numpy/npy_endian.h
-@@ -27,7 +27,8 @@
- || defined(NPY_CPU_ARMEL) \
- || defined(NPY_CPU_AARCH64) \
- || defined(NPY_CPU_SH_LE) \
-- || defined(NPY_CPU_MIPSEL)
-+ || defined(NPY_CPU_MIPSEL) \
-+ || defined(NPY_CPU_PPC64LE)
- #define NPY_BYTE_ORDER NPY_LITTLE_ENDIAN
- #elif defined(NPY_CPU_PPC) \
- || defined(NPY_CPU_SPARC) \
---- a/numpy/core/src/private/npy_fpmath.h
-+++ b/numpy/core/src/private/npy_fpmath.h
-@@ -29,6 +29,8 @@
- #define HAVE_LDOUBLE_INTEL_EXTENDED_16_BYTES_LE
- #elif defined(NPY_CPU_PPC) || defined(NPY_CPU_PPC64)
- #define HAVE_LDOUBLE_IEEE_DOUBLE_16_BYTES_BE
-+ #elif defined(NPY_CPU_PPC64LE)
-+ #define HAVE_LDOUBLE_IEEE_DOUBLE_16_BYTES_LE
- #endif
- #endif
- #endif
-@@ -41,7 +43,8 @@
- defined(HAVE_LDOUBLE_INTEL_EXTENDED_16_BYTES_LE) || \
- defined(HAVE_LDOUBLE_INTEL_EXTENDED_12_BYTES_LE) || \
- defined(HAVE_LDOUBLE_MOTOROLA_EXTENDED_12_BYTES_BE) || \
-- defined(HAVE_LDOUBLE_DOUBLE_DOUBLE_BE))
-+ defined(HAVE_LDOUBLE_DOUBLE_DOUBLE_BE) || \
-+ defined(HAVE_LDOUBLE_DOUBLE_DOUBLE_LE))
- #error No long double representation defined
- #endif
-
---- a/numpy/core/setup.py
-+++ b/numpy/core/setup.py
-@@ -466,7 +466,7 @@ def configuration(parent_package='',top_
- 'MOTOROLA_EXTENDED_12_BYTES_BE',
- 'IEEE_QUAD_LE', 'IEEE_QUAD_BE',
- 'IEEE_DOUBLE_LE', 'IEEE_DOUBLE_BE',
-- 'DOUBLE_DOUBLE_BE']:
-+ 'DOUBLE_DOUBLE_BE', 'DOUBLE_DOUBLE_LE']:
- moredefs.append(('HAVE_LDOUBLE_%s' % rep, 1))
- else:
- raise ValueError("Unrecognized long double format: %s" % rep)
---- a/numpy/core/setup_common.py
-+++ b/numpy/core/setup_common.py
-@@ -256,6 +256,8 @@ _IEEE_QUAD_PREC_BE = ['300', '031', '326
- _IEEE_QUAD_PREC_LE = _IEEE_QUAD_PREC_BE[::-1]
- _DOUBLE_DOUBLE_BE = ['301', '235', '157', '064', '124', '000', '000', '000'] + \
- ['000'] * 8
-+_DOUBLE_DOUBLE_LE = ['000', '000', '000', '124', '064', '157', '235', '301'] + \
-+ ['000'] * 8
-
- def long_double_representation(lines):
- """Given a binary dump as given by GNU od -b, look for long double
-@@ -295,6 +297,8 @@ def long_double_representation(lines):
- return 'IEEE_QUAD_LE'
- elif read[8:-8] == _DOUBLE_DOUBLE_BE:
- return 'DOUBLE_DOUBLE_BE'
-+ elif read[8:-8] == _DOUBLE_DOUBLE_LE:
-+ return 'DOUBLE_DOUBLE_LE'
- elif read[:16] == _BEFORE_SEQ:
- if read[16:-8] == _IEEE_DOUBLE_LE:
- return 'IEEE_DOUBLE_LE'
---- a/numpy/core/src/npymath/ieee754.c.src
-+++ b/numpy/core/src/npymath/ieee754.c.src
-@@ -133,7 +133,8 @@ float _nextf(float x, int p)
- return x;
- }
-
--#ifdef HAVE_LDOUBLE_DOUBLE_DOUBLE_BE
-+#if defined(HAVE_LDOUBLE_DOUBLE_DOUBLE_BE) \
-+ || defined(HAVE_LDOUBLE_DOUBLE_DOUBLE_LE)
-
- /*
- * FIXME: this is ugly and untested. The asm part only works with gcc, and we
---- a/numpy/core/src/npymath/npy_math_private.h
-+++ b/numpy/core/src/npymath/npy_math_private.h
-@@ -435,7 +435,8 @@ do {
- typedef npy_uint32 ldouble_sign_t;
- #endif
-
--#ifndef HAVE_LDOUBLE_DOUBLE_DOUBLE_BE
-+#if !defined(HAVE_LDOUBLE_DOUBLE_DOUBLE_BE) \
-+ && !defined(HAVE_LDOUBLE_DOUBLE_DOUBLE_LE)
- /* Get the sign bit of x. x should be of type IEEEl2bitsrep */
- #define GET_LDOUBLE_SIGN(x) \
- (((x).a[LDBL_SIGN_INDEX] & LDBL_SIGN_MASK) >> LDBL_SIGN_SHIFT)
Modified: packages/numpy/trunk/debian/patches/series
===================================================================
--- packages/numpy/trunk/debian/patches/series 2014-09-02 20:04:43 UTC (rev 30472)
+++ packages/numpy/trunk/debian/patches/series 2014-09-02 20:04:46 UTC (rev 30473)
@@ -2,4 +2,3 @@
03_force_f2py_version.patch
10_use_local_python.org_object.inv_sphinx.diff
python3-soabi.patch
-ppc64el_cpu_config.patch
More information about the Python-modules-commits
mailing list