summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenrik Brix Andersen <brix@gentoo.org>2005-11-15 12:52:24 +0000
committerHenrik Brix Andersen <brix@gentoo.org>2005-11-15 12:52:24 +0000
commitf2cc165aec7d96c84c8c4d8b75165dfa56cdba02 (patch)
tree8ec5a9c5d681aedcbe7c0ff5cf0e1b954ef6d7ad /sys-apps
parentStable on x86 for WE-18 (and WE-19) support. (diff)
downloadgentoo-2-f2cc165aec7d96c84c8c4d8b75165dfa56cdba02.tar.gz
gentoo-2-f2cc165aec7d96c84c8c4d8b75165dfa56cdba02.tar.bz2
gentoo-2-f2cc165aec7d96c84c8c4d8b75165dfa56cdba02.zip
Only build CardBus support if CONFIG_PCI is enabled, bug #110929.
(Portage version: 2.0.51.22-r3)
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/pcmcia-cs/ChangeLog6
-rw-r--r--sys-apps/pcmcia-cs/pcmcia-cs-3.2.8-r2.ebuild10
2 files changed, 14 insertions, 2 deletions
diff --git a/sys-apps/pcmcia-cs/ChangeLog b/sys-apps/pcmcia-cs/ChangeLog
index 738e92631dfb..e4ba8e4f2c48 100644
--- a/sys-apps/pcmcia-cs/ChangeLog
+++ b/sys-apps/pcmcia-cs/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/pcmcia-cs
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/ChangeLog,v 1.102 2005/11/08 22:55:57 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/ChangeLog,v 1.103 2005/11/15 12:52:24 brix Exp $
+
+ 15 Nov 2005; Henrik Brix Andersen <brix@gentoo.org>
+ pcmcia-cs-3.2.8-r2.ebuild:
+ Only build CardBus support if CONFIG_PCI is enabled, bug #110929.
09 Nov 2005; Saleem Abdulrasool <compnerd@gentoo.org>
pcmcia-cs-3.2.8-r2.ebuild:
diff --git a/sys-apps/pcmcia-cs/pcmcia-cs-3.2.8-r2.ebuild b/sys-apps/pcmcia-cs/pcmcia-cs-3.2.8-r2.ebuild
index ae0b2fed99c6..75f66b89a7f2 100644
--- a/sys-apps/pcmcia-cs/pcmcia-cs-3.2.8-r2.ebuild
+++ b/sys-apps/pcmcia-cs/pcmcia-cs-3.2.8-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/sys-apps/pcmcia-cs/pcmcia-cs-3.2.8-r2.ebuild,v 1.6 2005/11/08 22:55:57 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/pcmcia-cs-3.2.8-r2.ebuild,v 1.7 2005/11/15 12:52:24 brix Exp $
inherit eutils flag-o-matic toolchain-funcs linux-info
@@ -84,6 +84,14 @@ src_compile() {
config="${config} --nopnp"
fi
+ if linux_chkconfig_present PCI; then
+ einfo "CardBus support enabled"
+ config="${config} --cardbus"
+ else
+ einfo "CardBus support disabled"
+ config="${config} --nocardbus"
+ fi
+
# cardctl, cardinfo and xcardinfo are setUID
append-ldflags -Wl,-z,now