diff mbox

circus, python-psutil: fix syntax in Config.in

Message ID 1474474708-4848-1-git-send-email-rahul.bedarkar@imgtec.com
State Accepted
Headers show

Commit Message

Rahul Bedarkar Sept. 21, 2016, 4:18 p.m. UTC
After commit ab930190d775 ("python-psutil: not available on musl")
we are getting following error when we set defconfig

package/python-psutil/Config.in:14: syntax error
package/python-psutil/Config.in:13: invalid option
package/circus/Config.in:21: syntax error
package/circus/Config.in:20: invalid option

Fixes: ab930190d775 ("python-psutil: not available on musl")
Signed-off-by: Rahul Bedarkar <rahul.bedarkar@imgtec.com>
---
 package/circus/Config.in        | 2 +-
 package/python-psutil/Config.in | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Comments

Yann E. MORIN Sept. 21, 2016, 4:21 p.m. UTC | #1
Rahul, All,

On 2016-09-21 21:48 +0530, Rahul Bedarkar spake thusly:
> After commit ab930190d775 ("python-psutil: not available on musl")
> we are getting following error when we set defconfig
> 
> package/python-psutil/Config.in:14: syntax error
> package/python-psutil/Config.in:13: invalid option
> package/circus/Config.in:21: syntax error
> package/circus/Config.in:20: invalid option
> 
> Fixes: ab930190d775 ("python-psutil: not available on musl")
> Signed-off-by: Rahul Bedarkar <rahul.bedarkar@imgtec.com>

Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

Regards,
Yann E. MORIN.

> ---
>  package/circus/Config.in        | 2 +-
>  package/python-psutil/Config.in | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/package/circus/Config.in b/package/circus/Config.in
> index 3df41f5..94c59a4 100644
> --- a/package/circus/Config.in
> +++ b/package/circus/Config.in
> @@ -18,5 +18,5 @@ config BR2_PACKAGE_CIRCUS
>  
>  comment "circus needs Python and a uClibc or glibc toolchain w/ C++, wchar, threads"
>  	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
> -		!BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_USES_MUSL \
> +		!BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_USES_MUSL || \
>  		!(BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3)
> diff --git a/package/python-psutil/Config.in b/package/python-psutil/Config.in
> index 0b1333c..1aec35d 100644
> --- a/package/python-psutil/Config.in
> +++ b/package/python-psutil/Config.in
> @@ -10,4 +10,4 @@ config BR2_PACKAGE_PYTHON_PSUTIL
>  	  https://pypi.python.org/pypi/psutil
>  
>  comment "python-psutil needs a uClibc or glibc toolchain"
> -	depends BR2_TOOLCHAIN_USES_MUSL
> +	depends on BR2_TOOLCHAIN_USES_MUSL
> -- 
> 2.6.2
> 
> _______________________________________________
> buildroot mailing list
> buildroot@busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
Thomas Petazzoni Sept. 21, 2016, 6:28 p.m. UTC | #2
Hello,

On Wed, 21 Sep 2016 21:48:28 +0530, Rahul Bedarkar wrote:
> After commit ab930190d775 ("python-psutil: not available on musl")
> we are getting following error when we set defconfig
> 
> package/python-psutil/Config.in:14: syntax error
> package/python-psutil/Config.in:13: invalid option
> package/circus/Config.in:21: syntax error
> package/circus/Config.in:20: invalid option
> 
> Fixes: ab930190d775 ("python-psutil: not available on musl")
> Signed-off-by: Rahul Bedarkar <rahul.bedarkar@imgtec.com>
> ---
>  package/circus/Config.in        | 2 +-
>  package/python-psutil/Config.in | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)

Applied to master, thanks.

Thomas
Peter Korsgaard Sept. 21, 2016, 8:20 p.m. UTC | #3
>>>>> "Rahul" == Rahul Bedarkar <rahul.bedarkar@imgtec.com> writes:

 > After commit ab930190d775 ("python-psutil: not available on musl")
 > we are getting following error when we set defconfig

 > package/python-psutil/Config.in:14: syntax error
 > package/python-psutil/Config.in:13: invalid option
 > package/circus/Config.in:21: syntax error
 > package/circus/Config.in:20: invalid option

 > Fixes: ab930190d775 ("python-psutil: not available on musl")

Gaah, sorry!
diff mbox

Patch

diff --git a/package/circus/Config.in b/package/circus/Config.in
index 3df41f5..94c59a4 100644
--- a/package/circus/Config.in
+++ b/package/circus/Config.in
@@ -18,5 +18,5 @@  config BR2_PACKAGE_CIRCUS
 
 comment "circus needs Python and a uClibc or glibc toolchain w/ C++, wchar, threads"
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
-		!BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_USES_MUSL \
+		!BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_USES_MUSL || \
 		!(BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3)
diff --git a/package/python-psutil/Config.in b/package/python-psutil/Config.in
index 0b1333c..1aec35d 100644
--- a/package/python-psutil/Config.in
+++ b/package/python-psutil/Config.in
@@ -10,4 +10,4 @@  config BR2_PACKAGE_PYTHON_PSUTIL
 	  https://pypi.python.org/pypi/psutil
 
 comment "python-psutil needs a uClibc or glibc toolchain"
-	depends BR2_TOOLCHAIN_USES_MUSL
+	depends on BR2_TOOLCHAIN_USES_MUSL