From b27996c7990438d73c5ef55da1b68f935dfb4dc8 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Mon, 2 Jul 2018 23:03:01 -0400 Subject: [PATCH] Revert commit d4e5ec877ca This commit removes the PYTHON_UTF8 workaround. The problem with setting LC_ALL= LANG=C LC_CTYPE=en_US.UTF-8 is that the en_US.UTF-8 locale might not be available. In this case setting above locales results in build errors even though another UTF-8 locale was originally set [1]. The only stable way of fixing the encoding problem is by specifying the encoding in Python, like the previous commit does. [1] https://bugs.gentoo.org/657766 Backports commit 0d6b93deeeb3cc190692d629f5927befdc8b1fb8 from qemu --- qemu/Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/qemu/Makefile b/qemu/Makefile index fd354e55..6d940d59 100644 --- a/qemu/Makefile +++ b/qemu/Makefile @@ -9,8 +9,6 @@ ifneq ($(wildcard config-host.mak),) all: include config-host.mak -PYTHON_UTF8 = LC_ALL= LANG=C LC_CTYPE=en_US.UTF-8 $(PYTHON) - # Check that we're not trying to do an out-of-tree build from # a tree that's been used for an in-tree build. ifneq ($(realpath $(SRC_PATH)),$(realpath .)) @@ -172,7 +170,7 @@ qapi/qapi-visit-misc.c qapi/qapi-visit-misc.h \ qapi-doc.texi: \ qapi-gen-timestamp ; qapi-gen-timestamp: $(qapi-modules) $(qapi-py) - $(call quiet-command,$(PYTHON_UTF8) $(SRC_PATH)/scripts/qapi-gen.py \ + $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-gen.py \ -o "qapi" -b $<, \ "GEN","$(@:%-timestamp=%)") @>$@