summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <spyderous@gentoo.org>2004-07-06 11:48:22 +0000
committerDonnie Berkholz <spyderous@gentoo.org>2004-07-06 11:48:22 +0000
commit5c3b41aa7365e715442ea6c4e22857310259f048 (patch)
treebecb76b54a85d9d2ef7259f1206bfb8d5d8e83e7 /x11-base
parentQA: newdepend -> R/DEPEND, need-kde (Manifest recommit) (diff)
downloadgentoo-2-5c3b41aa7365e715442ea6c4e22857310259f048.tar.gz
gentoo-2-5c3b41aa7365e715442ea6c4e22857310259f048.tar.bz2
gentoo-2-5c3b41aa7365e715442ea6c4e22857310259f048.zip
Allow pie+sdk builds, now that we added patch for it.
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xorg-x11/ChangeLog6
-rw-r--r--x11-base/xorg-x11/xorg-x11-6.7.0-r1.ebuild6
2 files changed, 7 insertions, 5 deletions
diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index 357ad9775d23..52d65cbd76ef 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 Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.69 2004/07/06 11:42:55 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.70 2004/07/06 11:48:22 spyderous Exp $
+
+ 06 Jul 2004; Donnie Berkholz <spyderous@gentoo.org>;
+ xorg-x11-6.7.0-r1.ebuild:
+ Allow pie+sdk builds, now that we added patch for it.
06 Jul 2004; Donnie Berkholz <spyderous@gentoo.org>;
xorg-x11-6.7.0-r1.ebuild:
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 e3447d27bd9b..472438a696ae 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 Foundation
# 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.21 2004/07/06 11:42:55 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.7.0-r1.ebuild,v 1.22 2004/07/06 11:48:22 spyderous Exp $
# Libraries which are now supplied in shared form that were not in the past
# include: libFS.so, libGLw.so, libI810XvMC.so, libXRes.so, libXfontcache.so,
@@ -202,12 +202,10 @@ pkg_setup() {
einfo "Disabling PAM features in ${PN}..."
fi
- if use static || use pie
+ if use static
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 and pie USE flags are currently incompatible with the sdk USE flag."