From: Fabian Groffen Date: Sun, 18 Apr 2010 15:48:56 +0000 (+0000) Subject: Move zlib mask up, since it breaks everywhere but on Linux X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b7444a8e0f8b929e676625642fa3086442effba2;p=gentoo.git Move zlib mask up, since it breaks everywhere but on Linux --- diff --git a/profiles/prefix/ChangeLog b/profiles/prefix/ChangeLog index 01b067f07bb6..254c5a43ad11 100644 --- a/profiles/prefix/ChangeLog +++ b/profiles/prefix/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for profiles/prefix # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/ChangeLog,v 1.170 2010/04/16 11:24:32 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/ChangeLog,v 1.171 2010/04/18 15:48:54 grobian Exp $ + + 18 Apr 2010; Fabian Groffen + darwin/macos/10.4/ppc64/package.mask, darwin/macos/10.5/x64/package.mask, + darwin/macos/10.6/x64/package.mask, linux/package.mask, package.mask, + sunos/solaris/5.9/sparc64/package.mask, + sunos/solaris/5.10/sparc64/package.mask, + sunos/solaris/5.10/x64/package.mask, + sunos/solaris/5.11/sparc64/package.mask, + sunos/solaris/5.11/x64/package.mask: + Move zlib mask up, since it breaks everywhere but on Linux 16 Apr 2010; Fabian Groffen +darwin/macos/10.4/ppc64/package.mask, darwin/macos/10.5/x64/package.mask, diff --git a/profiles/prefix/darwin/macos/10.4/ppc64/package.mask b/profiles/prefix/darwin/macos/10.4/ppc64/package.mask index 8c6b63bd4d34..948600cb5d5f 100644 --- a/profiles/prefix/darwin/macos/10.4/ppc64/package.mask +++ b/profiles/prefix/darwin/macos/10.4/ppc64/package.mask @@ -1,7 +1,3 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.4/ppc64/package.mask,v 1.1 2010/04/16 11:24:32 grobian Exp $ - -# Fabian Groffen (16 Apr 2010) -# installs a broken zlib.h on 64-bits systems, bug #310209 -=sys-libs/zlib-1.2.4 +# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.4/ppc64/package.mask,v 1.2 2010/04/18 15:48:55 grobian Exp $ diff --git a/profiles/prefix/darwin/macos/10.5/x64/package.mask b/profiles/prefix/darwin/macos/10.5/x64/package.mask index a1c916d245a1..5f02bc8e6f19 100644 --- a/profiles/prefix/darwin/macos/10.5/x64/package.mask +++ b/profiles/prefix/darwin/macos/10.5/x64/package.mask @@ -1,7 +1,3 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.5/x64/package.mask,v 1.3 2010/04/16 11:24:33 grobian Exp $ - -# Fabian Groffen (16 Apr 2010) -# installs a broken zlib.h on 64-bits systems, bug #310209 -=sys-libs/zlib-1.2.4 +# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.5/x64/package.mask,v 1.4 2010/04/18 15:48:55 grobian Exp $ diff --git a/profiles/prefix/darwin/macos/10.6/x64/package.mask b/profiles/prefix/darwin/macos/10.6/x64/package.mask index 0fee55c5db70..a0899085debe 100644 --- a/profiles/prefix/darwin/macos/10.6/x64/package.mask +++ b/profiles/prefix/darwin/macos/10.6/x64/package.mask @@ -1,7 +1,3 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.6/x64/package.mask,v 1.3 2010/04/16 11:24:33 grobian Exp $ - -# Fabian Groffen (16 Apr 2010) -# installs a broken zlib.h on 64-bits systems, bug #310209 -=sys-libs/zlib-1.2.4 +# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/macos/10.6/x64/package.mask,v 1.4 2010/04/18 15:48:55 grobian Exp $ diff --git a/profiles/prefix/linux/package.mask b/profiles/prefix/linux/package.mask index fe420c0179cd..ab7fa7f6b764 100644 --- a/profiles/prefix/linux/package.mask +++ b/profiles/prefix/linux/package.mask @@ -1,6 +1,10 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/linux/package.mask,v 1.2 2009/10/15 19:49:42 darkside Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/linux/package.mask,v 1.3 2010/04/18 15:48:55 grobian Exp $ + +# Fabian Groffen (16 Apr 2010) +# installs a broken zlib.h on all but Linux systems, bug #310209 +-=sys-libs/zlib-1.2.4 # Jeremy Olexa (15 Oct 2009) # Some wierd issue that prevents xulrunner from linking properly and completely diff --git a/profiles/prefix/package.mask b/profiles/prefix/package.mask index dafd77104151..e32bf26f258e 100644 --- a/profiles/prefix/package.mask +++ b/profiles/prefix/package.mask @@ -1,5 +1,5 @@ #################################################################### -# $Id: package.mask,v 1.56 2010/04/06 19:17:25 darkside Exp $ +# $Id: package.mask,v 1.57 2010/04/18 15:48:54 grobian Exp $ # When you add an entry to this file, add your name, the date, and an # explanation of why something is getting masked. This file is for # Prefix profiles only! @@ -33,6 +33,10 @@ #--- END OF EXAMPLES --- +# Fabian Groffen (16 Apr 2010) +# installs a broken zlib.h on 64-bits systems, bug #310209 +=sys-libs/zlib-1.2.4 + # Fabian Groffen (26 Mar 2010) # Scheduled for removal. This version isn't worth the hassle of merging # to gx86, and hence will be removed. If you are in desparate need of diff --git a/profiles/prefix/sunos/solaris/5.10/sparc64/package.mask b/profiles/prefix/sunos/solaris/5.10/sparc64/package.mask index c7baa7d03280..8af2a557fec1 100644 --- a/profiles/prefix/sunos/solaris/5.10/sparc64/package.mask +++ b/profiles/prefix/sunos/solaris/5.10/sparc64/package.mask @@ -1,10 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/sunos/solaris/5.10/sparc64/package.mask,v 1.2 2010/04/16 11:24:33 grobian Exp $ - -# Fabian Groffen (16 Apr 2010) -# installs a broken zlib.h on 64-bits systems, bug #310209 -=sys-libs/zlib-1.2.4 +# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/sunos/solaris/5.10/sparc64/package.mask,v 1.3 2010/04/18 15:48:56 grobian Exp $ # Fabian Groffen (28 Dec 2009) # Fails to compile on Sparc (both 32-bits and 64-bits) diff --git a/profiles/prefix/sunos/solaris/5.10/x64/package.mask b/profiles/prefix/sunos/solaris/5.10/x64/package.mask index 8b3d71e83a48..53057beef706 100644 --- a/profiles/prefix/sunos/solaris/5.10/x64/package.mask +++ b/profiles/prefix/sunos/solaris/5.10/x64/package.mask @@ -1,7 +1,3 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/sunos/solaris/5.10/x64/package.mask,v 1.3 2010/04/16 11:24:33 grobian Exp $ - -# Fabian Groffen (16 Apr 2010) -# installs a broken zlib.h on 64-bits systems, bug #310209 -=sys-libs/zlib-1.2.4 +# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/sunos/solaris/5.10/x64/package.mask,v 1.4 2010/04/18 15:48:56 grobian Exp $ diff --git a/profiles/prefix/sunos/solaris/5.11/sparc64/package.mask b/profiles/prefix/sunos/solaris/5.11/sparc64/package.mask index 33d8ca379cda..846bcb79eed1 100644 --- a/profiles/prefix/sunos/solaris/5.11/sparc64/package.mask +++ b/profiles/prefix/sunos/solaris/5.11/sparc64/package.mask @@ -1,7 +1,3 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/sunos/solaris/5.11/sparc64/package.mask,v 1.1 2010/04/16 11:24:33 grobian Exp $ - -# Fabian Groffen (16 Apr 2010) -# installs a broken zlib.h on 64-bits systems, bug #310209 -=sys-libs/zlib-1.2.4 +# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/sunos/solaris/5.11/sparc64/package.mask,v 1.2 2010/04/18 15:48:56 grobian Exp $ diff --git a/profiles/prefix/sunos/solaris/5.11/x64/package.mask b/profiles/prefix/sunos/solaris/5.11/x64/package.mask index 51eba95189aa..03347cb0b4fa 100644 --- a/profiles/prefix/sunos/solaris/5.11/x64/package.mask +++ b/profiles/prefix/sunos/solaris/5.11/x64/package.mask @@ -1,10 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/sunos/solaris/5.11/x64/package.mask,v 1.3 2010/04/16 11:24:33 grobian Exp $ - -# Fabian Groffen (16 Apr 2010) -# installs a broken zlib.h on 64-bits systems, bug #310209 -=sys-libs/zlib-1.2.4 +# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/sunos/solaris/5.11/x64/package.mask,v 1.4 2010/04/18 15:48:56 grobian Exp $ # Fabian Groffen (24 May 2009) # causes SIGABORTS: (experienced with media-libs/mesa-7.4.2) diff --git a/profiles/prefix/sunos/solaris/5.9/sparc64/package.mask b/profiles/prefix/sunos/solaris/5.9/sparc64/package.mask index 3efc053029d2..6246813319b4 100644 --- a/profiles/prefix/sunos/solaris/5.9/sparc64/package.mask +++ b/profiles/prefix/sunos/solaris/5.9/sparc64/package.mask @@ -1,10 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/sunos/solaris/5.9/sparc64/package.mask,v 1.2 2010/04/16 11:24:34 grobian Exp $ - -# Fabian Groffen (16 Apr 2010) -# installs a broken zlib.h on 64-bits systems, bug #310209 -=sys-libs/zlib-1.2.4 +# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/sunos/solaris/5.9/sparc64/package.mask,v 1.3 2010/04/18 15:48:56 grobian Exp $ # Jeremy Olexa (26 Aug 2008) # Requires that pthread.h defines pthread_atfork() but it doesn't on Solaris 9