[Python-modules-commits] r23439 - in packages/numpy/trunk/debian (2 files)
morph at users.alioth.debian.org
morph at users.alioth.debian.org
Thu Feb 7 19:29:34 UTC 2013
Date: Thursday, February 7, 2013 @ 19:29:31
Author: morph
Revision: 23439
* debian/patches/40_m68k_long_double_format.diff
- updated to new upstream code
Modified:
packages/numpy/trunk/debian/changelog
packages/numpy/trunk/debian/patches/40_m68k_long_double_format.diff
Modified: packages/numpy/trunk/debian/changelog
===================================================================
--- packages/numpy/trunk/debian/changelog 2013-02-07 19:16:48 UTC (rev 23438)
+++ packages/numpy/trunk/debian/changelog 2013-02-07 19:29:31 UTC (rev 23439)
@@ -2,13 +2,15 @@
[ Sandro Tosi ]
* New upstream release candidate
+ * debian/patches/40_m68k_long_double_format.diff
+ - updated to new upstream code
[ Yaroslav Halchenko ]
* debian/rules
- safe-guard all for loops with 'set -e; ' to prevent uncaught failures;
Closes: #695955
- -- Sandro Tosi <morph at debian.org> Thu, 07 Feb 2013 20:16:13 +0100
+ -- Sandro Tosi <morph at debian.org> Thu, 07 Feb 2013 20:29:19 +0100
python-numpy (1:1.7.0~rc1-1) experimental; urgency=low
Modified: packages/numpy/trunk/debian/patches/40_m68k_long_double_format.diff
===================================================================
--- packages/numpy/trunk/debian/patches/40_m68k_long_double_format.diff 2013-02-07 19:16:48 UTC (rev 23438)
+++ packages/numpy/trunk/debian/patches/40_m68k_long_double_format.diff 2013-02-07 19:29:31 UTC (rev 23439)
@@ -13,24 +13,20 @@
numpy/core/src/private/npy_fpmath.h | 1 +
7 files changed, 50 insertions(+), 1 deletions(-)
-diff --git a/numpy/core/include/numpy/npy_cpu.h b/numpy/core/include/numpy/npy_cpu.h
-index 8a29788..f094ff4 100644
--- a/numpy/core/include/numpy/npy_cpu.h
+++ b/numpy/core/include/numpy/npy_cpu.h
-@@ -66,6 +66,8 @@
- #define NPY_CPU_MIPSEL
- #elif defined(__MIPSEB__)
+@@ -68,6 +68,8 @@
#define NPY_CPU_MIPSEB
+ #elif defined(__aarch64__)
+ #define NPY_CPU_AARCH64
+#elif defined(__mc68000__)
+ #define NPY_CPU_M68K
#else
#error Unknown CPU, please report this to numpy maintainers with \
information about your platform (OS, CPU and compiler)
-diff --git a/numpy/core/include/numpy/npy_endian.h b/numpy/core/include/numpy/npy_endian.h
-index aa5ed8b..2bf2177 100644
--- a/numpy/core/include/numpy/npy_endian.h
+++ b/numpy/core/include/numpy/npy_endian.h
-@@ -35,7 +35,8 @@
+@@ -36,7 +36,8 @@
|| defined(NPY_CPU_PPC64) \
|| defined(NPY_CPU_ARMEB) \
|| defined(NPY_CPU_SH_BE) \
@@ -40,11 +36,9 @@
#define NPY_BYTE_ORDER NPY_BIG_ENDIAN
#else
#error Unknown CPU: can not set endianness
-diff --git a/numpy/core/scons_support.py b/numpy/core/scons_support.py
-index 048f85d..cf451ca 100644
--- a/numpy/core/scons_support.py
+++ b/numpy/core/scons_support.py
-@@ -241,6 +241,7 @@ def CheckLongDoubleRepresentation(context):
+@@ -241,6 +241,7 @@ def CheckLongDoubleRepresentation(contex
msg = {
'INTEL_EXTENDED_12_BYTES_LE': "Intel extended, little endian",
'INTEL_EXTENDED_16_BYTES_LE': "Intel extended, little endian",
@@ -52,11 +46,9 @@
'IEEE_QUAD_BE': "IEEE Quad precision, big endian",
'IEEE_QUAD_LE': "IEEE Quad precision, little endian",
'IEEE_DOUBLE_LE': "IEEE Double precision, little endian",
-diff --git a/numpy/core/setup.py b/numpy/core/setup.py
-index e8f40e8..cf6168c 100644
--- a/numpy/core/setup.py
+++ b/numpy/core/setup.py
-@@ -442,6 +442,7 @@ def configuration(parent_package='',top_path=None):
+@@ -442,6 +442,7 @@ def configuration(parent_package='',top_
rep = check_long_double_representation(config_cmd)
if rep in ['INTEL_EXTENDED_12_BYTES_LE',
'INTEL_EXTENDED_16_BYTES_LE',
@@ -64,11 +56,9 @@
'IEEE_QUAD_LE', 'IEEE_QUAD_BE',
'IEEE_DOUBLE_LE', 'IEEE_DOUBLE_BE',
'DOUBLE_DOUBLE_BE']:
-diff --git a/numpy/core/setup_common.py b/numpy/core/setup_common.py
-index e88be40..af024f3 100644
--- a/numpy/core/setup_common.py
+++ b/numpy/core/setup_common.py
-@@ -216,6 +216,8 @@ _INTEL_EXTENDED_12B = ['000', '000', '000', '000', '240', '242', '171', '353',
+@@ -216,6 +216,8 @@ _INTEL_EXTENDED_12B = ['000', '000', '00
'031', '300', '000', '000']
_INTEL_EXTENDED_16B = ['000', '000', '000', '000', '240', '242', '171', '353',
'031', '300', '000', '000', '000', '000', '000', '000']
@@ -86,11 +76,9 @@
elif read[:8] == _BEFORE_SEQ[8:]:
if read[8:-8] == _INTEL_EXTENDED_16B:
return 'INTEL_EXTENDED_16_BYTES_LE'
-diff --git a/numpy/core/src/npymath/npy_math_private.h b/numpy/core/src/npymath/npy_math_private.h
-index 722d03f..c6f11f8 100644
--- a/numpy/core/src/npymath/npy_math_private.h
+++ b/numpy/core/src/npymath/npy_math_private.h
-@@ -250,6 +250,45 @@ do { \
+@@ -250,6 +250,45 @@ do {
typedef npy_uint32 ldouble_man_t;
typedef npy_uint32 ldouble_exp_t;
typedef npy_uint32 ldouble_sign_t;
@@ -136,8 +124,6 @@
#elif defined(HAVE_LDOUBLE_IEEE_DOUBLE_16_BYTES_BE) || \
defined(HAVE_LDOUBLE_IEEE_DOUBLE_BE)
/* 64 bits IEEE double precision aligned on 16 bytes: used by ppc arch on
-diff --git a/numpy/core/src/private/npy_fpmath.h b/numpy/core/src/private/npy_fpmath.h
-index 92338e4..8a120ca 100644
--- a/numpy/core/src/private/npy_fpmath.h
+++ b/numpy/core/src/private/npy_fpmath.h
@@ -40,6 +40,7 @@
@@ -148,6 +134,3 @@
defined(HAVE_LDOUBLE_DOUBLE_DOUBLE_BE))
#error No long double representation defined
#endif
---
-1.7.8.3
-
More information about the Python-modules-commits
mailing list