diff options
| author |   Roy Marples <uberlord@gentoo.org> | 2006-11-06 14:17:38 +0000 |
|---|---|---|
| committer | Roy Marples <uberlord@gentoo.org> | 2006-11-06 14:17:38 +0000 |
| commit | c3bc9684dffcdd57dcad4479f47b22ed3b598ea4 (patch) | |
| tree | 6100e7ead7b9cdbb4cafc779e85724cb223ea709 /sys-libs | |
| parent | add some verbosity to the error (diff) | |
| download | gentoo-2-c3bc9684dffcdd57dcad4479f47b22ed3b598ea4.tar.gz gentoo-2-c3bc9684dffcdd57dcad4479f47b22ed3b598ea4.tar.bz2 gentoo-2-c3bc9684dffcdd57dcad4479f47b22ed3b598ea4.zip | |
Link to intl in non glibc systems when requesting nls.
Fixes #154181 thanks to Timothy Redaelli.
(Portage version: 2.1.2_rc1-r4)
Diffstat (limited to 'sys-libs')
| -rw-r--r-- | sys-libs/timezone-data/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-libs/timezone-data/timezone-data-2006n.ebuild | 9 |
2 files changed, 12 insertions, 3 deletions
diff --git a/sys-libs/timezone-data/ChangeLog b/sys-libs/timezone-data/ChangeLog index fe92504e6d8c..566dab8e209c 100644 --- a/sys-libs/timezone-data/ChangeLog +++ b/sys-libs/timezone-data/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-libs/timezone-data # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.51 2006/11/04 23:42:33 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/ChangeLog,v 1.52 2006/11/06 14:17:38 uberlord Exp $ + + 06 Nov 2006; Roy Marples <uberlord@gentoo.org> timezone-data-2006n.ebuild: + Link to intl in non glibc systems when requesting nls. + Fixes #154181 thanks to Timothy Redaelli. 04 Nov 2006; Mike Frysinger <vapier@gentoo.org> files/timezone-data-2005n-makefile.patch, timezone-data-2006n.ebuild: diff --git a/sys-libs/timezone-data/timezone-data-2006n.ebuild b/sys-libs/timezone-data/timezone-data-2006n.ebuild index bcb7a7e185ad..b2f07a62b8ea 100644 --- a/sys-libs/timezone-data/timezone-data-2006n.ebuild +++ b/sys-libs/timezone-data/timezone-data-2006n.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2006n.ebuild,v 1.11 2006/11/04 23:42:33 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/timezone-data/timezone-data-2006n.ebuild,v 1.12 2006/11/06 14:17:38 uberlord Exp $ inherit eutils toolchain-funcs flag-o-matic @@ -29,7 +29,12 @@ src_unpack() { src_compile() { tc-export CC use elibc_FreeBSD && append-flags -DSTD_INSPIRED #138251 - use nls && export NLS=1 || export NLS=0 + if use nls ; then + use elibc_glibc || append-ldflags -lintl #154181 + export NLS=1 + else + export NLS=0 + fi emake || die "emake failed" if tc-is-cross-compiler ; then make -C "${S}"-native CC=$(tc-getBUILD_CC) zic || die |