diff mbox series

package/qt5tools: hide qdoc with llvm dependencies

Message ID 25605_1582898461_5E591D1D_25605_345_8_0fa6a8d4-31d0-445b-acea-f425422d14ef@OPEXCAUBMA2.corporate.adroot.infra.ftgroup
State Accepted
Headers show
Series package/qt5tools: hide qdoc with llvm dependencies | expand

Commit Message

Yann E. MORIN Feb. 28, 2020, 2 p.m. UTC
From: "Yann E. MORIN" <yann.morin@orange.com>

Building qdoc requires a llvm and clang for the host.

However, there is a limitation in the llvm and clang packages in
Buildroot, which makes it impossible to havea  host variant without
a target variant.

So, propagate the dependencies of the target llvm and clang, to ensure
we can only have a host-llvm and -clang packages that are correctly
built.

Note that we do propagate all of the dependencies (instead of just the
architecture part), to be consistent.

Reported-by: Romain Naour <romain.naour@smile.fr>
Signed-off-by: Yann E. MORIN <yann.morin@orange.com>
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Cc: Peter Seiderer <ps.report@gmx.net>
Cc: Julien Corjon <corjon.j@ecagroup.com>
---
 package/qt5/qt5tools/Config.in | 10 ++++++++++
 1 file changed, 10 insertions(+)

Comments

Romain Naour Feb. 28, 2020, 3:16 p.m. UTC | #1
Hello Yann,

Le 28/02/2020 à 15:00, yann.morin@orange.com a écrit :
> From: "Yann E. MORIN" <yann.morin@orange.com>
> 
> Building qdoc requires a llvm and clang for the host.
> 
> However, there is a limitation in the llvm and clang packages in
> Buildroot, which makes it impossible to havea  host variant without

s/havea/have a/

> a target variant.
> 
> So, propagate the dependencies of the target llvm and clang, to ensure
> we can only have a host-llvm and -clang packages that are correctly

host-clang

> built.
> 
> Note that we do propagate all of the dependencies (instead of just the
> architecture part), to be consistent.
> 
> Reported-by: Romain Naour <romain.naour@smile.fr>
> Signed-off-by: Yann E. MORIN <yann.morin@orange.com>
> Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> Cc: Peter Seiderer <ps.report@gmx.net>
> Cc: Julien Corjon <corjon.j@ecagroup.com>
> ---
>  package/qt5/qt5tools/Config.in | 10 ++++++++++
>  1 file changed, 10 insertions(+)
> 
> diff --git a/package/qt5/qt5tools/Config.in b/package/qt5/qt5tools/Config.in
> index 14178abc29..60106c1ee3 100644
> --- a/package/qt5/qt5tools/Config.in
> +++ b/package/qt5/qt5tools/Config.in
> @@ -19,6 +19,16 @@ config BR2_PACKAGE_QT5TOOLS_LINGUIST_TOOLS
>  
>  config BR2_PACKAGE_QT5TOOLS_QDOC_TOOL
>  	bool "qdoc host tool"
> +	# Needs llvm-config and libclang for the host, which is not
> +	# currently supported in Buildroot, unless the target is
> +	# already supported by llvm.
> +	depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS # llvm, clang
> +	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # llvm, clang
> +	depends on BR2_TOOLCHAIN_HAS_THREADS # llvm, clang
> +	depends on BR2_INSTALL_LIBSTDCPP # llvm, clang
> +	depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # llvm, clang
> +	depends on !BR2_STATIC_LIBS # llvm, clang
> +	depends on BR2_USE_WCHAR # llvm, clang
>  	help
>  	  This option enables the qdoc host tool.
>  
> 
Reviewed-by: Romain Naour <romain.naour@smile.fr>

Best regards,
Romain
Yann E. MORIN Feb. 28, 2020, 3:28 p.m. UTC | #2
Romain, All,

