diff mbox series

[1/1] package/assimp: needs wchar

Message ID 20190804115503.3316-1-fontaine.fabrice@gmail.com
State Accepted
Commit cf65070365ab55664f12ffe85cae548d6b0f63da
Headers show
Series [1/1] package/assimp: needs wchar | expand

Commit Message

Fabrice Fontaine Aug. 4, 2019, 11:55 a.m. UTC
Fixes:
 - http://autobuild.buildroot.org/results/d989f895efe05dd5d1e2594d2dc38e9fc476e0d3

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/assimp/Config.in | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Comments

Peter Korsgaard Aug. 4, 2019, 12:24 p.m. UTC | #1
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > Fixes:
 >  - http://autobuild.buildroot.org/results/d989f895efe05dd5d1e2594d2dc38e9fc476e0d3

 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Committed, thanks.
Thomas Petazzoni Aug. 4, 2019, 1:46 p.m. UTC | #2
On Sun,  4 Aug 2019 13:55:03 +0200
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:

> Fixes:
>  - http://autobuild.buildroot.org/results/d989f895efe05dd5d1e2594d2dc38e9fc476e0d3
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
>  package/assimp/Config.in | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)

The build failures come from the rapidjson headers, so I'm wondering if
the BR2_USE_WCHAR dependency shouldn't be in rapidjson.

Could you check that ?

Thomas
Fabrice Fontaine Aug. 4, 2019, 2:05 p.m. UTC | #3
Hello,

Le dim. 4 août 2019 à 15:46, Thomas Petazzoni
<thomas.petazzoni@bootlin.com> a écrit :
>
> On Sun,  4 Aug 2019 13:55:03 +0200
> Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:
>
> > Fixes:
> >  - http://autobuild.buildroot.org/results/d989f895efe05dd5d1e2594d2dc38e9fc476e0d3
> >
> > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> > ---
> >  package/assimp/Config.in | 5 +++--
> >  1 file changed, 3 insertions(+), 2 deletions(-)
>
> The build failures come from the rapidjson headers, so I'm wondering if
> the BR2_USE_WCHAR dependency shouldn't be in rapidjson.
Our old version of rapidjson (1.1.0 was released 3 years ago) does not
depend on wchar. This dependency was added in rapidjson by
https://github.com/Tencent/rapidjson/commit/6e2e5c7dbe08474249ca18b50da120b2c45ccc36.
This dependency on wchar was added in assimp when they bump their
internal rapidjson's version two years ago by
https://github.com/assimp/assimp/commit/65547d57606d9c9345b00d38271f3e499cee4001.
>
> Could you check that ?
>
> Thomas
> --
> Thomas Petazzoni, CTO, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com
Best Regards,

Fabrice
Thomas Petazzoni Aug. 4, 2019, 3:23 p.m. UTC | #4
On Sun, 4 Aug 2019 16:05:57 +0200
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:

> > The build failures come from the rapidjson headers, so I'm wondering if
> > the BR2_USE_WCHAR dependency shouldn't be in rapidjson.  
> Our old version of rapidjson (1.1.0 was released 3 years ago) does not
> depend on wchar. This dependency was added in rapidjson by
> https://github.com/Tencent/rapidjson/commit/6e2e5c7dbe08474249ca18b50da120b2c45ccc36.
> This dependency on wchar was added in assimp when they bump their
> internal rapidjson's version two years ago by
> https://github.com/assimp/assimp/commit/65547d57606d9c9345b00d38271f3e499cee4001.

Ah, ok, we use an internal version of rapidjson. Makes sense then.
Thanks for the clarification!

Thomas
diff mbox series

Patch

diff --git a/package/assimp/Config.in b/package/assimp/Config.in
index 630758f3e7..42bfee945d 100644
--- a/package/assimp/Config.in
+++ b/package/assimp/Config.in
@@ -1,6 +1,7 @@ 
 config BR2_PACKAGE_ASSIMP
 	bool "assimp"
 	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_USE_WCHAR
 	select BR2_PACKAGE_ZLIB
 	help
 	  Open Asset Import Library (assimp) is a portable Open Source
@@ -11,5 +12,5 @@  config BR2_PACKAGE_ASSIMP
 
 	  http://www.assimp.org
 
-comment "assimp needs a toolchain w/ C++"
-	depends on !BR2_INSTALL_LIBSTDCPP
+comment "assimp needs a toolchain w/ C++, wchar"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR