commit: b9f374926a1889542d89cbff46e2b83d5afc99dd
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 7 17:39:31 2015 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sat Nov 7 17:46:45 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9f37492
app-emulation/qemu: force C locale for sorting to workaround glibc bug #564936
app-emulation/qemu/qemu-2.4.0-r1.ebuild | 5 +++--
app-emulation/qemu/qemu-2.4.0.1-r1.ebuild | 5 +++--
app-emulation/qemu/qemu-2.4.0.1.ebuild | 5 +++--
app-emulation/qemu/qemu-2.4.1.ebuild | 5 +++--
app-emulation/qemu/qemu-9999.ebuild | 5 +++--
5 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/app-emulation/qemu/qemu-2.4.0-r1.ebuild
b/app-emulation/qemu/qemu-2.4.0-r1.ebuild
index ba77ef8..8d50bd3 100644
--- a/app-emulation/qemu/qemu-2.4.0-r1.ebuild
+++ b/app-emulation/qemu/qemu-2.4.0-r1.ebuild
@@ -275,8 +275,9 @@ check_targets() {
pushd "${S}"/default-configs >/dev/null || die
- detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" |
sort -u))
- sorted=$(echo $(printf '%s\n' ${!var} | sort -u))
+ # Force C locale until glibc is updated. #564936
+ detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" |
LC_COLLATE=C sort -u))
+ sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u))
if [[ ${sorted} != "${detected}" ]] ; then
eerror "The ebuild needs to be kept in sync."
eerror "${var}: ${sorted}"
diff --git a/app-emulation/qemu/qemu-2.4.0.1-r1.ebuild
b/app-emulation/qemu/qemu-2.4.0.1-r1.ebuild
index 7129767..6b53c66 100644
--- a/app-emulation/qemu/qemu-2.4.0.1-r1.ebuild
+++ b/app-emulation/qemu/qemu-2.4.0.1-r1.ebuild
@@ -275,8 +275,9 @@ check_targets() {
pushd "${S}"/default-configs >/dev/null || die
- detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" |
sort -u))
- sorted=$(echo $(printf '%s\n' ${!var} | sort -u))
+ # Force C locale until glibc is updated. #564936
+ detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" |
LC_COLLATE=C sort -u))
+ sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u))
if [[ ${sorted} != "${detected}" ]] ; then
eerror "The ebuild needs to be kept in sync."
eerror "${var}: ${sorted}"
diff --git a/app-emulation/qemu/qemu-2.4.0.1.ebuild
b/app-emulation/qemu/qemu-2.4.0.1.ebuild
index 306d772..50ceedb 100644
--- a/app-emulation/qemu/qemu-2.4.0.1.ebuild
+++ b/app-emulation/qemu/qemu-2.4.0.1.ebuild
@@ -275,8 +275,9 @@ check_targets() {
pushd "${S}"/default-configs >/dev/null || die
- detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" |
sort -u))
- sorted=$(echo $(printf '%s\n' ${!var} | sort -u))
+ # Force C locale until glibc is updated. #564936
+ detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" |
LC_COLLATE=C sort -u))
+ sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u))
if [[ ${sorted} != "${detected}" ]] ; then
eerror "The ebuild needs to be kept in sync."
eerror "${var}: ${sorted}"
diff --git a/app-emulation/qemu/qemu-2.4.1.ebuild
b/app-emulation/qemu/qemu-2.4.1.ebuild
index 3db908d..63252be 100644
--- a/app-emulation/qemu/qemu-2.4.1.ebuild
+++ b/app-emulation/qemu/qemu-2.4.1.ebuild
@@ -275,8 +275,9 @@ check_targets() {
pushd "${S}"/default-configs >/dev/null || die
- detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" |
sort -u))
- sorted=$(echo $(printf '%s\n' ${!var} | sort -u))
+ # Force C locale until glibc is updated. #564936
+ detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" |
LC_COLLATE=C sort -u))
+ sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u))
if [[ ${sorted} != "${detected}" ]] ; then
eerror "The ebuild needs to be kept in sync."
eerror "${var}: ${sorted}"
diff --git a/app-emulation/qemu/qemu-9999.ebuild
b/app-emulation/qemu/qemu-9999.ebuild
index a514240..3123715 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -281,8 +281,9 @@ check_targets() {
pushd "${S}"/default-configs >/dev/null || die
- detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" |
sort -u))
- sorted=$(echo $(printf '%s\n' ${!var} | sort -u))
+ # Force C locale until glibc is updated. #564936
+ detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" |
LC_COLLATE=C sort -u))
+ sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u))
if [[ ${sorted} != "${detected}" ]] ; then
eerror "The ebuild needs to be kept in sync."
eerror "${var}: ${sorted}"
