Skip to contentSkip to conversation

cups: add dependency on threads

PATCH New Olivier Schonken 2 participants 2 messages Nov 1, 2017

lore
Share & tools
lore

Olivier Schonken

author
#0 lore raw

PATCH 1/1 cups: add dependency on threads

Add myself as CUPS maintainer in DEVELOPERS list
Fixes
http://autobuild.buildroot.net/results/0f1cb8d72d0a78eb8b5c46548bc7c7bade93c674

Signed-off-by Olivier Schonken <[email protected]>
---
 DEVELOPERS             | 1 +
 package/cups/Config.in | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)
DEVELOPERS +1 -0
index 862399b45a..6c1319ccc4 100644
@@ -1168,6 +1168,7 @@ F:	package/ijs/
 F:	package/poppler/
 F:	package/qpdf/
 F:	package/openjpeg/
+F:  package/cups/
 
 N:	Olivier Singla <[email protected]>
 F:	package/shellinabox/
package/cups/Config.in +4 -2
index 3f5460c11b..635c0273c5 100644
@@ -2,6 +2,8 @@ config BR2_PACKAGE_CUPS
 	bool "cups"
 	# needs libstdcpp for ppdc
 	depends on BR2_INSTALL_LIBSTDCPP
+	# needs threads for ippserver
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	# needs fork()
 	depends on BR2_USE_MMU
 	help

@@ -9,5 +11,5 @@ config BR2_PACKAGE_CUPS
 
 	  http://www.cups.org
 
-comment "cups needs a toolchain w/ C++"
-	depends on !BR2_INSTALL_LIBSTDCPP
+comment "cups needs a toolchain w/ C++, threads"
+	depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS)
Signature · 1 line
2.14.1
#1 lore raw

PATCH 1/1 cups: add dependency on threads

Hello,

Quoted 15 lines · Olivier Schonken

Add myself as CUPS maintainer in DEVELOPERS list
Fixes
http://autobuild.buildroot.net/results/0f1cb8d72d0a78eb8b5c46548bc7c7bade93c674

Signed-off-by Olivier Schonken <[email protected]>
---
 DEVELOPERS             | 1 +
 package/cups/Config.in | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)
DEVELOPERS +0 -0
index 862399b45a..6c1319ccc4 100644

DEVELOPERS F: package/ijs/ · line 1171

Quoted 4 lines
DEVELOPERS +1 -0
@@ -1168,6 +1168,7 @@ F:	package/ijs/
 F:	package/poppler/
 F:	package/qpdf/
 F:	package/openjpeg/
+F:  package/cups/

This should have been a separate patch. Also, the indentation is wrong, and you broke alphabetic ordering. I've fixed this and applied as a separate patch.

Remember: independent changes should be made in separate patches.

Quoted 14 lines
package/cups/Config.in +2 -0
index 3f5460c11b..635c0273c5 100644
@@ -2,6 +2,8 @@ config BR2_PACKAGE_CUPS
 	bool "cups"
 	# needs libstdcpp for ppdc
 	depends on BR2_INSTALL_LIBSTDCPP
+	# needs threads for ippserver
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	# needs fork()
 	depends on BR2_USE_MMU
 	help

package/cups/Config.in config BR2_PACKAGE_CUPS · line 15

Quoted 7 lines
package/cups/Config.in +2 -2
@@ -9,5 +11,5 @@ config BR2_PACKAGE_CUPS
 
 	  http://www.cups.org
 
-comment "cups needs a toolchain w/ C++"
-	depends on !BR2_INSTALL_LIBSTDCPP
+comment "cups needs a toolchain w/ C++, threads"
+	depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS)

We generally use:

	depends on !foo || !bar

instead, so I've fixed that and applied.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com