On 2020-02-28 16:16 +0100, Romain Naour spake thusly:
> Le 28/02/2020 à 15:00, yann.morin@orange.com a écrit :
> > From: "Yann E. MORIN" <yann.morin@orange.com>
> > 
> > Building qdoc requires a llvm and clang for the host.
> > 
> > However, there is a limitation in the llvm and clang packages in
> > Buildroot, which makes it impossible to havea  host variant without
> 
> s/havea/have a/
> 
> > a target variant.
> > 
> > So, propagate the dependencies of the target llvm and clang, to ensure
> > we can only have a host-llvm and -clang packages that are correctly
> host-clang

That was done on purpose, and is called an ellipsis. ;-]

Regards,
Yann E. MORIN.

> > built.
> > 
> > Note that we do propagate all of the dependencies (instead of just the
> > architecture part), to be consistent.
> > 
> > Reported-by: Romain Naour <romain.naour@smile.fr>
> > Signed-off-by: Yann E. MORIN <yann.morin@orange.com>
> > Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> > Cc: Peter Seiderer <ps.report@gmx.net>
> > Cc: Julien Corjon <corjon.j@ecagroup.com>
> > ---
> >  package/qt5/qt5tools/Config.in | 10 ++++++++++
> >  1 file changed, 10 insertions(+)
> > 
> > diff --git a/package/qt5/qt5tools/Config.in b/package/qt5/qt5tools/Config.in
> > index 14178abc29..60106c1ee3 100644
> > --- a/package/qt5/qt5tools/Config.in
> > +++ b/package/qt5/qt5tools/Config.in
> > @@ -19,6 +19,16 @@ config BR2_PACKAGE_QT5TOOLS_LINGUIST_TOOLS
> >  
> >  config BR2_PACKAGE_QT5TOOLS_QDOC_TOOL
> >  	bool "qdoc host tool"
> > +	# Needs llvm-config and libclang for the host, which is not
> > +	# currently supported in Buildroot, unless the target is
> > +	# already supported by llvm.
> > +	depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS # llvm, clang
> > +	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # llvm, clang
> > +	depends on BR2_TOOLCHAIN_HAS_THREADS # llvm, clang
> > +	depends on BR2_INSTALL_LIBSTDCPP # llvm, clang
> > +	depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # llvm, clang
> > +	depends on !BR2_STATIC_LIBS # llvm, clang
> > +	depends on BR2_USE_WCHAR # llvm, clang
> >  	help
> >  	  This option enables the qdoc host tool.
> >  
> > 
> Reviewed-by: Romain Naour <romain.naour@smile.fr>
> 
> Best regards,
> Romain
>
Romain Naour Feb. 28, 2020, 3:30 p.m. UTC | #3
Yann, All,

Le 28/02/2020 à 16:28, yann.morin@orange.com a écrit :
> Romain, All,
> 
> On 2020-02-28 16:16 +0100, Romain Naour spake thusly:
>> Le 28/02/2020 à 15:00, yann.morin@orange.com a écrit :
>>> From: "Yann E. MORIN" <yann.morin@orange.com>
>>>
>>> Building qdoc requires a llvm and clang for the host.
>>>
>>> However, there is a limitation in the llvm and clang packages in
>>> Buildroot, which makes it impossible to havea  host variant without
>>
>> s/havea/have a/
>>
>>> a target variant.
>>>
>>> So, propagate the dependencies of the target llvm and clang, to ensure
>>> we can only have a host-llvm and -clang packages that are correctly
>> host-clang
> 
> That was done on purpose, and is called an ellipsis. ;-]

Well, I was not sure :p
Typo or not typo ?

Best regards,
Romain


