summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <spyderous@gentoo.org>2005-07-26 20:18:19 +0000
committerDonnie Berkholz <spyderous@gentoo.org>2005-07-26 20:18:19 +0000
commit0ba9eebea1087a49a7a6fa577308bfa0e0bb2965 (patch)
tree40d4a620ea682ac76afcf2bc90e2659ab0b347f7 /x11-base
parent#100362: dropped gtk USE flag. gtk is now *mandatory* since all non-gtk versi... (diff)
downloadgentoo-2-0ba9eebea1087a49a7a6fa577308bfa0e0bb2965.tar.gz
gentoo-2-0ba9eebea1087a49a7a6fa577308bfa0e0bb2965.tar.bz2
gentoo-2-0ba9eebea1087a49a7a6fa577308bfa0e0bb2965.zip
Add MAKE="make" on debug build for BSD.
(Portage version: 2.0.51.22-r2)
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xorg-x11/ChangeLog6
-rw-r--r--x11-base/xorg-x11/xorg-x11-6.8.2-r2.ebuild4
-rw-r--r--x11-base/xorg-x11/xorg-x11-6.8.99.15.ebuild4
3 files changed, 9 insertions, 5 deletions
diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index 3a1f862e5fd9..61ab2a388058 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.440 2005/07/22 21:00:39 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.441 2005/07/26 20:18:19 spyderous Exp $
+
+ 26 Jul 2005; Donnie Berkholz <spyderous@gentoo.org>;
+ xorg-x11-6.8.2-r2.ebuild, xorg-x11-6.8.99.15.ebuild:
+ Add MAKE="make" on debug build for BSD.
22 Jul 2005; Donnie Berkholz <spyderous@gentoo.org>;
xorg-x11-6.8.2-r2.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 2236ad86bbf2..5975d008813a 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.49 2005/07/22 21:00:39 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.2-r2.ebuild,v 1.50 2005/07/26 20:18:19 spyderous Exp $
# Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
# voodoo3 cards.
@@ -968,7 +968,7 @@ build() {
einfo "Building xorg-x11..."
if use debug; then
chmod u+x ${S}/config/util/makeg.sh
- FAST=1 ${S}/config/util/makeg.sh World WORLDOPTS="" \
+ FAST=1 ${S}/config/util/makeg.sh World WORLDOPTS="" MAKE="make" \
|| die "debug make World failed"
else
FAST=1 emake World WORLDOPTS="" MAKE="make" || die "make World failed"
diff --git a/x11-base/xorg-x11/xorg-x11-6.8.99.15.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.99.15.ebuild
index 4fd72de74085..70c1c989fe83 100644
--- a/x11-base/xorg-x11/xorg-x11-6.8.99.15.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.99.15.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.15.ebuild,v 1.4 2005/07/21 19:37:57 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.99.15.ebuild,v 1.5 2005/07/26 20:18:19 spyderous Exp $
# Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
# voodoo3 cards.
@@ -935,7 +935,7 @@ build() {
einfo "Building xorg-x11..."
if use debug; then
chmod u+x ${S}/config/util/makeg.sh
- FAST=1 ${S}/config/util/makeg.sh World WORLDOPTS="" \
+ FAST=1 ${S}/config/util/makeg.sh World WORLDOPTS="" MAKE="make" \
|| die "debug make World failed"
else
FAST=1 emake World WORLDOPTS="" MAKE="make" || die "make World failed"