diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2011-07-11 22:33:42 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2011-07-11 22:33:42 +0000 |
| commit | ac698235f831025732584444b7bbaf20fa0c6bd5 (patch) | |
| tree | ba4cf22d70a1f8b68def815b838a38d728262e65 | |
| parent | Version bump. Add static-libs use flag. (diff) | |
| download | gentoo-2-ac698235f831025732584444b7bbaf20fa0c6bd5.tar.gz gentoo-2-ac698235f831025732584444b7bbaf20fa0c6bd5.tar.bz2 gentoo-2-ac698235f831025732584444b7bbaf20fa0c6bd5.zip | |
fix build on fbsd again
(Portage version: 2.2.0_alpha43/cvs/Linux x86_64)
| -rw-r--r-- | dev-libs/libedit/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-libs/libedit/files/libedit-20110709.3.0-weak-reference.patch | 20 | ||||
| -rw-r--r-- | dev-libs/libedit/libedit-20110709.3.0.ebuild | 8 |
3 files changed, 32 insertions, 3 deletions
diff --git a/dev-libs/libedit/ChangeLog b/dev-libs/libedit/ChangeLog index 80e1fe3247e5..37e74719f42f 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.52 2011/07/11 19:23:35 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libedit/ChangeLog,v 1.53 2011/07/11 22:33:42 aballier Exp $ + + 11 Jul 2011; Alexis Ballier <aballier@gentoo.org> + libedit-20110709.3.0.ebuild, + +files/libedit-20110709.3.0-weak-reference.patch: + fix build on fbsd again *libedit-20110709.3.0 (11 Jul 2011) diff --git a/dev-libs/libedit/files/libedit-20110709.3.0-weak-reference.patch b/dev-libs/libedit/files/libedit-20110709.3.0-weak-reference.patch new file mode 100644 index 000000000000..a4399593d636 --- /dev/null +++ b/dev-libs/libedit/files/libedit-20110709.3.0-weak-reference.patch @@ -0,0 +1,20 @@ +--- libedit-20110709-3.0/src/vi.c.old 2011-07-11 18:21:16.000000000 +0000 ++++ libedit-20110709-3.0/src/vi.c 2011-07-11 18:24:29.000000000 +0000 +@@ -918,7 +918,7 @@ + * NB: posix implies that we should enter insert mode, however + * this is against historical precedent... + */ +-#ifdef __weak_reference ++#if defined(__weak_reference) && defined(__NetBSD__) + __weakref_visible char *my_get_alias_text(const char *) + __weak_reference(get_alias_text); + #endif +@@ -926,7 +926,7 @@ + /*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-20110709.3.0.ebuild b/dev-libs/libedit/libedit-20110709.3.0.ebuild index 0c6b63f83059..dcf1e39085e5 100644 --- a/dev-libs/libedit/libedit-20110709.3.0.ebuild +++ b/dev-libs/libedit/libedit-20110709.3.0.ebuild @@ -1,6 +1,6 @@ # 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-20110709.3.0.ebuild,v 1.1 2011/07/11 19:23:35 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libedit/libedit-20110709.3.0.ebuild,v 1.2 2011/07/11 22:33:42 aballier Exp $ EAPI=2 @@ -25,7 +25,11 @@ RDEPEND=${DEPEND} S="${WORKDIR}/${MY_P}" -PATCHES=( "${FILESDIR}/${PN}-ncursesprivate.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-ncursesprivate.patch" + "${FILESDIR}/${PN}-20100424.3.0-bsd.patch" + "${FILESDIR}/${PN}-20110709.3.0-weak-reference.patch" + ) src_configure() { econf \ |