|
 |
c5ffd2d |
--- mash-0.1.18/mash/multilib.py 2007-06-21 12:29:30.000000000 -0400
|
|
|
c5ffd2d |
+++ mash/mash/multilib.py 2007-09-06 10:23:04.000000000 -0400
|
|
|
9968d5f |
@@ -5,7 +5,7 @@ class MultilibMethod:
|
|
|
9968d5f |
def __init__(self):
|
|
|
9968d5f |
self.name = 'base'
|
|
|
9968d5f |
def select(self, po):
|
|
|
9968d5f |
- prefer_64 = [ 'gdb', 'frysk', 'systemtap', 'systemtap-runtime', 'ltrace', 'strace', 'valgrind']
|
|
|
9968d5f |
+ prefer_64 = [ 'gdb', 'frysk', 'systemtap', 'systemtap-runtime', 'ltrace', 'strace' ]
|
|
|
9968d5f |
if po.arch.find('64') != -1:
|
|
|
9968d5f |
if po.name in prefer_64:
|
|
|
9968d5f |
return True
|
|
|
9968d5f |
@@ -54,7 +54,7 @@ class RuntimeMultilibMethod(MultilibMeth
|
|
|
9968d5f |
|
|
|
9968d5f |
def select(self, po):
|
|
|
9968d5f |
libdirs = [ '/usr/lib', '/usr/lib64', '/lib', '/lib64' ]
|
|
|
9968d5f |
- whitelist = ['scim-bridge-gtk', 'scim-qtimm', 'redhat-artwork', 'gtk2-engines', 'libgnat', 'wine', 'wine-arts' ]
|
|
|
9968d5f |
+ whitelist = ['scim-bridge-gtk', 'scim-qtimm', 'redhat-artwork', 'gtk2-engines', 'libgnat', 'wine', 'wine-arts', 'valgrind' ]
|
|
|
9968d5f |
if po.name in whitelist:
|
|
|
9968d5f |
return True
|
|
|
9968d5f |
if MultilibMethod.select(self,po):
|
|
|
c5ffd2d |
@@ -87,18 +109,18 @@
|
|
|
c5ffd2d |
self.name = 'devel'
|
|
|
c5ffd2d |
|
|
|
c5ffd2d |
def select(self, po):
|
|
|
c5ffd2d |
- blacklist = ['dmraid-devel', 'kdeutils-devel', 'mkinitrd-devel', 'java-1.5.0-gcj-devel']
|
|
|
c5ffd2d |
+ blacklist = ['dmraid-devel', 'kdeutils-devel', 'mkinitrd-devel', 'java-1.5.0-gcj-devel', 'java-1.7.0-icedtea-devel' ]
|
|
|
c5ffd2d |
whitelist = ['perl']
|
|
|
c5ffd2d |
if po.name in blacklist:
|
|
|
c5ffd2d |
return False
|
|
|
c5ffd2d |
- if po.name.startswith('kernel'):
|
|
|
c5ffd2d |
- for (p_name, p_flag, (p_e, p_v, p_r)) in po.provides:
|
|
|
c5ffd2d |
- if p_name == 'kernel-devel':
|
|
|
c5ffd2d |
- return False
|
|
|
c5ffd2d |
if po.name in whitelist:
|
|
|
c5ffd2d |
return True
|
|
|
c5ffd2d |
if RuntimeMultilibMethod.select(self,po):
|
|
|
c5ffd2d |
return True
|
|
|
c5ffd2d |
+ if po.name.startswith('kernel'):
|
|
|
c5ffd2d |
+ for (p_name, p_flag, (p_e, p_v, p_r)) in po.provides:
|
|
|
c5ffd2d |
+ if p_name == 'kernel-devel':
|
|
|
c5ffd2d |
+ return False
|
|
|
c5ffd2d |
if po.name.endswith('-devel'):
|
|
|
c5ffd2d |
return True
|
|
|
c5ffd2d |
return False
|