Skip to contentSkip to conversation

icu: Doesn't work on ARC yet

PATCH New Mischa Jonker 3 participants 3 messages Nov 11, 2013

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 icu: Doesn't work on ARC yet

icu depends on __sync_sub_and_fetch and other atomic primitives that don't exist in the ARC toolchain yet.

---
v2:
Added !arc dependency to comment line
Propagated dependency to icu's reverse dependencies, except for webkit
(webkit already cannot be selected for ARC)

 package/beecrypt/Config.in    |    3 ++-
 package/cppcms/Config.in      |    1 +
 package/icu/Config.in         |    5 +++--
 package/php/Config.ext        |    1 +
 package/qt5/qt5base/Config.in |    1 +
 5 files changed, 8 insertions(+), 3 deletions(-)
package/beecrypt/Config.in +2 -1
index caa6d17..83cbf96 100644
@@ -1,7 +1,8 @@
 config BR2_PACKAGE_BEECRYPT
 	bool "beecrypt"
 	depends on BR2_TOOLCHAIN_HAS_THREADS
-	select BR2_PACKAGE_ICU if BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR
+	select BR2_PACKAGE_ICU if BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR && \
+	       !BR2_arc
 	help
 	  Beecrypt is a general-purpose cryptography library.
 
package/cppcms/Config.in +1 -0
index 11daf7c..d07dc76 100644
@@ -23,6 +23,7 @@ config BR2_PACKAGE_CPPCMS
 config BR2_PACKAGE_CPPCMS_ICU
 	bool "enable icu support"
 	depends on BR2_PACKAGE_CPPCMS
+	depends on !BR2_arc # icu -> atomic builtins
 	select BR2_PACKAGE_ICU
 	help
 	  Using ICU allows advanced localization features into CppCMS,
package/icu/Config.in +3 -2
index 585bffb..b1c23f8 100644
@@ -3,11 +3,12 @@ config BR2_PACKAGE_ICU
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_USE_WCHAR
 	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on !BR2_arc # atomic builtins
 	help
 	  International Components for Unicode.
 
 	  http://site.icu-project.org/
 
-comment "icu needs a toolchain w/ C++, wchar, threads"
+comment "icu needs a toolchain w/ C++, wchar, threads, atomic builtins"
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
-		!BR2_TOOLCHAIN_HAS_THREADS
+		!BR2_TOOLCHAIN_HAS_THREADS || BR2_arc
package/php/Config.ext +1 -0
index c0c85f1..380c3cf 100644
@@ -172,6 +172,7 @@ config BR2_PACKAGE_PHP_EXT_INTL
 	select BR2_PACKAGE_ICU
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_USE_WCHAR
+	depends on !BR2_arc # icu -> atomic builtins
 	help
 	  Internationalization support
 
package/qt5/qt5base/Config.in +1 -0
index 83f17e3..e932e24 100644
@@ -181,6 +181,7 @@ config BR2_PACKAGE_QT5BASE_DBUS
 config BR2_PACKAGE_QT5BASE_ICU
 	bool "Enable ICU support"
 	select BR2_PACKAGE_ICU
+	depends on !BR2_arc # icu -> atomic builtins
 	help
 	  This option enables ICU support in Qt5. This is for example
 	  needed for Qt5Webkit.
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH v2 1/1 icu: Doesn't work on ARC yet

Quoted 52 lines · Mischa Jonker

icu depends on __sync_sub_and_fetch and other atomic primitives that don't exist in the ARC toolchain yet.

---
v2:
Added !arc dependency to comment line
Propagated dependency to icu's reverse dependencies, except for webkit
(webkit already cannot be selected for ARC)

 package/beecrypt/Config.in    |    3 ++-
 package/cppcms/Config.in      |    1 +
 package/icu/Config.in         |    5 +++--
 package/php/Config.ext        |    1 +
 package/qt5/qt5base/Config.in |    1 +
 5 files changed, 8 insertions(+), 3 deletions(-)
package/beecrypt/Config.in +2 -1
index caa6d17..83cbf96 100644
@@ -1,7 +1,8 @@
 config BR2_PACKAGE_BEECRYPT
        bool "beecrypt"
        depends on BR2_TOOLCHAIN_HAS_THREADS
-       select BR2_PACKAGE_ICU if BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR
+       select BR2_PACKAGE_ICU if BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR && \
+              !BR2_arc
        help
          Beecrypt is a general-purpose cryptography library.
 
package/cppcms/Config.in +1 -0
index 11daf7c..d07dc76 100644
@@ -23,6 +23,7 @@ config BR2_PACKAGE_CPPCMS
 config BR2_PACKAGE_CPPCMS_ICU
        bool "enable icu support"
        depends on BR2_PACKAGE_CPPCMS
+       depends on !BR2_arc # icu -> atomic builtins
        select BR2_PACKAGE_ICU
        help
          Using ICU allows advanced localization features into CppCMS,
package/icu/Config.in +1 -0
index 585bffb..b1c23f8 100644
@@ -3,11 +3,12 @@ config BR2_PACKAGE_ICU
        depends on BR2_INSTALL_LIBSTDCPP
        depends on BR2_USE_WCHAR
        depends on BR2_TOOLCHAIN_HAS_THREADS
+       depends on !BR2_arc # atomic builtins

package/icu/Config.in config BR2_PACKAGE_ICU · line 14

Quoted 10 lines
package/icu/Config.in +2 -2
        help
          International Components for Unicode.
 
          http://site.icu-project.org/
 
-comment "icu needs a toolchain w/ C++, wchar, threads"
+comment "icu needs a toolchain w/ C++, wchar, threads, atomic builtins"
        depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
-               !BR2_TOOLCHAIN_HAS_THREADS
+               !BR2_TOOLCHAIN_HAS_THREADS || BR2_arc

The atomic builtins shouldn't be mentioned in the text, but there should indeed be a new dependency. This is the expected format:

comment "icu needs a toolchain w/ C++, wchar, threads"
depends on !BR2_arc
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
!BR2_TOOLCHAIN_HAS_THREADS

package/php/Config.ext config BR2_PACKAGE_PHP_EXT_INTL · line 177

Quoted 11 lines
package/php/Config.ext +1 -0
index c0c85f1..380c3cf 100644
@@ -172,6 +172,7 @@ config BR2_PACKAGE_PHP_EXT_INTL
        select BR2_PACKAGE_ICU
        depends on BR2_INSTALL_LIBSTDCPP
        depends on BR2_USE_WCHAR
+       depends on !BR2_arc # icu -> atomic builtins
        help
          Internationalization support

There should be an update of the corresponding comment here as well. Same principle as mentioned above applies.

Best regards,
Thomas

#2 lore raw

PATCH v2 1/1 icu: Doesn't work on ARC yet

In reply to Mischa Jonker
Quoted 11 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Mischa" == Mischa Jonker <[email protected]> writes:

icu depends on __sync_sub_and_fetch and other atomic primitives that don't exist in the ARC toolchain yet.

---
v2:
Added !arc dependency to comment line
Propagated dependency to icu's reverse dependencies, except for webkit
(webkit already cannot be selected for ARC)

Committed with the changes pointed out by Thomas and the dependency added for the beecrypt comment as well, thanks.

Signature · 1 line
Bye, Peter Korsgaard