Patchwork [1/2] Add bzip2 to host-python when it is selected (aids in compiling nodejs)

login
register
mail settings
Submitter Daniel Price
Date Feb. 15, 2013, 1:05 a.m.
Message ID <CAKduhStasUzEq99Dfb9mF8DEKuTPc4cjaXKA1T+sMzaj7-CDEQ@mail.gmail.com>
Download mbox | patch
Permalink /patch/220577/
State Superseded
Headers show

Comments

Daniel Price - Feb. 15, 2013, 1:05 a.m.
Based off of patches posted by (and Signed-off-by): Jonathan Liu
<net147@gmail.com>

Signed-off-by: Daniel Price <daniel.price@gmail.com>
---
 package/python/python.mk |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

--
1.7.6.5
Thomas Petazzoni - Feb. 16, 2013, 2:12 a.m.
Dear Daniel Price,

On Thu, 14 Feb 2013 17:05:48 -0800, Daniel Price wrote:

> diff --git a/package/python/python.mk b/package/python/python.mk
> index 71591b7..580eda2 100644
> --- a/package/python/python.mk
> +++ b/package/python/python.mk
> @@ -30,7 +30,6 @@ HOST_PYTHON_CONF_OPT += \
>   --disable-gdbm \
>   --disable-bsddb \
>   --disable-test-modules \
> - --disable-bz2 \
>   --disable-ssl
> 
>  HOST_PYTHON_MAKE_ENV = \
> @@ -98,6 +97,8 @@ endif
> 
>  ifeq ($(BR2_PACKAGE_PYTHON_BZIP2),y)
>  PYTHON_DEPENDENCIES += bzip2
> +HOST_PYTHON_DEPENDENCIES += host-bzip2
> +PYTHON_CONF_OPT += --enable-bz2

Wasn't the intention of adding bz2 support to the host python?

But anyway, the fact that BR2_PACKAGE_PYTHON_BZIP2 is enabled or not
should not influence the host-python build. BR2_PACKAGE_PYTHON_BZIP2
is here to configure the target python, not the host one. We presently
don't have a good way to provide configuration options for host
packages.

So your patch should presumably just:

 * Remove the --disable-bz2 line from HOST_PYTHON_CONF_OPT, as you did,
   and replace it with --enable-bz2.

 * Outside of any ifeq condition, do HOST_PYTHON_DEPENDENCIES +=
   host-bzip2.

That will mean that everybody building host-python will have to build
host-bzip2 and the bz2 support in Python, but I think it's OK.

Thanks,

Thomas

Patch

diff --git a/package/python/python.mk b/package/python/python.mk
index 71591b7..580eda2 100644
--- a/package/python/python.mk
+++ b/package/python/python.mk
@@ -30,7 +30,6 @@  HOST_PYTHON_CONF_OPT += \
  --disable-gdbm \
  --disable-bsddb \
  --disable-test-modules \
- --disable-bz2 \
  --disable-ssl

 HOST_PYTHON_MAKE_ENV = \
@@ -98,6 +97,8 @@  endif

 ifeq ($(BR2_PACKAGE_PYTHON_BZIP2),y)
 PYTHON_DEPENDENCIES += bzip2
+HOST_PYTHON_DEPENDENCIES += host-bzip2
+PYTHON_CONF_OPT += --enable-bz2
 else
 PYTHON_CONF_OPT += --disable-bz2
 endif