diff mbox

qt5: disallow 5.8 version for ARMv4

Message ID 20170220082459.30816-1-peter@korsgaard.com
State Accepted
Commit 49c543a79b7bdf3c9fbde83577ac14850721057f
Headers show

Commit Message

Peter Korsgaard Feb. 20, 2017, 8:24 a.m. UTC
Fixes:
http://autobuild.buildroot.net/results/197/197ab8a12bf1d780a986e5d447d1e0f5ee070405/

qt5.8 no longer supports ARMv4. From src/corelib/global/qprocessordetection.h:

  if Q_PROCESSOR_ARM >= 6
    define Q_PROCESSOR_ARM_V6
  endif
  if Q_PROCESSOR_ARM >= 5
    define Q_PROCESSOR_ARM_V5
  else
    error "ARM architecture too old"

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/qt5/Config.in | 1 +
 1 file changed, 1 insertion(+)

Comments

Baruch Siach Feb. 20, 2017, 8:29 a.m. UTC | #1
Hi Peter,

On Mon, Feb 20, 2017 at 09:24:59AM +0100, Peter Korsgaard wrote:
> Fixes:
> http://autobuild.buildroot.net/results/197/197ab8a12bf1d780a986e5d447d1e0f5ee070405/
> 
> qt5.8 no longer supports ARMv4. From src/corelib/global/qprocessordetection.h:
> 
>   if Q_PROCESSOR_ARM >= 6
>     define Q_PROCESSOR_ARM_V6
>   endif
>   if Q_PROCESSOR_ARM >= 5
>     define Q_PROCESSOR_ARM_V5
>   else
>     error "ARM architecture too old"
> 
> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
> ---
>  package/qt5/Config.in | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/package/qt5/Config.in b/package/qt5/Config.in
> index b3cb2adfe..71258aafc 100644
> --- a/package/qt5/Config.in
> +++ b/package/qt5/Config.in
> @@ -38,6 +38,7 @@ config BR2_PACKAGE_QT5_VERSION_LATEST
>  	bool "Latest (5.8)"
>  	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11
>  	depends on BR2_HOST_GCC_AT_LEAST_4_8 # C++11
> +	depends on !BR2_ARM_CPU_ARMV4 # needs ARMv5+
>  	help
>  	  This option builds Qt 5.8, which is licensed under
>  	  (L)GPLv3+.

The comment dependencies needs an update as well.

baruch
Peter Korsgaard Feb. 20, 2017, 8:38 a.m. UTC | #2
>>>>> "Baruch" == Baruch Siach <baruch@tkos.co.il> writes:

 > Hi Peter,
 > On Mon, Feb 20, 2017 at 09:24:59AM +0100, Peter Korsgaard wrote:
 >> Fixes:
 >> http://autobuild.buildroot.net/results/197/197ab8a12bf1d780a986e5d447d1e0f5ee070405/
 >> 
 >> qt5.8 no longer supports ARMv4. From src/corelib/global/qprocessordetection.h:
 >> 
 >> if Q_PROCESSOR_ARM >= 6
 >> define Q_PROCESSOR_ARM_V6
 >> endif
 >> if Q_PROCESSOR_ARM >= 5
 >> define Q_PROCESSOR_ARM_V5
 >> else
 >> error "ARM architecture too old"
 >> 
 >> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
 >> ---
 >> package/qt5/Config.in | 1 +
 >> 1 file changed, 1 insertion(+)
 >> 
 >> diff --git a/package/qt5/Config.in b/package/qt5/Config.in
 >> index b3cb2adfe..71258aafc 100644
 >> --- a/package/qt5/Config.in
 >> +++ b/package/qt5/Config.in
 >> @@ -38,6 +38,7 @@ config BR2_PACKAGE_QT5_VERSION_LATEST
 >> bool "Latest (5.8)"
 >> depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11
 >> depends on BR2_HOST_GCC_AT_LEAST_4_8 # C++11
 >> +	depends on !BR2_ARM_CPU_ARMV4 # needs ARMv5+
 >> help
 >> This option builds Qt 5.8, which is licensed under
 >> (L)GPLv3+.

 > The comment dependencies needs an update as well.

Ahh yes, true. I'll fix that and commit - Thanks!
diff mbox

Patch

diff --git a/package/qt5/Config.in b/package/qt5/Config.in
index b3cb2adfe..71258aafc 100644
--- a/package/qt5/Config.in
+++ b/package/qt5/Config.in
@@ -38,6 +38,7 @@  config BR2_PACKAGE_QT5_VERSION_LATEST
 	bool "Latest (5.8)"
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11
 	depends on BR2_HOST_GCC_AT_LEAST_4_8 # C++11
+	depends on !BR2_ARM_CPU_ARMV4 # needs ARMv5+
 	help
 	  This option builds Qt 5.8, which is licensed under
 	  (L)GPLv3+.