> 
> Regards,
> Yann E. MORIN.
> 
>>> built.
>>>
>>> Note that we do propagate all of the dependencies (instead of just the
>>> architecture part), to be consistent.
>>>
>>> Reported-by: Romain Naour <romain.naour@smile.fr>
>>> Signed-off-by: Yann E. MORIN <yann.morin@orange.com>
>>> Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
>>> Cc: Peter Seiderer <ps.report@gmx.net>
>>> Cc: Julien Corjon <corjon.j@ecagroup.com>
>>> ---
>>>  package/qt5/qt5tools/Config.in | 10 ++++++++++
>>>  1 file changed, 10 insertions(+)
>>>
>>> diff --git a/package/qt5/qt5tools/Config.in b/package/qt5/qt5tools/Config.in
>>> index 14178abc29..60106c1ee3 100644
>>> --- a/package/qt5/qt5tools/Config.in
>>> +++ b/package/qt5/qt5tools/Config.in
>>> @@ -19,6 +19,16 @@ config BR2_PACKAGE_QT5TOOLS_LINGUIST_TOOLS
>>>  
>>>  config BR2_PACKAGE_QT5TOOLS_QDOC_TOOL
>>>  	bool "qdoc host tool"
>>> +	# Needs llvm-config and libclang for the host, which is not
>>> +	# currently supported in Buildroot, unless the target is
>>> +	# already supported by llvm.
>>> +	depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS # llvm, clang
>>> +	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # llvm, clang
>>> +	depends on BR2_TOOLCHAIN_HAS_THREADS # llvm, clang
>>> +	depends on BR2_INSTALL_LIBSTDCPP # llvm, clang
>>> +	depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # llvm, clang
>>> +	depends on !BR2_STATIC_LIBS # llvm, clang
>>> +	depends on BR2_USE_WCHAR # llvm, clang
>>>  	help
>>>  	  This option enables the qdoc host tool.
>>>  
>>>
>> Reviewed-by: Romain Naour <romain.naour@smile.fr>
>>
>> Best regards,
>> Romain
>>
>
Yann E. MORIN Feb. 28, 2020, 5:46 p.m. UTC | #4
Romain, All,

On 2020-02-28 16:30 +0100, Romain Naour spake thusly:
> Le 28/02/2020 à 16:28, yann.morin@orange.com a écrit :
> > On 2020-02-28 16:16 +0100, Romain Naour spake thusly:
> >> Le 28/02/2020 à 15:00, yann.morin@orange.com a écrit :
> >>> From: "Yann E. MORIN" <yann.morin@orange.com>
> >>>
> >>> Building qdoc requires a llvm and clang for the host.
> >>>
> >>> However, there is a limitation in the llvm and clang packages in
> >>> Buildroot, which makes it impossible to havea  host variant without
> >>
> >> s/havea/have a/
> >>
> >>> a target variant.
> >>>
> >>> So, propagate the dependencies of the target llvm and clang, to ensure
> >>> we can only have a host-llvm and -clang packages that are correctly
> >> host-clang
> > 
> > That was done on purpose, and is called an ellipsis. ;-]
> 
> Well, I was not sure :p
> Typo or not typo ?

Since Ia m also susecptible to doign the same typoes as mu alter-ego, I
can assure yuo that on ewas not a tyop. ;-]

Regards,
Yann E. MORIN.

