Thread (5 messages) 5 messages, 2 authors, 2016-11-12

[Buildroot] [PATCH 2/2] package/tvheadend: needs a host with an UTF8 locale

flat view
STALE3630d

From: Yann E. MORIN <hidden>
Date: 2016-11-06 20:23:51
Subsystem: the rest · Maintainer: Linus Torvalds

The mkbundle python script requires an UTF8 locale to encode non-ASCII
characters.

Force the locale on the configure, build and install command lines.

Fixes:
    http://autobuild.buildroot.org/results/6fe/6fe3331f1f1d54cb977bb61a09d7707f19f7eafa/
    http://autobuild.buildroot.org/results/d1d/d1dda2c1d5af8fbaa09ecbf4a87f3892369b9e53/
    [...]

Signed-off-by: "Yann E. MORIN" <redacted>
Cc: Romain Naour <redacted>
Cc: Arnout Vandecappelle <redacted>

---
There is still a corner case, where the user has a build machine that
has no UTF-8 locale. This is deemed a corner case which we do not want
to address yet for master. Changes in how we handle the UTF8 locale will
come in the -next branch.
---
 package/tvheadend/tvheadend.mk | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk
index a3afec8..d5b58b4 100644
--- a/package/tvheadend/tvheadend.mk
+++ b/package/tvheadend/tvheadend.mk
@@ -70,6 +70,7 @@ TVHEADEND_PRE_CONFIGURE_HOOKS += TVHEADEND_INSTALL_DTV_SCAN_TABLES
 
 define TVHEADEND_CONFIGURE_CMDS
 	(cd $(@D);						\
+		LC_ALL=$(UTF8_LOCALE)					\
 		$(TARGET_CONFIGURE_OPTS)			\
 		$(TARGET_CONFIGURE_ARGS)			\
 		CFLAGS="$(TVHEADEND_CFLAGS)"			\
@@ -88,11 +89,11 @@ define TVHEADEND_CONFIGURE_CMDS
 endef
 
 define TVHEADEND_BUILD_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
+	$(TARGET_MAKE_ENV) LC_ALL=$(UTF8_LOCALE) $(MAKE) -C $(@D)
 endef
 
 define TVHEADEND_INSTALL_TARGET_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR="$(TARGET_DIR)" install
+	$(TARGET_MAKE_ENV) LC_ALL=$(UTF8_LOCALE) $(MAKE) -C $(@D) DESTDIR="$(TARGET_DIR)" install
 endef
 
 # Remove documentation and source files that are not needed because we
-- 
2.7.4
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help