Patchwork [v2] added python unicode selection to menu

login
register
mail settings
Submitter Matt Weber
Date Jan. 6, 2014, 9:17 p.m.
Message ID <1389043062-29826-1-git-send-email-mlweber1@rockwellcollins.com>
Download mbox | patch
Permalink /patch/307447/
State Superseded
Headers show

Comments

Matt Weber - Jan. 6, 2014, 9:17 p.m.
From: Matthew Weber <mlweber1@rockwellcollins.com>

This patch is based on the original new pkg patch submitted last Jan
and is part of the "Patchwork oldest patches cleanup #5".

Signed-off-by: Matt Weber <mlweber1@rockwellcollins.com>
--

Changes v1 -> v2:
 - None, resubmit after testing against current tip.
---
 package/python/Config.in |   18 ++++++++++++++++++
 package/python/python.mk |    6 ++++++
 2 files changed, 24 insertions(+), 0 deletions(-)
Thomas Petazzoni - Jan. 7, 2014, 5:23 a.m.
Dear Matt Weber,

On Mon, 6 Jan 2014 15:17:42 -0600, Matt Weber wrote:

> +# Default is UCS2 w/o a conf opt
> +ifeq ($(BR2_PACKAGE_PYTHON_UCS4),y)
> +HOST_PYTHON_CONF_OPT += --enable-unicode=ucs4
> +PYTHON_CONF_OPT      += --enable-unicode=ucs4
> +endif

Why is the selection of UCS4 for the target tied to the usage of UCS4
on the host?

Thomas
Matt Weber - Jan. 7, 2014, 2:16 p.m.
Hi Thomas,

Thomas Petazzoni <thomas.petazzoni@free-electrons.com> wrote on 01/06/2014 
11:23:16 PM:

> From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> To: Matt Weber <mlweber1@rockwellcollins.com>
> Cc: buildroot@busybox.net
> Date: 01/06/2014 11:23 PM
> Subject: Re: [Buildroot] [PATCH v2] added python unicode selection to 
menu
> 
> Dear Matt Weber,
> 
> On Mon, 6 Jan 2014 15:17:42 -0600, Matt Weber wrote:
> 
> > +# Default is UCS2 w/o a conf opt
> > +ifeq ($(BR2_PACKAGE_PYTHON_UCS4),y)
> > +HOST_PYTHON_CONF_OPT += --enable-unicode=ucs4
> > +PYTHON_CONF_OPT      += --enable-unicode=ucs4
> > +endif
> 
> Why is the selection of UCS4 for the target tied to the usage of UCS4
> on the host?

No specific reason, other then we couldn't come up with a case
where you could want the host different from the target.

Thanks!
Matt Weber
mlweber1@rockwellcollins.com

> 
> Thomas
> -- 
> Thomas Petazzoni, CTO, Free Electrons
> Embedded Linux, Kernel and Android engineering
> http://free-electrons.com
Thomas Petazzoni - Jan. 7, 2014, 3:13 p.m.
Dear Matthew Weber,

On Tue, 7 Jan 2014 08:16:59 -0600, Matthew Weber wrote:

> > Why is the selection of UCS4 for the target tied to the usage of UCS4
> > on the host?
> 
> No specific reason, other then we couldn't come up with a case
> where you could want the host different from the target.

Normally, BR2_PACKAGE_<foo>_<bar> options are not supposed to affect
the configuration of host packages.

Thomas
Matt Weber - Jan. 7, 2014, 4:39 p.m.
Hi Thomas,

Thomas Petazzoni <thomas.petazzoni@free-electrons.com> wrote on 01/07/2014 
09:13:36 AM:

> From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> To: "Matthew Weber" <mlweber1@rockwellcollins.com>
> Cc: buildroot@busybox.net
> Date: 01/07/2014 09:13 AM
> Subject: Re: [Buildroot] [PATCH v2] added python unicode selection to 
menu
> 
> Dear Matthew Weber,
> 
> On Tue, 7 Jan 2014 08:16:59 -0600, Matthew Weber wrote:
> 
> > > Why is the selection of UCS4 for the target tied to the usage of 
UCS4
> > > on the host?
> > 
> > No specific reason, other then we couldn't come up with a case
> > where you could want the host different from the target.
> 
> Normally, BR2_PACKAGE_<foo>_<bar> options are not supposed to affect
> the configuration of host packages.

Ok, we don't currently need support for that option in the host.
So I'll remove it until someone has a use case.

Thanks
Matt 
mlweber1@rockwellcollins.com

> 
> Thomas
> -- 
> Thomas Petazzoni, CTO, Free Electrons
> Embedded Linux, Kernel and Android engineering
> http://free-electrons.com

Patch

diff --git a/package/python/Config.in b/package/python/Config.in
index b1c0935..63b8a2b 100644
--- a/package/python/Config.in
+++ b/package/python/Config.in
@@ -84,6 +84,24 @@  config BR2_PACKAGE_PYTHON_UNICODEDATA
 	help
 	  Unicode character database (used by stringprep module) (large).
 
+if BR2_PACKAGE_PYTHON_UNICODEDATA
+
+choice
+	prompt "Python unicode database format"
+	default BR2_PACKAGE_PYTHON_UCS2
+	help
+	  Select Python unicode database format for target
+
+config BR2_PACKAGE_PYTHON_UCS2
+	bool "Universal Character Set 2-byte (UCS2)"
+
+config BR2_PACKAGE_PYTHON_UCS4
+	bool "Universal Character Set 4-byte (UCS4)"
+
+endchoice
+
+endif
+
 config BR2_PACKAGE_PYTHON_SQLITE
 	bool "sqlite module"
 	select BR2_PACKAGE_SQLITE
diff --git a/package/python/python.mk b/package/python/python.mk
index bc42e8f..a231858 100644
--- a/package/python/python.mk
+++ b/package/python/python.mk
@@ -102,6 +102,12 @@  ifneq ($(BR2_PACKAGE_PYTHON_UNICODEDATA),y)
 PYTHON_CONF_OPT += --disable-unicodedata
 endif
 
+# Default is UCS2 w/o a conf opt
+ifeq ($(BR2_PACKAGE_PYTHON_UCS4),y)
+HOST_PYTHON_CONF_OPT += --enable-unicode=ucs4
+PYTHON_CONF_OPT      += --enable-unicode=ucs4
+endif
+
 ifeq ($(BR2_PACKAGE_PYTHON_BZIP2),y)
 PYTHON_DEPENDENCIES += bzip2
 else