summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony G. Basile <blueness@gentoo.org>2014-10-11 20:14:11 +0000
committerAnthony G. Basile <blueness@gentoo.org>2014-10-11 20:14:11 +0000
commitc7a8deebd5b1f018f9c06e5155d4ab0b1c719b6f (patch)
treea07d5cf0a73abd6065ea5d0ea9d1211673000ba2 /sys-libs/musl
parentStable for HPPA (bug #525064). (diff)
downloadgentoo-2-c7a8deebd5b1f018f9c06e5155d4ab0b1c719b6f.tar.gz
gentoo-2-c7a8deebd5b1f018f9c06e5155d4ab0b1c719b6f.tar.bz2
gentoo-2-c7a8deebd5b1f018f9c06e5155d4ab0b1c719b6f.zip
Use musl's builtin libintl.so, bug #524982
(Portage version: 2.2.8-r2/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)
Diffstat (limited to 'sys-libs/musl')
-rw-r--r--sys-libs/musl/ChangeLog5
-rw-r--r--sys-libs/musl/musl-9999.ebuild9
2 files changed, 6 insertions, 8 deletions
diff --git a/sys-libs/musl/ChangeLog b/sys-libs/musl/ChangeLog
index 044d747795d8..feabb4cd9fa4 100644
--- a/sys-libs/musl/ChangeLog
+++ b/sys-libs/musl/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-libs/musl
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/musl/ChangeLog,v 1.31 2014/10/11 11:43:31 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/musl/ChangeLog,v 1.32 2014/10/11 20:14:11 blueness Exp $
+
+ 11 Oct 2014; Anthony G. Basile <blueness@gentoo.org> musl-9999.ebuild:
+ Use musl's builtin libintl.so, bug #524982
11 Oct 2014; Anthony G. Basile <blueness@gentoo.org>
-files/musl-fix-mips-dynlink.patch, -musl-1.0.3.ebuild, -musl-1.0.4.ebuild,
diff --git a/sys-libs/musl/musl-9999.ebuild b/sys-libs/musl/musl-9999.ebuild
index a13bd89d290b..7714a58140cf 100644
--- a/sys-libs/musl/musl-9999.ebuild
+++ b/sys-libs/musl/musl-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/musl/musl-9999.ebuild,v 1.9 2014/10/11 11:43:31 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/musl/musl-9999.ebuild,v 1.10 2014/10/11 20:14:11 blueness Exp $
EAPI=5
@@ -28,9 +28,8 @@ fi
LICENSE="MIT"
SLOT="0"
-IUSE="crosscompile_opts_headers-only nls"
+IUSE="crosscompile_opts_headers-only"
-RDEPEND="nls? ( sys-devel/gettext )"
if [[ ${CATEGORY} != cross-* ]] ; then
RDEPEND+=" sys-apps/getent"
fi
@@ -83,10 +82,6 @@ src_install() {
if is_crosscompile ; then
dosym usr/include /usr/${CTARGET}/sys-include
fi
-
- # If we are going to use gnu's gettext then we have to
- # move musl's libintl out of the way.
- use nls && mv "${D}"/usr/include/libintl{,-musl}.h
}
pkg_postinst() {