summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Johanson <latexer@gentoo.org>2004-02-07 07:14:21 +0000
committerPeter Johanson <latexer@gentoo.org>2004-02-07 07:14:21 +0000
commitebf818b401a7bc07f1b711f2fd35fd9a275e1a5a (patch)
tree4ba6a49ead287766d1e6896b6fda1f8c1156587c /sys-apps
parentFixed compile error when >=sys-devel/bison-1.875, closing bug #40599 (diff)
downloadgentoo-2-ebf818b401a7bc07f1b711f2fd35fd9a275e1a5a.tar.gz
gentoo-2-ebf818b401a7bc07f1b711f2fd35fd9a275e1a5a.tar.bz2
gentoo-2-ebf818b401a7bc07f1b711f2fd35fd9a275e1a5a.zip
Fix for compiling when we have CONFIG_SMP. Mainly so liveCDs can do this.
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/pcmcia-cs/ChangeLog6
-rw-r--r--sys-apps/pcmcia-cs/Manifest4
-rw-r--r--sys-apps/pcmcia-cs/files/digest-pcmcia-cs-3.2.5-r11
-rw-r--r--sys-apps/pcmcia-cs/pcmcia-cs-3.2.5-r1.ebuild7
4 files changed, 14 insertions, 4 deletions
diff --git a/sys-apps/pcmcia-cs/ChangeLog b/sys-apps/pcmcia-cs/ChangeLog
index 45ab63afd311..d1858c730ac1 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-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/ChangeLog,v 1.56 2004/02/07 06:03:46 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/ChangeLog,v 1.57 2004/02/07 07:14:21 latexer Exp $
+
+ 07 Feb 2004; Peter Johanson <latexer@gentoo.org> pcmcia-cs-3.2.5-r1.ebuild:
+ Added patch to fix compiling when we have CONFIG_SMP. Mainly so liveCDs can
+ have SMP and get pcmcia working.
07 Feb 2004; Peter Johanson <latexer@gentoo.org> pcmcia-cs-3.2.5-r1.ebuild:
Added a fix for compilation on ppc with recent kernels (bug #40293). Thanks to
diff --git a/sys-apps/pcmcia-cs/Manifest b/sys-apps/pcmcia-cs/Manifest
index 33b5e676426a..96218b02c062 100644
--- a/sys-apps/pcmcia-cs/Manifest
+++ b/sys-apps/pcmcia-cs/Manifest
@@ -1,10 +1,10 @@
MD5 c4675c67f927f061a3461e191c81179d pcmcia-cs-3.2.4.ebuild 4392
MD5 42b6034692126c56b1775fdae2c56e45 pcmcia-cs-3.1.34-r8.ebuild 4136
-MD5 e252692fadeb0767ed157c560a8bd133 pcmcia-cs-3.2.5-r1.ebuild 5056
+MD5 0ffd961ebd0be9d41a421a6c7891050c pcmcia-cs-3.2.5-r1.ebuild 5258
MD5 052a01e3c3fdfd19ecaa57d902c4fd49 pcmcia-cs-3.2.5.ebuild 4430
MD5 d47d3d4eea7cc0060235b818af2e9bc3 ChangeLog 13318
MD5 19fd766bac8e110b4620363a1ace26dd metadata.xml 159
-MD5 ed6cc206447541fb9d2351ae1a59c850 files/digest-pcmcia-cs-3.2.5-r1 306
+MD5 157ac5bc22e938e1c2268c1f2610420c files/digest-pcmcia-cs-3.2.5-r1 379
MD5 da9744cdc1401162cea92b7aded74826 files/pcmcia.rc 2036
MD5 8662e0e954d0cde8b84f76691c910e7a files/digest-pcmcia-cs-3.2.4 652
MD5 f8f190b2ddbf95e58f3abf55fc303d27 files/digest-pcmcia-cs-3.2.5 150
diff --git a/sys-apps/pcmcia-cs/files/digest-pcmcia-cs-3.2.5-r1 b/sys-apps/pcmcia-cs/files/digest-pcmcia-cs-3.2.5-r1
index d5e0278accd8..4ab6efff7c28 100644
--- a/sys-apps/pcmcia-cs/files/digest-pcmcia-cs-3.2.5-r1
+++ b/sys-apps/pcmcia-cs/files/digest-pcmcia-cs-3.2.5-r1
@@ -1,4 +1,5 @@
MD5 44dbc0a8978fe618eee242b0bd25392c pcmcia-cs-3.2.5.tar.gz 1266494
MD5 33325ed642b5277a9695d10bd19b3d7a pcmcia-cs-3.2.5-module-init-tools.diff.gz 460
+MD5 ee4f8227cc28f9a29a609f6e9561ef54 pcmcia-cs-3.2.5-SMP-fix.diff.gz 320
MD5 cdf1e5021163432f73bc3ef6cc70daf3 pcmcia-cs-3.2.5-orinoco-monitor.diff.gz 7241
MD5 92e42d6e70fce9f0c4d5e2c5b7d47279 pcmcia-cs-3.2.5-ppc-fix.diff.gz 323
diff --git a/sys-apps/pcmcia-cs/pcmcia-cs-3.2.5-r1.ebuild b/sys-apps/pcmcia-cs/pcmcia-cs-3.2.5-r1.ebuild
index bf89043ce8e1..5a1f089945a3 100644
--- a/sys-apps/pcmcia-cs/pcmcia-cs-3.2.5-r1.ebuild
+++ b/sys-apps/pcmcia-cs/pcmcia-cs-3.2.5-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/pcmcia-cs-3.2.5-r1.ebuild,v 1.5 2004/02/07 06:03:46 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmcia-cs/pcmcia-cs-3.2.5-r1.ebuild,v 1.6 2004/02/07 07:14:21 latexer Exp $
inherit eutils
@@ -10,6 +10,7 @@ OV="orinoco-0.13e"
DESCRIPTION="PCMCIA tools for Linux"
SRC_URI="mirror://sourceforge/pcmcia-cs/${P}.tar.gz
http://dev.gentoo.org/~latexer/files/patches/${P}-module-init-tools.diff.gz
+ http://dev.gentoo.org/~latexer/files/patches/${P}-SMP-fix.diff.gz
http://dev.gentoo.org/~latexer/files/${P}-orinoco-monitor.diff.gz
ppc? ( http://dev.gentoo.org/~latexer/files/patches/${P}-ppc-fix.diff.gz )"
@@ -42,6 +43,10 @@ src_unpack() {
# Fix for module-init-tools only systems
epatch ${DISTDIR}/${P}-module-init-tools.diff.gz
+ # Fix for compiling with SMP (mainly for liveCDs, does your laptop have
+ # multiple procs?)
+ epatch ${DISTDIR}/${P}-SMP-fix.diff.gz
+
# Fix for compilation against recent benh kernels
[ "${ARCH}" == "ppc" ] && epatch ${DISTDIR}/${P}-ppc-fix.diff.gz