diff options
| author |   Justin Bronder <jsbronder@gentoo.org> | 2008-01-11 17:06:19 +0000 |
|---|---|---|
| committer | Justin Bronder <jsbronder@gentoo.org> | 2008-01-11 17:06:19 +0000 |
| commit | dc67c4e9abb2f6b0b86085ace2ae59a712570910 (patch) | |
| tree | 5d191640b9be4ed7027ca1529889a5e802d500f6 /dev-python/numpy/files | |
| parent | this revision removes cairo and X USE-fag as they are pretty redundant and sh... (diff) | |
| download | gentoo-2-dc67c4e9abb2f6b0b86085ace2ae59a712570910.tar.gz gentoo-2-dc67c4e9abb2f6b0b86085ace2ae59a712570910.tar.bz2 gentoo-2-dc67c4e9abb2f6b0b86085ace2ae59a712570910.zip | |
Fix cpuinfo to correctly detect nocona-based hardware. Bug 183236.
(Portage version: 2.1.3.19)
Diffstat (limited to 'dev-python/numpy/files')
| -rw-r--r-- | dev-python/numpy/files/digest-numpy-1.0.4-r1 | 3 | ||||
| -rw-r--r-- | dev-python/numpy/files/numpy-1.0.4-nocona-cpuinfo.patch | 26 |
2 files changed, 29 insertions, 0 deletions
diff --git a/dev-python/numpy/files/digest-numpy-1.0.4-r1 b/dev-python/numpy/files/digest-numpy-1.0.4-r1 new file mode 100644 index 000000000000..2abfed99cb45 --- /dev/null +++ b/dev-python/numpy/files/digest-numpy-1.0.4-r1 @@ -0,0 +1,3 @@ +MD5 8f011e9d7697da570efaac61c51725e0 numpy-1.0.4.tar.gz 1547541 +RMD160 8ac192ad3f36a94a45c26e0c4028fdbb744881f5 numpy-1.0.4.tar.gz 1547541 +SHA256 b993ecc060aa2bdca9a45a552f4ea77d96959ce0f429d5f9019e05738d68c9bd numpy-1.0.4.tar.gz 1547541 diff --git a/dev-python/numpy/files/numpy-1.0.4-nocona-cpuinfo.patch b/dev-python/numpy/files/numpy-1.0.4-nocona-cpuinfo.patch new file mode 100644 index 000000000000..7b344ad8f9f5 --- /dev/null +++ b/dev-python/numpy/files/numpy-1.0.4-nocona-cpuinfo.patch @@ -0,0 +1,26 @@ +diff -urN numpy-1.0.4/numpy/distutils/cpuinfo.py numpy-1.0.4-patched/numpy/distutils/cpuinfo.py +--- numpy-1.0.4/numpy/distutils/cpuinfo.py 2007-11-07 17:05:15.000000000 -0500 ++++ numpy-1.0.4-patched/numpy/distutils/cpuinfo.py 2008-01-11 11:44:23.000000000 -0500 +@@ -222,7 +222,12 @@ + return self.is_PentiumIV() and self.has_sse3() + + def _is_Nocona(self): +- return self.is_64bit() and self.is_PentiumIV() ++ return self.is_Intel() \ ++ and ( self.info[0]['cpu family'] == '6' \ ++ or self.info[0]['cpu family'] == '15' ) \ ++ and self.has_sse3() \ ++ and re.match(r'.*?\blm\b',self.info[0]['flags']) is not None ++ + + def _is_Core2(self): + return self.is_64bit() and self.is_Intel() and \ +@@ -263,7 +268,7 @@ + return re.match(r'.*?\bsse2\b',self.info[0]['flags']) is not None + + def _has_sse3(self): +- return re.match(r'.*?\bsse3\b',self.info[0]['flags']) is not None ++ return re.match(r'.*?\bsss?e3\b',self.info[0]['flags']) is not None + + def _has_3dnow(self): + return re.match(r'.*?\b3dnow\b',self.info[0]['flags']) is not None |