> Best regards,
> Romain
> 
> 
> > 
> > Regards,
> > Yann E. MORIN.
> > 
> >>> built.
> >>>
> >>> Note that we do propagate all of the dependencies (instead of just the
> >>> architecture part), to be consistent.
> >>>
> >>> Reported-by: Romain Naour <romain.naour@smile.fr>
> >>> Signed-off-by: Yann E. MORIN <yann.morin@orange.com>
> >>> Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> >>> Cc: Peter Seiderer <ps.report@gmx.net>
> >>> Cc: Julien Corjon <corjon.j@ecagroup.com>
> >>> ---
> >>>  package/qt5/qt5tools/Config.in | 10 ++++++++++
> >>>  1 file changed, 10 insertions(+)
> >>>
> >>> diff --git a/package/qt5/qt5tools/Config.in b/package/qt5/qt5tools/Config.in
> >>> index 14178abc29..60106c1ee3 100644
> >>> --- a/package/qt5/qt5tools/Config.in
> >>> +++ b/package/qt5/qt5tools/Config.in
> >>> @@ -19,6 +19,16 @@ config BR2_PACKAGE_QT5TOOLS_LINGUIST_TOOLS
> >>>  
> >>>  config BR2_PACKAGE_QT5TOOLS_QDOC_TOOL
> >>>  	bool "qdoc host tool"
> >>> +	# Needs llvm-config and libclang for the host, which is not
> >>> +	# currently supported in Buildroot, unless the target is
> >>> +	# already supported by llvm.
> >>> +	depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS # llvm, clang
> >>> +	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # llvm, clang
> >>> +	depends on BR2_TOOLCHAIN_HAS_THREADS # llvm, clang
> >>> +	depends on BR2_INSTALL_LIBSTDCPP # llvm, clang
> >>> +	depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # llvm, clang
> >>> +	depends on !BR2_STATIC_LIBS # llvm, clang
> >>> +	depends on BR2_USE_WCHAR # llvm, clang
> >>>  	help
> >>>  	  This option enables the qdoc host tool.
> >>>  
> >>>
> >> Reviewed-by: Romain Naour <romain.naour@smile.fr>
> >>
> >> Best regards,
> >> Romain
> >>
> > 
> 
> _______________________________________________
> buildroot mailing list
> buildroot@busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
Peter Korsgaard March 2, 2020, 10:14 p.m. UTC | #5
>>>>>   <yann.morin@orange.com> writes:

 > From: "Yann E. MORIN" <yann.morin@orange.com>
 > Building qdoc requires a llvm and clang for the host.

 > However, there is a limitation in the llvm and clang packages in
 > Buildroot, which makes it impossible to havea  host variant without
 > a target variant.

 > So, propagate the dependencies of the target llvm and clang, to ensure
 > we can only have a host-llvm and -clang packages that are correctly
 > built.

 > Note that we do propagate all of the dependencies (instead of just the
 > architecture part), to be consistent.

 > Reported-by: Romain Naour <romain.naour@smile.fr>
 > Signed-off-by: Yann E. MORIN <yann.morin@orange.com>
 > Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
 > Cc: Peter Seiderer <ps.report@gmx.net>
 > Cc: Julien Corjon <corjon.j@ecagroup.com>

Committed, thanks.
Peter Korsgaard March 15, 2020, 8:42 a.m. UTC | #6
>>>>>   <yann.morin@orange.com> writes:

 > From: "Yann E. MORIN" <yann.morin@orange.com>
 > Building qdoc requires a llvm and clang for the host.

 > However, there is a limitation in the llvm and clang packages in
 > Buildroot, which makes it impossible to havea  host variant without
 > a target variant.

 > So, propagate the dependencies of the target llvm and clang, to ensure
 > we can only have a host-llvm and -clang packages that are correctly
 > built.

 > Note that we do propagate all of the dependencies (instead of just the
 > architecture part), to be consistent.

 > Reported-by: Romain Naour <romain.naour@smile.fr>
 > Signed-off-by: Yann E. MORIN <yann.morin@orange.com>
 > Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
 > Cc: Peter Seiderer <ps.report@gmx.net>
 > Cc: Julien Corjon <corjon.j@ecagroup.com>

Committed to 2019.11.x (not in 2019.02.x), thanks.
diff mbox series

Patch

diff --git a/package/qt5/qt5tools/Config.in b/package/qt5/qt5tools/Config.in
index 14178abc29..60106c1ee3 100644
--- a/package/qt5/qt5tools/Config.in
+++ b/package/qt5/qt5tools/Config.in
@@ -19,6 +19,16 @@  config BR2_PACKAGE_QT5TOOLS_LINGUIST_TOOLS
 
 config BR2_PACKAGE_QT5TOOLS_QDOC_TOOL
 	bool "qdoc host tool"
+	# Needs llvm-config and libclang for the host, which is not
+	# currently supported in Buildroot, unless the target is
+	# already supported by llvm.
+	depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS # llvm, clang
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # llvm, clang
+	depends on BR2_TOOLCHAIN_HAS_THREADS # llvm, clang
+	depends on BR2_INSTALL_LIBSTDCPP # llvm, clang
+	depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # llvm, clang
+	depends on !BR2_STATIC_LIBS # llvm, clang
+	depends on BR2_USE_WCHAR # llvm, clang
 	help
 	  This option enables the qdoc host tool.