summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <spyderous@gentoo.org>2004-02-24 16:26:35 +0000
committerDonnie Berkholz <spyderous@gentoo.org>2004-02-24 16:26:35 +0000
commit90c6ebb261dce2cb08ebb996df990757c6fea236 (patch)
treebf719d052083bb1b2314e73a7c6d663e3619278f /x11-base
parentKEYWORDS+=~sparc (Manifest recommit) (diff)
downloadgentoo-2-90c6ebb261dce2cb08ebb996df990757c6fea236.tar.gz
gentoo-2-90c6ebb261dce2cb08ebb996df990757c6fea236.tar.bz2
gentoo-2-90c6ebb261dce2cb08ebb996df990757c6fea236.zip
Change is_kernel check so it defaults to running kernel if /usr/src/linux doesn't exist so it works on LiveCD.
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/kdrive/ChangeLog6
-rw-r--r--x11-base/kdrive/kdrive-4.3.0-r1.ebuild10
2 files changed, 12 insertions, 4 deletions
diff --git a/x11-base/kdrive/ChangeLog b/x11-base/kdrive/ChangeLog
index 9d411b5a13b6..880b448dc84a 100644
--- a/x11-base/kdrive/ChangeLog
+++ b/x11-base/kdrive/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-base/kdrive
# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/kdrive/ChangeLog,v 1.12 2004/02/16 01:32:24 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/kdrive/ChangeLog,v 1.13 2004/02/24 16:26:35 spyderous Exp $
+
+ 24 Feb 2004; Donnie Berkholz <spyderous@gentoo.org>; kdrive-4.3.0-r1.ebuild:
+ Change is_kernel check so it defaults to running kernel if /usr/src/linux
+ doesn't exist so it works on LiveCD.
15 Feb 2004; Donnie Berkholz <spyderous@gentoo.org>; kdrive-4.3.0.ebuild:
Pulling old stable version, there's a newer one.
diff --git a/x11-base/kdrive/kdrive-4.3.0-r1.ebuild b/x11-base/kdrive/kdrive-4.3.0-r1.ebuild
index 21706efd9ad4..f6d87fde73a7 100644
--- a/x11-base/kdrive/kdrive-4.3.0-r1.ebuild
+++ b/x11-base/kdrive/kdrive-4.3.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/kdrive/kdrive-4.3.0-r1.ebuild,v 1.2 2003/10/13 03:42:42 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/kdrive/kdrive-4.3.0-r1.ebuild,v 1.3 2004/02/24 16:26:35 spyderous Exp $
# If you don't want to build the Xvesa server, do this.
# VESA="no" emerge kdrive
@@ -134,8 +134,12 @@ src_unpack() {
fi
fi
- is_kernel "2" "2" && \
+ if ( [ -e "/usr/src/linux" ] && \
+ [ ! `is_kernel "2" "2"` ] ) || \
+ [ "`uname -r | cut -d. -f1,2`" != "2.2" ]
+ then
echo "#define HasLinuxInput YES" >> config/cf/host.def
+ fi
echo "#define OptimizedCDebugFlags ${CFLAGS}" >> config/cf/host.def
echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS}" >> config/cf/host.def