Blame 0001-add-java-1.7.0-openjdk-devel-to-the-multilib-blackli.patch
|
 |
5d70714 |
From b1a3a1162d002f036219d721c9ed244f764c8351 Mon Sep 17 00:00:00 2001
|
|
 |
5d70714 |
From: Dennis Gilmore <dennis@ausil.us>
|
|
 |
5d70714 |
Date: Tue, 8 May 2012 21:23:32 -0500
|
|
 |
5d70714 |
Subject: [PATCH] add java-1.7.0-openjdk-devel to the multilib blacklist
|
|
 |
5d70714 |
|
|
 |
5d70714 |
---
|
|
 |
5d70714 |
mash/multilib.py | 3 ++-
|
|
 |
5d70714 |
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
 |
5d70714 |
|
|
 |
5d70714 |
diff --git a/mash/multilib.py b/mash/multilib.py
|
|
 |
5d70714 |
index 4e64b88..e1d0971 100644
|
|
 |
5d70714 |
--- a/mash/multilib.py
|
|
 |
5d70714 |
+++ b/mash/multilib.py
|
|
 |
5d70714 |
@@ -170,7 +170,8 @@ class DevelMultilibMethod(RuntimeMultilibMethod):
|
|
 |
5d70714 |
self.name = 'devel'
|
|
 |
5d70714 |
|
|
 |
5d70714 |
def select(self, po):
|
|
 |
5d70714 |
- blacklist = ['dmraid-devel', 'kdeutils-devel', 'mkinitrd-devel', 'java-1.5.0-gcj-devel', 'java-1.7.0-icedtea-devel', 'php-devel', 'java-1.6.0-openjdk-devel' ]
|
|
 |
5d70714 |
+ blacklist = ['dmraid-devel', 'kdeutils-devel', 'mkinitrd-devel', 'java-1.5.0-gcj-devel', 'java-1.7.0-icedtea-devel', 'php-devel', 'java-1.6.0-openjdk-devel',
|
|
 |
5d70714 |
+ 'java-1.7.0-openjdk-devel' ]
|
|
 |
5d70714 |
whitelist = ['glibc-static', 'libstdc++-static']
|
|
 |
5d70714 |
if po.name in blacklist:
|
|
 |
5d70714 |
return False
|
|
 |
5d70714 |
--
|
|
 |
5d70714 |
1.7.10.1
|
|
 |
5d70714 |
|