Skip to contentSkip to conversation

libbsd: fix display of comment

PATCH New Fabrice Fontaine 3 participants 3 messages Dec 3, 2018 – Dec 16, 2018

lore
Share & tools
lore

Fabrice Fontaine

author
#0 lore raw

PATCH v2 1/1 libbsd: fix display of comment

Commit e13855c48f21eaee07a81f8b02678839be274a45 wrongly added depends on BR2_TOOLCHAIN_USES_UCLIBC && !BR2_USE_MMU
to display the comment "libbsd needs a toolchain w/ threads, wchar" The same error has also been made for minizip

To fix this issue, move dependency !(BR2_TOOLCHAIN_USES_UCLIBC && !BR2_USE_MMU) under BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS

Signed-off-by Fabrice Fontaine <[email protected]>

---
Changes v1 -> v2 (after review of Thomas Petazzoni):
- move dependency !(BR2_TOOLCHAIN_USES_UCLIBC && !BR2_USE_MMU) under BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS

 package/libbsd/Config.in  | 5 ++---
 package/minizip/Config.in | 2 --
 2 files changed, 2 insertions(+), 5 deletions(-)
package/libbsd/Config.in +2 -3
index ba5e5cbcfa..0f320302b9 100644
@@ -5,12 +5,12 @@ config BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS
 	depends on !BR2_microblaze
 	depends on !BR2_arc
 	depends on !BR2_xtensa
+	# uClibc on noMMU doesn't provide __register_atfork()
+	depends on !(BR2_TOOLCHAIN_USES_UCLIBC && !BR2_USE_MMU)
 
 config BR2_PACKAGE_LIBBSD
 	bool "libbsd"
 	depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS
-	# uClibc on noMMU doesn't provide __register_atfork()
-	depends on !(BR2_TOOLCHAIN_USES_UCLIBC && !BR2_USE_MMU)
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_USE_WCHAR
 	help

@@ -24,5 +24,4 @@ config BR2_PACKAGE_LIBBSD
 
 comment "libbsd needs a toolchain w/ threads, wchar"
 	depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS
-	depends on BR2_TOOLCHAIN_USES_UCLIBC && !BR2_USE_MMU
 	depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR
package/minizip/Config.in +0 -2
index 4bc12a0d7e..68fa1d7118 100644
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_MINIZIP
 	bool "minizip"
 	depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS
-	depends on !(BR2_TOOLCHAIN_USES_UCLIBC && !BR2_USE_MMU) # libbsd
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libbsd
 	depends on BR2_USE_WCHAR # libbsd
 	select BR2_PACKAGE_LIBBSD

@@ -20,5 +19,4 @@ config BR2_PACKAGE_MINIZIP_DEMOS
 
 comment "minizip needs a toolchain w/ threads, wchar"
 	depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS
-	depends on BR2_TOOLCHAIN_USES_UCLIBC && !BR2_USE_MMU
 	depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR
Signature · 1 line
2.14.1
Applied
#1 lore raw

PATCH v2 1/1 libbsd: fix display of comment

Hello,

Quoted 9 lines · Fabrice Fontaine

Commit e13855c48f21eaee07a81f8b02678839be274a45 wrongly added depends on BR2_TOOLCHAIN_USES_UCLIBC && !BR2_USE_MMU
to display the comment "libbsd needs a toolchain w/ threads, wchar" The same error has also been made for minizip

To fix this issue, move dependency !(BR2_TOOLCHAIN_USES_UCLIBC && !BR2_USE_MMU) under BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS

Quoted 6 lines
Signed-off-by Fabrice Fontaine <[email protected]>

---
Changes v1 -> v2 (after review of Thomas Petazzoni):
- move dependency !(BR2_TOOLCHAIN_USES_UCLIBC && !BR2_USE_MMU) under BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#2 lore raw

PATCH v2 1/1 libbsd: fix display of comment

In reply to Fabrice Fontaine
Quoted 11 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Fabrice" == Fabrice Fontaine <[email protected]> writes:

Commit e13855c48f21eaee07a81f8b02678839be274a45 wrongly added depends on BR2_TOOLCHAIN_USES_UCLIBC && !BR2_USE_MMU
to display the comment "libbsd needs a toolchain w/ threads, wchar" The same error has also been made for minizip

To fix this issue, move dependency !(BR2_TOOLCHAIN_USES_UCLIBC && !BR2_USE_MMU) under BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS

Quoted 6 lines
Signed-off-by Fabrice Fontaine <[email protected]>

---
Changes v1 -> v2 (after review of Thomas Petazzoni):
- move dependency !(BR2_TOOLCHAIN_USES_UCLIBC && !BR2_USE_MMU) under BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS

Committed to 2018.11.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard