updated masks on interix, make coreutils static (for suacomp rebuildability)

4 files changed, 26 insertions, 25 deletions

diff --git a/profiles/prefix/ChangeLog b/profiles/prefix/ChangeLog
index 85d3ec230fe8..af076747ccca 100644
--- a/profiles/prefix/ChangeLog
+++ b/profiles/prefix/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for profiles/prefix
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/ChangeLog,v 1.226 2010/11/06 11:02:42 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/ChangeLog,v 1.227 2010/11/16 08:16:36 mduft Exp $
+
+  16 Nov 2010; Markus Duft <mduft@gentoo.org> windows/interix/package.mask,
+  windows/interix/package.use.force, windows/interix/package.use.mask:
+  updated masks on interix, make coreutils static (for suacomp
+  rebuildability)
 
   06 Nov 2010; Alex Alexander <wired@gentoo.org> package.mask:
   Masked Qt-4.7 as requested by prefix team, bug #338289
diff --git a/profiles/prefix/windows/interix/package.mask b/profiles/prefix/windows/interix/package.mask
index e95b8d51deb2..72b763bf6ed5 100644
--- a/profiles/prefix/windows/interix/package.mask
+++ b/profiles/prefix/windows/interix/package.mask
@@ -1,8 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/windows/interix/package.mask,v 1.11 2010/10/19 13:59:51 mduft Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/windows/interix/package.mask,v 1.12 2010/11/16 08:16:36 mduft Exp $
 
-# $Id: package.mask,v 1.11 2010/10/19 13:59:51 mduft Exp $
+# $Id: package.mask,v 1.12 2010/11/16 08:16:36 mduft Exp $
 
 # Markus Duft <mduft@gentoo.org> (17 Feb 2010)
 # not quite yet... seems that perl itself is simply not even trying
@@ -10,23 +10,6 @@
 >=dev-lang/perl-5.10.0
 >=sys-devel/libperl-5.10.0
 
-# Markus Duft <mduft@gentoo.org> (30 Sep 2009)
-# needs some more love on interix, until it works again :(
-~sys-apps/coreutils-7.6
-
-# Markus Duft <mduft@gentoo.org> (18 Aug 2009)
-# xargs seems broken: Assertion failed: (bc_ctl.arg_max <= (ARG_MAX-2048)), file xargs.c, line 442.
-~sys-apps/findutils-4.5.5
-
-# Markus Duft <mduft@gentoo.org> (13 Aug 2009)
-# requires xcb-util, which does not work for interix (yet?).
->=x11-libs/startup-notification-0.10
-
-# Markus Duft <mduft@gentoo.org> (02 Feb 2009)
-# this does not work correctly, since there seems to be some
-# more non-trivial problems with dbus :*(
->=gnome-base/gconf-2.24.0
-
 # Markus Duft <mduft@gentoo.org> (29 Oct 2008)
 # this version doesn't work on interix, since unconditional
 # usage of "mbsinit" and "mbrtowc" which don't exist.
diff --git a/profiles/prefix/windows/interix/package.use.force b/profiles/prefix/windows/interix/package.use.force
index c4b51fb1429c..a12ca5fd4a12 100644
--- a/profiles/prefix/windows/interix/package.use.force
+++ b/profiles/prefix/windows/interix/package.use.force
@@ -1,5 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/windows/interix/package.use.force,v 1.1 2009/06/06 03:55:07 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/windows/interix/package.use.force,v 1.2 2010/11/16 08:16:36 mduft Exp $
+
+# Markus Duft <mduft@gentoo.org> (28 Oct 2010)
+# really need them statically, as long as portage uses coreutils
+# during merge. if re-merging suacomp, utilities don't work otherwise.
+sys-apps/coreutils static
 
 sys-devel/binutils-config extwrapper
diff --git a/profiles/prefix/windows/interix/package.use.mask b/profiles/prefix/windows/interix/package.use.mask
index 454a42a7066d..eac681bc9f2c 100644
--- a/profiles/prefix/windows/interix/package.use.mask
+++ b/profiles/prefix/windows/interix/package.use.mask
@@ -1,8 +1,16 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/windows/interix/package.use.mask,v 1.1 2009/06/06 03:55:07 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/windows/interix/package.use.mask,v 1.2 2010/11/16 08:16:36 mduft Exp $
+
+# Markus Duft <mduft@gentoo.org> (28 Oct 2010)
+# mask optimization flags from eix, as they cause build troubles
+# wrt visibility flags - seems gcc 4.2.4 on interix needs another
+# patch (it already has one to disable -fvisibility=, but that
+# seems to miss -fvisibility-inlines-hidden, etc.)
+app-portage/eix optimization strong-optimization
 
 dev-scheme/guile threads
 x11-wm/fluxbox nls
 net-libs/libsoup ssl
 app-arch/pdv X
+