summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenrik Brix Andersen <brix@gentoo.org>2006-03-24 16:31:25 +0000
committerHenrik Brix Andersen <brix@gentoo.org>2006-03-24 16:31:25 +0000
commit441658bbc8fcfa69ce6ebfeda5cf6ea5fd984557 (patch)
tree4f2a2aa3d8f02ea9334ff62e042372d03bfceb43 /sys-apps
parentAdded ibiblio mirror and closing bug #87288. (diff)
downloadgentoo-2-441658bbc8fcfa69ce6ebfeda5cf6ea5fd984557.tar.gz
gentoo-2-441658bbc8fcfa69ce6ebfeda5cf6ea5fd984557.tar.bz2
gentoo-2-441658bbc8fcfa69ce6ebfeda5cf6ea5fd984557.zip
Fix compilation with uClibc, thanks to Natanael Copa in bug #125598.
(Portage version: 2.0.54)
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/pcmciautils/ChangeLog6
-rw-r--r--sys-apps/pcmciautils/files/pcmciautils-012-pccardctl-uclibc.patch10
-rw-r--r--sys-apps/pcmciautils/pcmciautils-012.ebuild7
3 files changed, 20 insertions, 3 deletions
diff --git a/sys-apps/pcmciautils/ChangeLog b/sys-apps/pcmciautils/ChangeLog
index 8e0a7facd540..8563731bad0c 100644
--- a/sys-apps/pcmciautils/ChangeLog
+++ b/sys-apps/pcmciautils/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/pcmciautils
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmciautils/ChangeLog,v 1.19 2006/02/17 20:06:26 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmciautils/ChangeLog,v 1.20 2006/03/24 16:31:25 brix Exp $
+
+ 24 Mar 2006; Henrik Brix Andersen <brix@gentoo.org>
+ +files/pcmciautils-012-pccardctl-uclibc.patch, pcmciautils-012.ebuild:
+ Fix compilation with uClibc, thanks to Natanael Copa in bug #125598.
17 Feb 2006; Joseph Jezak <josejx@gentoo.org> pcmciautils-012.ebuild:
Marked ppc stable for bug #121192.
diff --git a/sys-apps/pcmciautils/files/pcmciautils-012-pccardctl-uclibc.patch b/sys-apps/pcmciautils/files/pcmciautils-012-pccardctl-uclibc.patch
new file mode 100644
index 000000000000..b029e15b9498
--- /dev/null
+++ b/sys-apps/pcmciautils/files/pcmciautils-012-pccardctl-uclibc.patch
@@ -0,0 +1,10 @@
+--- src/pccardctl.c.orig 2006-03-09 14:41:51 +0000
++++ src/pccardctl.c 2006-03-09 14:42:04 +0000
+@@ -16,7 +16,6 @@
+ #include <errno.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#include <libintl.h>
+ #include <locale.h>
+
+ #include <sysfs/libsysfs.h>
diff --git a/sys-apps/pcmciautils/pcmciautils-012.ebuild b/sys-apps/pcmciautils/pcmciautils-012.ebuild
index 965886fc00c6..eb7f766feccb 100644
--- a/sys-apps/pcmciautils/pcmciautils-012.ebuild
+++ b/sys-apps/pcmciautils/pcmciautils-012.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmciautils/pcmciautils-012.ebuild,v 1.6 2006/03/03 02:01:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcmciautils/pcmciautils-012.ebuild,v 1.7 2006/03/24 16:31:25 brix Exp $
-inherit toolchain-funcs linux-info
+inherit eutils toolchain-funcs linux-info
DESCRIPTION="PCMCIA userspace utilities for Linux kernel 2.6.13 and beyond"
@@ -40,6 +40,9 @@ pkg_setup() {
src_unpack() {
unpack ${A}
+ cd ${S}
+ epatch ${FILESDIR}/${P}-pccardctl-uclibc.patch
+
sed -i \
-e "s:^\(KERNEL_DIR\) = .*:\1 = ${KV_DIR}:" \
-e "s:^\(V\) = false:\1 = true:" \