diff options
| author |   Donnie Berkholz <spyderous@gentoo.org> | 2004-06-13 21:44:58 +0000 |
|---|---|---|
| committer | Donnie Berkholz <spyderous@gentoo.org> | 2004-06-13 21:44:58 +0000 |
| commit | ebbeafbe071df58f76e537d2897514d5606f30a0 (patch) | |
| tree | 52ed95a1e8ec78f4eae51cd971099e705016adf2 /x11-base | |
| parent | version bump (Manifest recommit) (diff) | |
| download | gentoo-2-ebbeafbe071df58f76e537d2897514d5606f30a0.tar.gz gentoo-2-ebbeafbe071df58f76e537d2897514d5606f30a0.tar.bz2 gentoo-2-ebbeafbe071df58f76e537d2897514d5606f30a0.zip | |
Workaround for #50562 -- disallow pie+sdk build.
Diffstat (limited to 'x11-base')
| -rw-r--r-- | x11-base/xorg-x11/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-base/xorg-x11/xorg-x11-6.7.0-r1.ebuild | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog index 08412d31f01a..fedffecc1bfa 100644 --- a/x11-base/xorg-x11/ChangeLog +++ b/x11-base/xorg-x11/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-base/xorg-x11 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.52 2004/06/13 14:22:06 geoman Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.53 2004/06/13 21:44:58 spyderous Exp $ + + 13 Jun 2004; Donnie Berkholz <spyderous@gentoo.org>; + xorg-x11-6.7.0-r1.ebuild: + Workaround for #50562 -- disallow pie+sdk build. 13 Jun 2004; Stephen P. Becker <geoman@gentoo.org> xorg-x11-6.7.0-r1.ebuild: Added ~mips keyword -- bug 53226 diff --git a/x11-base/xorg-x11/xorg-x11-6.7.0-r1.ebuild b/x11-base/xorg-x11/xorg-x11-6.7.0-r1.ebuild index 37e4eff63000..f39fa5cb1891 100644 --- a/x11-base/xorg-x11/xorg-x11-6.7.0-r1.ebuild +++ b/x11-base/xorg-x11/xorg-x11-6.7.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.7.0-r1.ebuild,v 1.5 2004/06/13 14:22:06 geoman Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.7.0-r1.ebuild,v 1.6 2004/06/13 21:44:58 spyderous Exp $ # This is a snapshot of the XORG-RELEASE-1 branch. @@ -224,13 +224,15 @@ pkg_setup() { einfo "Disabling PAM features in ${PN}..." fi - if use static + if use static || use pie then # A static build disallows building the SDK. # See config/xf86.rules. + # So does a DllModules YES (use pie) build (#50562) + # The latter is pending a potential patch. if use sdk then - die "The static USE flag is incompatible with gatos and sdk USE flags." + die "The static and pie USE flags are currently incompatible with the sdk USE flag." fi fi } |