diff options
author | Naohiro Aota <naota@gentoo.org> | 2011-05-22 03:03:22 +0000 |
---|---|---|
committer | Naohiro Aota <naota@gentoo.org> | 2011-05-22 03:03:22 +0000 |
commit | ce721576c52e7fc1ecf3769ff79314a76c73ff67 (patch) | |
tree | 61a3a2f1d696307b855e8faddaf2d6f0bfe597f5 /dev-libs | |
parent | Initial import. (diff) | |
download | gentoo-2-ce721576c52e7fc1ecf3769ff79314a76c73ff67.tar.gz gentoo-2-ce721576c52e7fc1ecf3769ff79314a76c73ff67.tar.bz2 gentoo-2-ce721576c52e7fc1ecf3769ff79314a76c73ff67.zip |
Fix build failure on FreeBSD: bug #348938
(Portage version: 2.2.0_alpha31/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs')
-rw-r--r-- | dev-libs/libedit/ChangeLog | 7 | ||||
-rw-r--r-- | dev-libs/libedit/files/libedit-20100424.3.0-bsd.patch | 13 | ||||
-rw-r--r-- | dev-libs/libedit/files/libedit-20100424.3.0-weak-reference.patch | 21 | ||||
-rw-r--r-- | dev-libs/libedit/libedit-20100424.3.0.ebuild | 9 |
4 files changed, 47 insertions, 3 deletions
diff --git a/dev-libs/libedit/ChangeLog b/dev-libs/libedit/ChangeLog index faba4b5d82a8..17b82189ddad 100644 --- a/dev-libs/libedit/ChangeLog +++ b/dev-libs/libedit/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-libs/libedit # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libedit/ChangeLog,v 1.49 2011/02/06 12:37:00 leio Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libedit/ChangeLog,v 1.50 2011/05/22 03:03:22 naota Exp $ + + 22 May 2011; Naohiro Aota <naota@gentoo.org> libedit-20100424.3.0.ebuild, + +files/libedit-20100424.3.0-bsd.patch, + +files/libedit-20100424.3.0-weak-reference.patch: + Fix build failure on FreeBSD: bug #348938 06 Feb 2011; Mart Raudsepp <leio@gentoo.org> libedit-20050930.ebuild: Drop to ~mips diff --git a/dev-libs/libedit/files/libedit-20100424.3.0-bsd.patch b/dev-libs/libedit/files/libedit-20100424.3.0-bsd.patch new file mode 100644 index 000000000000..e230a76d709f --- /dev/null +++ b/dev-libs/libedit/files/libedit-20100424.3.0-bsd.patch @@ -0,0 +1,13 @@ +diff --git a/src/chartype.h b/src/chartype.h +index c35825c..be5aac0 100644 +--- a/src/chartype.h ++++ b/src/chartype.h +@@ -44,7 +44,7 @@ + * supports non-BMP code points without requiring UTF-16, but nothing + * seems to actually advertise this properly, despite Unicode 3.1 having + * been around since 2001... */ +-#if !defined(__NetBSD__) && !defined(__sun) && !(defined(__APPLE__) && defined(__MACH__)) ++#if !defined(__NetBSD__) && !defined(__sun) && !(defined(__APPLE__) && defined(__MACH__)) && !defined(__DragonFly__) && !defined(__FreeBSD__) + #ifndef __STDC_ISO_10646__ + /* In many places it is assumed that the first 127 code points are ASCII + * compatible, so ensure wchar_t indeed does ISO 10646 and not some other diff --git a/dev-libs/libedit/files/libedit-20100424.3.0-weak-reference.patch b/dev-libs/libedit/files/libedit-20100424.3.0-weak-reference.patch new file mode 100644 index 000000000000..db7f98f48d03 --- /dev/null +++ b/dev-libs/libedit/files/libedit-20100424.3.0-weak-reference.patch @@ -0,0 +1,21 @@ +diff --git a/src/vi.c b/src/vi.c +index e52ea4d..e0ab94b 100644 +--- a/src/vi.c ++++ b/src/vi.c +@@ -918,14 +918,14 @@ vi_comment_out(EditLine *el, Int c) + * NB: posix implies that we should enter insert mode, however + * this is against historical precedent... + */ +-#ifdef __weak_reference ++#if defined(__weak_reference) && defined(__NetBSD__) + extern char *get_alias_text(const char *) __weak_reference(get_alias_text); + #endif + protected el_action_t + /*ARGSUSED*/ + vi_alias(EditLine *el, Int c) + { +-#ifdef __weak_reference ++#if defined(__weak_reference) && defined(__NetBSD__) + char alias_name[3]; + char *alias_text; + diff --git a/dev-libs/libedit/libedit-20100424.3.0.ebuild b/dev-libs/libedit/libedit-20100424.3.0.ebuild index 7af3654dd10a..4770ce163152 100644 --- a/dev-libs/libedit/libedit-20100424.3.0.ebuild +++ b/dev-libs/libedit/libedit-20100424.3.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libedit/libedit-20100424.3.0.ebuild,v 1.2 2010/12/13 22:11:30 mattst88 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libedit/libedit-20100424.3.0.ebuild,v 1.3 2011/05/22 03:03:22 naota Exp $ EAPI=2 @@ -33,6 +33,11 @@ src_configure() { --enable-fast-install } +src_prepare() { + epatch "${FILESDIR}"/${P}-bsd.patch + epatch "${FILESDIR}"/${P}-weak-reference.patch +} + # No tests are shipped src_test() { :; } |