From b9f374926a1889542d89cbff46e2b83d5afc99dd Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 7 Nov 2015 12:39:31 -0500 Subject: 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(-) (limited to 'app-emulation/qemu') diff --git a/app-emulation/qemu/qemu-2.4.0-r1.ebuild b/app-emulation/qemu/qemu-2.4.0-r1.ebuild index ba77ef86b3f..8d50bd3e7b8 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 71297679fe9..6b53c66421f 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 306d7720b0e..50ceedb9901 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 3db908d92ed..63252bea4b2 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 a514240afe0..31237158628 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}" -- cgit v1.2.1