From 08b948a95dde2ec125962bf29c19d20215af86d7 Mon Sep 17 00:00:00 2001 From: Donnie Berkholz Date: Thu, 21 Apr 2005 06:23:46 +0000 Subject: Explicitly turn off dlloader with USE=-dlloader. Relevant on >=6.8.99.*, but I'm trying to keep these two in parallel so I'm applying it to both. Caught by sekretarz. (Portage version: 2.0.51.19) --- x11-base/xorg-x11/ChangeLog | 8 +++++++- x11-base/xorg-x11/xorg-x11-6.8.2-r2.ebuild | 11 ++++++++--- x11-base/xorg-x11/xorg-x11-6.8.99.3.ebuild | 11 ++++++++--- 3 files changed, 23 insertions(+), 7 deletions(-) (limited to 'x11-base') diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog index 18dd1bd1c435..e6ea1c3b2404 100644 --- a/x11-base/xorg-x11/ChangeLog +++ b/x11-base/xorg-x11/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-base/xorg-x11 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.372 2005/04/20 12:43:24 fmccor Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.373 2005/04/21 06:23:46 spyderous Exp $ + + 21 Apr 2005; Donnie Berkholz ; + xorg-x11-6.8.2-r2.ebuild, xorg-x11-6.8.99.3.ebuild: + Explicitly turn off dlloader with USE=-dlloader. Relevant on >=6.8.99.*, but + I'm trying to keep these two in parallel so I'm applying it to both. Caught + by sekretarz. 20 Apr 2005; Ferris McCormick xorg-x11-6.8.99.3.ebuild: diff --git a/x11-base/xorg-x11/xorg-x11-6.8.2-r2.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.2-r2.ebuild index 05d03900f7ad..2ae735c56bd7 100644 --- a/x11-base/xorg-x11/xorg-x11-6.8.2-r2.ebuild +++ b/x11-base/xorg-x11/xorg-x11-6.8.2-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 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.8.2-r2.ebuild,v 1.6 2005/04/20 10:17:17 cryos Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.2-r2.ebuild,v 1.7 2005/04/21 06:23:46 spyderous Exp $ # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory # voodoo3 cards. @@ -624,13 +624,18 @@ host_def_setup() { if use static; then echo "#define DoLoadableServer NO" >>${HOSTCONF} else + einfo "Setting DoLoadableServer to YES." + echo "#define DoLoadableServer YES" >> ${HOSTCONF} + if use dlloader; then - einfo "Setting DoLoadableServer/MakeDllModules to YES." - echo "#define DoLoadableServer YES" >> ${HOSTCONF} + einfo "Setting MakeDllModules to YES." echo "#define MakeDllModules YES" >> ${HOSTCONF} if use hardened; then echo "#define HardenedGccSpecs YES" >> ${HOSTCONF} fi + else + einfo "Setting MakeDllModules to NO." + echo "#define MakeDllModules NO" >> ${HOSTCONF} fi fi diff --git a/x11-base/xorg-x11/xorg-x11-6.8.99.3.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.99.3.ebuild index b81444e6f9f6..30e8e34814f4 100644 --- a/x11-base/xorg-x11/xorg-x11-6.8.99.3.ebuild +++ b/x11-base/xorg-x11/xorg-x11-6.8.99.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 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.8.99.3.ebuild,v 1.5 2005/04/20 12:43:24 fmccor Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.99.3.ebuild,v 1.6 2005/04/21 06:23:46 spyderous Exp $ # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory # voodoo3 cards. @@ -626,13 +626,18 @@ host_def_setup() { if use static; then echo "#define DoLoadableServer NO" >>${HOSTCONF} else + einfo "Setting DoLoadableServer to YES." + echo "#define DoLoadableServer YES" >> ${HOSTCONF} + if use dlloader; then - einfo "Setting DoLoadableServer/MakeDllModules to YES." - echo "#define DoLoadableServer YES" >> ${HOSTCONF} + einfo "Setting MakeDllModules to YES." echo "#define MakeDllModules YES" >> ${HOSTCONF} if use hardened; then echo "#define HardenedGccSpecs YES" >> ${HOSTCONF} fi + else + einfo "Setting MakeDllModules to NO." + echo "#define MakeDllModules NO" >> ${HOSTCONF} fi fi -- cgit v1.2.3-65-gdbad