From 851de9891b46b5f07db8d6b014e22e909ae77289 Mon Sep 17 00:00:00 2001 From: Daniel Robbins Date: Sun, 9 Mar 2003 00:58:28 +0000 Subject: tiny preemptive build fix --- x11-base/xfree/ChangeLog | 8 +++++++- x11-base/xfree/xfree-4.3.0.ebuild | 7 ++++++- 2 files changed, 13 insertions(+), 2 deletions(-) (limited to 'x11-base') diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog index 25e650a9abb8..a6373fbc0539 100644 --- a/x11-base/xfree/ChangeLog +++ b/x11-base/xfree/ChangeLog @@ -1,7 +1,13 @@ # ChangeLog for x11-base/xfree # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.104 2003/03/06 21:14:40 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.105 2003/03/09 00:58:28 drobbins Exp $ + 08 Mar 2003; Daniel Robbins xfree-4.3.0.ebuild: unset + MAKE_OPTS before "emake World," since MAKE_OPTS is an internal XFree86 + Makefile variable. If a user mistakenly defined MAKE_OPTS in /etc/make.conf + (instead of MAKEOPTS,) then the build will silently die. Since this is hard + to track down, I'm adding a preemptive fix to the ebuild. + 06 Mar 2003; Martin Schlemmer xfree-4.2.1-r2.ebuild : Fix savage driver unpacking in wrong dir, thanks to roma1390 , bug #16794. diff --git a/x11-base/xfree/xfree-4.3.0.ebuild b/x11-base/xfree/xfree-4.3.0.ebuild index 30e10b7ff56e..29e2696ddbfe 100644 --- a/x11-base/xfree/xfree-4.3.0.ebuild +++ b/x11-base/xfree/xfree-4.3.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0.ebuild,v 1.2 2003/02/28 04:57:39 gerk Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0.ebuild,v 1.3 2003/03/09 00:58:28 drobbins Exp $ # Make sure Portage does _NOT_ strip symbols. We will do it later and make sure # that only we only strip stuff that are safe to strip ... @@ -324,6 +324,11 @@ src_compile() { get_number_of_jobs einfo "Building XFree86..." + #if a user defines the MAKE_OPTS variable in /etc/make.conf instead of MAKEOPTS, + #they'll redefine an internal XFree86 Makefile variable and the xfree build will + #silently die. This is tricky to track down, so I'm adding a preemptive fix for + #this issue by making sure that MAKE_OPTS is unset. (drobbins, 08 Mar 2003) + unset MAKE_OPTS emake World || die if [ -n "`use nls`" ] -- cgit v1.2.3-65-gdbad