summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <dberkholz@gentoo.org>2004-07-06 11:48:22 +0000
committerDonnie Berkholz <dberkholz@gentoo.org>2004-07-06 11:48:22 +0000
commit353592fa1a1fb7249910d9923929d9503e997272 (patch)
treeed11730c3e5fce262296d03b81caaeace6499749 /x11-base
parentQA: newdepend -> R/DEPEND, need-kde (diff)
downloadhistorical-353592fa1a1fb7249910d9923929d9503e997272.tar.gz
historical-353592fa1a1fb7249910d9923929d9503e997272.tar.bz2
historical-353592fa1a1fb7249910d9923929d9503e997272.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/Manifest4
-rw-r--r--x11-base/xorg-x11/xorg-x11-6.7.0-r1.ebuild6
3 files changed, 9 insertions, 7 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/Manifest b/x11-base/xorg-x11/Manifest
index 5098e3b30a61..e55704e19d49 100644
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -1,4 +1,4 @@
MD5 f33d86266389c80f7f24467eef8552e7 metadata.xml 232
-MD5 37f16421f71da0907b3168bd291c1186 xorg-x11-6.7.0-r1.ebuild 39912
-MD5 a1b8c9e2b8a25285f7a9a3590ca0a93b ChangeLog 16052
+MD5 f9293682330ccbb1950da1955034e887 xorg-x11-6.7.0-r1.ebuild 39802
+MD5 9ff5e0ef7aca6c33e8fe1d2aca2b89b7 ChangeLog 16192
MD5 c557d93f0e90a66a8b781b5ad898a3c9 files/digest-xorg-x11-6.7.0-r1 906
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."