diff options
| -rw-r--r-- | dev-libs/expat/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-libs/expat/expat-2.1.0.ebuild | 10 |
2 files changed, 13 insertions, 3 deletions
diff --git a/dev-libs/expat/ChangeLog b/dev-libs/expat/ChangeLog index 75d40ee9ceac..315b74cbdf3d 100644 --- a/dev-libs/expat/ChangeLog +++ b/dev-libs/expat/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/expat # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/expat/ChangeLog,v 1.129 2012/04/08 14:55:11 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/expat/ChangeLog,v 1.130 2012/04/15 11:43:15 ssuominen Exp $ + + 15 Apr 2012; Samuli Suominen <ssuominen@gentoo.org> expat-2.1.0.ebuild: + Fix installation on Gentoo/FreeBSD with USE="-unicode" wrt #412085 by Yuta + SATOH 08 Apr 2012; Raúl Porcel <armin76@gentoo.org> expat-2.1.0_beta3.ebuild: alpha/ia64/m68k/s390/sh/sparc stable wrt #407519 diff --git a/dev-libs/expat/expat-2.1.0.ebuild b/dev-libs/expat/expat-2.1.0.ebuild index a362d357224f..7b2a2bca182a 100644 --- a/dev-libs/expat/expat-2.1.0.ebuild +++ b/dev-libs/expat/expat-2.1.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/expat/expat-2.1.0.ebuild,v 1.1 2012/03/28 11:42:42 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/expat/expat-2.1.0.ebuild,v 1.2 2012/04/15 11:43:15 ssuominen Exp $ EAPI=4 inherit eutils libtool toolchain-funcs @@ -82,5 +82,11 @@ src_install() { # libgeom in /lib and ifconfig in /sbin require it on FreeBSD since we # stripped the libbsdxml copy starting from freebsd-lib-8.2-r1 - use elibc_FreeBSD && gen_usr_ldscript -a expat{,u,w} + if use elibc_FreeBSD; then + if use unicode; then + gen_usr_ldscript -a expat{,u,w} + else + gen_usr_ldscript -a expat + fi + fi } |