diff options
| author |   Arun Raghavan <ford_prefect@gentoo.org> | 2009-08-16 12:34:20 +0000 |
|---|---|---|
| committer | Arun Raghavan <ford_prefect@gentoo.org> | 2009-08-16 12:34:20 +0000 |
| commit | 9ac16503cafe610ac2b576a08ba57bc78b8e7d4f (patch) | |
| tree | cfd409f56859c38451290e0528e0860cedadfd61 /dev-python | |
| parent | Remove "-l 255" from ZEBRA_OPTS (#279763). Bump version and add doc USE flag. (diff) | |
| download | historical-9ac16503cafe610ac2b576a08ba57bc78b8e7d4f.tar.gz historical-9ac16503cafe610ac2b576a08ba57bc78b8e7d4f.tar.bz2 historical-9ac16503cafe610ac2b576a08ba57bc78b8e7d4f.zip | |
Fix arm/sh build
Package-Manager: portage-2.2_rc36/cvs/Linux i686
Diffstat (limited to 'dev-python')
| -rw-r--r-- | dev-python/numpy/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-python/numpy/Manifest | 5 | ||||
| -rw-r--r-- | dev-python/numpy/files/numpy-1.3.0-arm-sh.patch | 50 | ||||
| -rw-r--r-- | dev-python/numpy/numpy-1.3.0.ebuild | 3 |
4 files changed, 60 insertions, 4 deletions
diff --git a/dev-python/numpy/ChangeLog b/dev-python/numpy/ChangeLog index dd4d53e7acc4..61003969f0b8 100644 --- a/dev-python/numpy/ChangeLog +++ b/dev-python/numpy/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-python/numpy # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.90 2009/08/09 16:45:48 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.91 2009/08/16 12:34:20 ford_prefect Exp $ + + 16 Aug 2009; Arun Raghavan <ford_prefect@gentoo.org> numpy-1.3.0.ebuild, + +files/numpy-1.3.0-arm-sh.patch: + Fix arm/sh build 09 Aug 2009; Raúl Porcel <armin76@gentoo.org> numpy-1.2.1.ebuild: arm/sh stable diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest index 776906b18ff3..27378646a408 100644 --- a/dev-python/numpy/Manifest +++ b/dev-python/numpy/Manifest @@ -3,6 +3,7 @@ AUX numpy-1.0.4-cpuinfo.patch 4188 RMD160 540961a3aa87530703d8c5795c21dd5f0adc5a AUX numpy-1.0.4-freebsd.patch 3084 RMD160 9ec6841d9b8205d584f33356fcafc30047134d63 SHA1 719621772bbb7f4016396081cac1742d15050c01 SHA256 514f00a761ceb40f4380962f36035816fdd2ca7cde8d6c5aab74aab7fd11b073 AUX numpy-1.1.0-f2py.patch 1123 RMD160 ff90313cbe8282ac37b0cb98effa0ff6a03760c2 SHA1 5c37ea9be68782e533c7c2d64ca00e8e8ae648ea SHA256 cc67bc8ab7dba2febb91ba15cc51933021743a286c980e0068afd6fabdd065e7 AUX numpy-1.3.0-alpha.patch 1210 RMD160 d92ca3fa7d671da1ff8e3e2e1a6b64469cf7142b SHA1 0a8740710d7b2e40b1a8899771b641999440558b SHA256 ea0da717e694338a1bca72f1b635309be15af2cdee206b50de4b38ce95701c64 +AUX numpy-1.3.0-arm-sh.patch 2166 RMD160 cc60f574ab7fe29968ebc56f9018c2427f01f6cc SHA1 59b4751c26abf837a69d8bd637bd9abb89344f72 SHA256 9b373c5b8886df971c350c44766ccdf165ffec6c2082f68704121965ad7a2f37 AUX numpy-1.3.0-parisc.patch 474 RMD160 682971d65894aeb2e87de5f8eac717a8f7803318 SHA1 da6067bd782604119111d69fce06b7536d59f6ca SHA256 413af76d3b5518d2f544c4497110a3401d40a7ea713a7449ea8826facddbf225 DIST numpy-1.0.4.tar.gz 1547541 RMD160 8ac192ad3f36a94a45c26e0c4028fdbb744881f5 SHA1 9a1f09358c3310cf990eecd06dc2eb54aec78321 SHA256 b993ecc060aa2bdca9a45a552f4ea77d96959ce0f429d5f9019e05738d68c9bd DIST numpy-1.1.1.tar.gz 1611021 RMD160 745e9fbbd064272199f4c7b49d4a26797405dd17 SHA1 a2755f38ca6aa799b504c84f58b03cd6ce66bc41 SHA256 d430273a77aed959c007595d969fefa36c59249807212d7d89f5d6cf2a701dd6 @@ -11,6 +12,6 @@ DIST numpy-1.3.0.tar.gz 1995868 RMD160 a75155d2014204e16c59857b92356353505c39b9 EBUILD numpy-1.0.4-r2.ebuild 3507 RMD160 d9e70b8851cda2adf70aedc9b56d732152a3a69d SHA1 60c8073ce0a9eb72283abe0a0d57b220ffc129e8 SHA256 534b11c0d2d135780581e7adfa06b663b73846f188bce996d0841c0c954432d9 EBUILD numpy-1.1.1.ebuild 3349 RMD160 27aab3eea2c77ac03c8db40dc6e8116b74f9bfce SHA1 bbff358f0e5536a84c59e6a4906172daf7b16950 SHA256 ead32d70a2c65c81e7840920c6b52b6089b206af76fbce20b588131a819de534 EBUILD numpy-1.2.1.ebuild 4237 RMD160 523240c56efc80b8fdc32a7a0356d7bbb7d02059 SHA1 531b4656bfd3077d761c0e5074bf19cc033067cd SHA256 18d23bb2e7a8d9cc8c24e039a00b8004773f492af7ce6cd070bc6d1acdb28bc7 -EBUILD numpy-1.3.0.ebuild 3669 RMD160 96bf1475f56d43c09cbce0545e68fce2b3f47ec0 SHA1 7110bac4f729037369187e0b288289f4e0f743f4 SHA256 a27488024bf176ef18b8efa9851ce0437d260c6871524055fae37d8d7f0fe180 -MISC ChangeLog 12910 RMD160 34ed7c332e966f8ff980e4109acd4b0a29f78c52 SHA1 56145913512101e667dac9f038b5d62251af8305 SHA256 5a7160dab4c72fcbcdde099ff0611e74a6ace2ced454e94edd0a6660593507e4 +EBUILD numpy-1.3.0.ebuild 3715 RMD160 c070b79807b0530a4cfe62efee62ff6e7187fc4e SHA1 68a3c54f6a970d7e666df0a8e94fc08eaede444c SHA256 f575a34ad239d9321ffe19fa04ac3d679d76ed1f406d82192990990bcfc4d9d7 +MISC ChangeLog 13045 RMD160 d2dcd0d54a8a3774bf469f5d1c328c93a0d4d2f2 SHA1 ebdb23e21de6adb327ec8725576837e0bedc430c SHA256 0005c120b5c6bcb92e2580e2dcb15d11d47c33b91da814d62ea1cef1be259e19 MISC metadata.xml 612 RMD160 efd564f99da25694c47f63432d18f5a847a65cd8 SHA1 e765c10b67fe1d43fe5bc79e56b72d2ae2b133ad SHA256 272f018a6889de8fcded00da2ced5b11549d4e455aaf8107d20e74f13bf98ce1 diff --git a/dev-python/numpy/files/numpy-1.3.0-arm-sh.patch b/dev-python/numpy/files/numpy-1.3.0-arm-sh.patch new file mode 100644 index 000000000000..798eebb5aa7a --- /dev/null +++ b/dev-python/numpy/files/numpy-1.3.0-arm-sh.patch @@ -0,0 +1,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 diff --git a/dev-python/numpy/numpy-1.3.0.ebuild b/dev-python/numpy/numpy-1.3.0.ebuild index f7d8e84f9532..298aa24a0b46 100644 --- a/dev-python/numpy/numpy-1.3.0.ebuild +++ b/dev-python/numpy/numpy-1.3.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.3.0.ebuild,v 1.8 2009/08/02 14:29:52 nixnut Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.3.0.ebuild,v 1.9 2009/08/16 12:34:20 ford_prefect Exp $ NEED_PYTHON=2.4 EAPI=2 @@ -45,6 +45,7 @@ src_prepare() { epatch "${FILESDIR}/${P}-parisc.patch" # bug 277438 epatch "${FILESDIR}/${P}-alpha.patch" # bug 277438 + epatch "${FILESDIR}/${P}-arm-sh.patch" # Gentoo patch for ATLAS library names sed -i \ |