mirrors-yuzu-emu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn synced 2024-11-24 02:43:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert commit d4e5ec877ca

Browse source 
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
This commit is contained in:
Matthias Maier 2018-07-02 23:03:01 -04:00 committed by Lioncash
parent af4b0028b8
commit b27996c799
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
qemu/Makefile
View file

@ -9,8 +9,6 @@ ifneq ($(wildcard config-host.mak),)
all: all:
include config-host.mak 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 # 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. # a tree that's been used for an in-tree build.
ifneq ($(realpath $(SRC_PATH)),$(realpath .)) ifneq ($(realpath $(SRC_PATH)),$(realpath .))
@ -172,7 +170,7 @@ qapi/qapi-visit-misc.c qapi/qapi-visit-misc.h \
qapi-doc.texi: \ qapi-doc.texi: \
qapi-gen-timestamp ; qapi-gen-timestamp ;
qapi-gen-timestamp: $(qapi-modules) $(qapi-py) 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 $<, \ -o "qapi" -b $<, \
"GEN","$(@:%-timestamp=%)") "GEN","$(@:%-timestamp=%)")
@>$@ @>$@