diff mbox series

[1/1] package/picotool: fix libusb dependencies

Message ID 20240721173831.2350206-1-fontaine.fabrice@gmail.com
State Accepted
Headers show
Series [1/1] package/picotool: fix libusb dependencies | expand

Commit Message

Fabrice Fontaine July 21, 2024, 5:38 p.m. UTC
libusb dependencies are wrong since the addition of the package in
commit f7aac1c008f9c59f8c669bade17864b099221065:
 - BR2_HOST_GCC_AT_LEAST_4_9 is used instead of
   BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
 - BR2_TOOLCHAIN_HAS_THREADS is missing

Fixes: f7aac1c008f9c59f8c669bade17864b099221065
 - http://autobuild.buildroot.org/results/22689afc092e33b6e3c1c7ffea0d0e3b5bf76d99

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/picotool/Config.in | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

Comments

Thomas Petazzoni July 22, 2024, 12:14 p.m. UTC | #1
On Sun, 21 Jul 2024 19:38:31 +0200
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:

> libusb dependencies are wrong since the addition of the package in
> commit f7aac1c008f9c59f8c669bade17864b099221065:
>  - BR2_HOST_GCC_AT_LEAST_4_9 is used instead of
>    BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
>  - BR2_TOOLCHAIN_HAS_THREADS is missing
> 
> Fixes: f7aac1c008f9c59f8c669bade17864b099221065
>  - http://autobuild.buildroot.org/results/22689afc092e33b6e3c1c7ffea0d0e3b5bf76d99
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
>  package/picotool/Config.in | 9 ++++++---
>  1 file changed, 6 insertions(+), 3 deletions(-)

Dammit, how could I have left this get through. Thanks for fixing
applied!

Thomas
Marcus Hoffmann July 22, 2024, 12:16 p.m. UTC | #2
On 22.07.24 14:14, Thomas Petazzoni via buildroot wrote:
> On Sun, 21 Jul 2024 19:38:31 +0200
> Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:
> 
>> libusb dependencies are wrong since the addition of the package in
>> commit f7aac1c008f9c59f8c669bade17864b099221065:
>>   - BR2_HOST_GCC_AT_LEAST_4_9 is used instead of
>>     BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
>>   - BR2_TOOLCHAIN_HAS_THREADS is missing
>>
>> Fixes: f7aac1c008f9c59f8c669bade17864b099221065
>>   - http://autobuild.buildroot.org/results/22689afc092e33b6e3c1c7ffea0d0e3b5bf76d99
>>
>> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
>> ---
>>   package/picotool/Config.in | 9 ++++++---
>>   1 file changed, 6 insertions(+), 3 deletions(-)
> 
> Dammit, how could I have left this get through. Thanks for fixing
> applied!

Thanks Fabrice, Thomas for fixing this. No idea how I got this wrong in 
the first place. :-/

Marcus

> 
> Thomas
diff mbox series

Patch

diff --git a/package/picotool/Config.in b/package/picotool/Config.in
index 0046f8ad61..bbbcef405d 100644
--- a/package/picotool/Config.in
+++ b/package/picotool/Config.in
@@ -1,10 +1,13 @@ 
-comment "picotool needs a toolchain w/ C++ and gcc >= 4.9"
-	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_HOST_GCC_AT_LEAST_4_9
+comment "picotool needs a toolchain w/ C++, threads, gcc >= 4.9"
+	depends on !BR2_INSTALL_LIBSTDCPP || \
+		BR2_TOOLCHAIN_HAS_THREADS || \
+		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
 
 config BR2_PACKAGE_PICOTOOL
 	bool "picotool"
 	depends on BR2_INSTALL_LIBSTDCPP
-	depends on BR2_HOST_GCC_AT_LEAST_4_9 # libusb
+	depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb
 	select BR2_PACKAGE_LIBUSB
 	select BR2_PACKAGE_PICO_SDK
 	help