Patchwork [4/5] python-bottle: Convert package to be used with python2 or python3

login
register
mail settings
Submitter kpa_info@yahoo.fr
Date Feb. 12, 2013, 2:14 p.m.
Message ID <1360678441-3199-5-git-send-email-kpa_info@yahoo.fr>
Download mbox | patch
Permalink /patch/219861/
State Superseded
Headers show

Comments

kpa_info@yahoo.fr - Feb. 12, 2013, 2:14 p.m.
Signed-off-by: Patrick Gerber <kpa_info@yahoo.fr>
---
 package/python-bottle/Config.in        |    1 +
 package/python-bottle/python-bottle.mk |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
Thomas Petazzoni - Feb. 12, 2013, 2:20 p.m.
Dear Patrick Gerber,

On Tue, 12 Feb 2013 15:14:00 +0100, Patrick Gerber wrote:
> 
> Signed-off-by: Patrick Gerber <kpa_info@yahoo.fr>
> ---
>  package/python-bottle/Config.in        |    1 +
>  package/python-bottle/python-bottle.mk |    2 +-
>  2 files changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/package/python-bottle/Config.in b/package/python-bottle/Config.in
> index f9b60ca..e6f2f3b 100644
> --- a/package/python-bottle/Config.in
> +++ b/package/python-bottle/Config.in
> @@ -1,5 +1,6 @@
>  config BR2_PACKAGE_PYTHON_BOTTLE
>  	bool "python-bottle"
> +	depends on (BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3)

This change is useless, since the python-bottle package is only
available when either BR2_PACKAGE_PYTHON or BR2_PACKAGE_PYTHON3 are
enabled:

+if (BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3)
+menu "external python modules"
+source "package/python-bottle/Config.in"

Thomas

Patch

diff --git a/package/python-bottle/Config.in b/package/python-bottle/Config.in
index f9b60ca..e6f2f3b 100644
--- a/package/python-bottle/Config.in
+++ b/package/python-bottle/Config.in
@@ -1,5 +1,6 @@ 
 config BR2_PACKAGE_PYTHON_BOTTLE
 	bool "python-bottle"
+	depends on (BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3)
 	help
 	  Bottle is a fast, simple and lightweight WSGI micro web-framework
 	  for Python. It is distributed as a single file module and has no
diff --git a/package/python-bottle/python-bottle.mk b/package/python-bottle/python-bottle.mk
index 370b31b..d24e0ec 100644
--- a/package/python-bottle/python-bottle.mk
+++ b/package/python-bottle/python-bottle.mk
@@ -7,7 +7,7 @@ 
 PYTHON_BOTTLE_VERSION = 0.11.4
 PYTHON_BOTTLE_SOURCE = bottle-$(PYTHON_BOTTLE_VERSION).tar.gz
 PYTHON_BOTTLE_SITE = http://pypi.python.org/packages/source/b/bottle
-PYTHON_BOTTLE_DEPENDENCIES = python
+PYTHON_BOTTLE_DEPENDENCIES = $(PYTHON_GENERIC_DEPENDENCIES)
 PYTHON_BOTTLE_LICENSE = MIT
 # README.rst refers to the file "LICENSE" but it's not included