Fix build failure on FreeBSD: bug #348938

Package-Manager: portage-2.2.0_alpha31/cvs/Linux x86_64

5 files changed, 61 insertions, 5 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/Manifest b/dev-libs/libedit/Manifest
index 8987fb4cfe39..98df53fd6243 100644
--- a/dev-libs/libedit/Manifest
+++ b/dev-libs/libedit/Manifest
@@ -1,9 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX libedit-20050531-debian-to-gentoo.patch 3869 RMD160 e4e601d310972aa3d245bbd30ce47ac1db1c65ac SHA1 fe34a6a1a77b43c59d2f3e27ac05ff082346d38b SHA256 219c635305e0d490fd925b03d299637558f9aea2b8dbba057018481eea67aa4f
 AUX libedit-20061103-debian-to-gentoo.patch 3472 RMD160 01d9d2f2c59831ff283f496e4c15090caab2c396 SHA1 1c1b62b39454f273e1822499cf6945a7e65f7919 SHA256 8e80db89d128d5d3230274e9b9e58f37a94c2342b208c2b1324b2a17da9e8299
 AUX libedit-20061103-freebsd.patch 721 RMD160 c708103475f280e0e4c4c5a34f6657302de57f55 SHA1 d51489395be36821668e46aa7e0443e3045d872c SHA256 b8b42ae5bd9422a4f431a511d1e055505f7fa274491d098823037e17b0a10866
 AUX libedit-20061103-glibc.patch 653 RMD160 63dccbe75ecb0882fdad9c8678c5e857fd28ac2b SHA1 c8f29040ea91e62c82af20f4c727484a4e202153 SHA256 6fbd3940dae33c0ee9308baa5093ef0894c6f0e0efe991f89f6db5820130696d
 AUX libedit-20061103-ldflags.patch 338 RMD160 d2ebcd91f1d22141421eede681e726d6ea234813 SHA1 df0b908ff1765124b52aa2a215584a104110ec73 SHA256 5b5d113db289e4c2c10da71360001df6e441cea1e85a906bc06410111adaf0f0
 AUX libedit-20090111-3.0-weak_reference.patch 659 RMD160 1d1b5c990bccf27b8467c4f79464421638e68d41 SHA1 d32cf200a73f65533043e36df85baf6b8c78a19e SHA256 be8578b19adc0003d3593e944624ebaa5f87bbc890620e2e8f45b4a42c1e5523
+AUX libedit-20100424.3.0-bsd.patch 724 RMD160 89be9d63791d0d1bdfd8d5faade9fe47fef86884 SHA1 ff63f51dbd9d7c72545c5f4359631aee190f4ead SHA256 2226e17f65b2486c45964867a1ed4a699c1861089b7a1501bccc83d28bca6c45
+AUX libedit-20100424.3.0-weak-reference.patch 622 RMD160 8b5a2eab56bd7bbc4cefbc4c7a86093b22b02b95 SHA1 6eb7c8bf1ded99098b642b3f0e6632f7d610d672 SHA256 17c70fce91ee7a77bb3b4259091435e33aafc35c7c6f25eae522e41915f319e0
 DIST libedit-20050930.tar.bz2 96696 RMD160 0f7711c1d7128d97383aecedd31730783b5abf61 SHA1 c0d00695ff0f65489acc9a435ff82dec70975d3e SHA256 a1dd32b6732f15b125b33de29ec5f50b0f464d23ad3432755ab3b7498b77ddf6
 DIST libedit-20061103.tar.bz2 97032 RMD160 8c15895dedd69d979c8d911803246808c12ea198 SHA1 1057422d38ff226f8bb6cc392efc9c0c36a1d208 SHA256 11542988eeed1fbe23b8b421389dbd37fb0cedb1d7c76b49399163be27eacf3f
 DIST libedit-20090923-3.0.tar.gz 466724 RMD160 c8b05abbb5743a3c709d981c131cb6d11b6e83fd SHA1 25b4f63103f2098fc06dc9c2f455d2a937507bb5 SHA256 6aca4e63d27148514a40be5bd59305914836a1fe0d2d79e1733cb1d01636460a
@@ -11,6 +16,13 @@ DIST libedit-20100424-3.0.tar.gz 442438 RMD160 daa0bace15c0eb063c151f1fad26677a7
 EBUILD libedit-20050930.ebuild 931 RMD160 2eaf9e6dcdb6e9170dde54e0636d32abd0bccc83 SHA1 0415506c09f9f63cfb095282f86d115f25fce44c SHA256 f6958bb3a7709617fb9323db42c9ef112f2014f275f0272625b00c92d637d96a
 EBUILD libedit-20061103-r2.ebuild 1387 RMD160 979b4749669f9a0aa26b0fa70915a8e40e130002 SHA1 9065068549d10f7ecac86f71e041759b6268217e SHA256 93e18f2b1ed78227bdb7e674152d1a5eef1dbd0d3711e680e7af76e962bd275d
 EBUILD libedit-20090923.3.0.ebuild 978 RMD160 04a0e91bce0ac4dfb23b594e6bf009a776bce5f8 SHA1 1e63d2487470609878d3628a275b27edae734764 SHA256 064a714b8d61a84ea7def15351d90fd767755994133e4446efb5104d1cc9e12d
-EBUILD libedit-20100424.3.0.ebuild 1162 RMD160 6dbe4a5b2f28fbe0af3131f708fe3d0906bffa29 SHA1 3f34a7c184363739d1a236b3cc09ddf12be62d8e SHA256 634fce367a358916202ab4ee33e8054d60557deb7e3b7aedf8db47de925a26f3
-MISC ChangeLog 6057 RMD160 9665ef3573914685800212b15a471fdd9d2f3697 SHA1 9d9c3cc04d21ad540c54f2707031be16ad202a1f SHA256 c1db8660d25dc8cb3fb33d6eead4e7d09a4e30c7800b7f5bdccc4f72920872f0
+EBUILD libedit-20100424.3.0.ebuild 1263 RMD160 f84d385e2681e6e7d1694ee6b199b747b1bec48e SHA1 22b7751c46536687a06cc0b85b5abdbf686727bf SHA256 513f371ac17c22e3db210d3f1ed0acf456aab58a22fa0626f32471dcfe8b97b4
+MISC ChangeLog 6272 RMD160 a7f9befcc9d8f049ee40aca392d087e9b076aeea SHA1 d789596d7b46b25e3a78d60832953b58bd9241db SHA256 ef24138eff3aff8ec7191c800b8e80cc3b9073a09d0a2b7b4378e152530f78a3
 MISC metadata.xml 554 RMD160 35a9c1672f8234e632d132cb027b49dfafde7088 SHA1 8c587cc015553e0679099d1e924ed27edcef4b62 SHA256 31620c2c90ee411f950c9ccf31ec24c3734bcb4a9cc13c083a3214c05e62cdbd
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk3YfN4ACgkQGpDnPLSHuMAYEACgt2fvRoQyxyNPhxgLWWWO0Gp5
+Nb4An06bb1gN80A8ua4yltHYQY2H++XM
+=n2RA
+-----END PGP SIGNATURE-----
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() { :; }