| Message ID | 20180406090013.20187-2-thomas.petazzoni@bootlin.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/2] llvm: add dependency on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 | expand |
Hello Thomas, On 06/04/2018 11:00, Thomas Petazzoni wrote: > We cannot simply select BR2_PACKAGE_LLVM, we need to take into account > all its dependencies. BR2_PACKAGE_LLVM_ARCH_SUPPORTS was already taken > into account, but not the other dependencies. > > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> I was preparing that, I did the same for Clang too. I think I'll send a new version next week. Acked-by: Valentin Korenblit <valentin.korenblit@smile.fr> > --- > package/mesa3d/Config.in | 14 ++++++++++++++ > 1 file changed, 14 insertions(+) > > diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in > index ffe0287ac5..8f347ffe0c 100644 > --- a/package/mesa3d/Config.in > +++ b/package/mesa3d/Config.in > @@ -28,8 +28,22 @@ if BR2_PACKAGE_MESA3D > config BR2_PACKAGE_MESA3D_LLVM > bool "llvm support" > depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS > + depends on BR2_HOST_GCC_AT_LEAST_4_8 > + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 > + depends on BR2_TOOLCHAIN_HAS_THREADS > + depends on BR2_INSTALL_LIBSTDCPP > + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::shared_future > select BR2_PACKAGE_LLVM > > +comment "llvm support needs a toolchain w/ threads, C++, gcc >= 4.8, host gcc >= 4.8" > + depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS > + depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || \ > + !BR2_HOST_GCC_AT_LEAST_4_8 || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 > + > +comment "llvm support needs a toolchain not affected by GCC bug 64735" > + depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS > + depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 > + > # inform the .mk file of gallium, dri or vulkan driver selection > config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER > bool <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> </head> <body text="#000000" bgcolor="#FFFFFF"> <p><br> </p> <pre wrap="">Hello Thomas,</pre> <div class="moz-cite-prefix">On 06/04/2018 11:00, Thomas Petazzoni wrote:<br> </div> <blockquote type="cite" cite="mid:20180406090013.20187-2-thomas.petazzoni@bootlin.com"> <pre wrap="">We cannot simply select BR2_PACKAGE_LLVM, we need to take into account all its dependencies. BR2_PACKAGE_LLVM_ARCH_SUPPORTS was already taken into account, but not the other dependencies. Signed-off-by: Thomas Petazzoni <a class="moz-txt-link-rfc2396E" href="mailto:thomas.petazzoni@bootlin.com"><thomas.petazzoni@bootlin.com></a></pre> </blockquote> <pre wrap="">I was preparing that, I did the same for Clang too. I think I'll send a new version next week. <span class="term">Acked-by: Valentin Korenblit <a class="moz-txt-link-rfc2396E" href="mailto:valentin.korenblit@smile.fr"><valentin.korenblit@smile.fr></a> </span></pre> <blockquote type="cite" cite="mid:20180406090013.20187-2-thomas.petazzoni@bootlin.com"> <pre wrap=""> --- package/mesa3d/Config.in | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index ffe0287ac5..8f347ffe0c 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -28,8 +28,22 @@ if BR2_PACKAGE_MESA3D config BR2_PACKAGE_MESA3D_LLVM bool "llvm support" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS + depends on BR2_HOST_GCC_AT_LEAST_4_8 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_INSTALL_LIBSTDCPP + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::shared_future select BR2_PACKAGE_LLVM +comment "llvm support needs a toolchain w/ threads, C++, gcc >= 4.8, host gcc >= 4.8" + depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || \ + !BR2_HOST_GCC_AT_LEAST_4_8 || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + +comment "llvm support needs a toolchain not affected by GCC bug 64735" + depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 + # inform the .mk file of gallium, dri or vulkan driver selection config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER bool </pre> </blockquote> <br> </body> </html>
diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index ffe0287ac5..8f347ffe0c 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -28,8 +28,22 @@ if BR2_PACKAGE_MESA3D config BR2_PACKAGE_MESA3D_LLVM bool "llvm support" depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS + depends on BR2_HOST_GCC_AT_LEAST_4_8 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_INSTALL_LIBSTDCPP + depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::shared_future select BR2_PACKAGE_LLVM +comment "llvm support needs a toolchain w/ threads, C++, gcc >= 4.8, host gcc >= 4.8" + depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS + depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || \ + !BR2_HOST_GCC_AT_LEAST_4_8 || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + +comment "llvm support needs a toolchain not affected by GCC bug 64735" + depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS + depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 + # inform the .mk file of gallium, dri or vulkan driver selection config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER bool
We cannot simply select BR2_PACKAGE_LLVM, we need to take into account all its dependencies. BR2_PACKAGE_LLVM_ARCH_SUPPORTS was already taken into account, but not the other dependencies. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> --- package/mesa3d/Config.in | 14 ++++++++++++++ 1 file changed, 14 insertions(+)