| Message ID | 1670579823-1721-1-git-send-email-gwenj@trabucayre.com |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | package/gnuradio: restrict gcc to >= 9.3.0 | expand |
On Fri, 9 Dec 2022 10:57:03 +0100 Gwenhael Goavec-Merou <gwenj@trabucayre.com> wrote: > From: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com> > > Since commit 5a15095f65c655356989c91e52da1746cd96f41b gnuradio requires > gcc >= 9.3.0 > > This patch add this dependency and removes BR2_TOOLCHAIN_HAS_GCC_BUG_64735 > dependency because it is only required for gcc < 7. > > Also gcc restriction is required because volk needs a toolchain with a gcc > 7. > > fix: > - http://autobuild.buildroot.net/results/6a82605c58f9ef9eb6c14603777dd8523dd00aa5/ > - http://autobuild.buildroot.net/results/c7c4ae76954e388ab639b39fd521d90acfe4edc9/ > > Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com> > --- > package/gnuradio/Config.in | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/package/gnuradio/Config.in b/package/gnuradio/Config.in > index de19732cfb..2028cfb483 100644 > --- a/package/gnuradio/Config.in > +++ b/package/gnuradio/Config.in > @@ -4,10 +4,13 @@ comment "gnuradio needs a toolchain w/ C++, NPTL, wchar, dynamic library" > depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ > !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS > > -comment "gnuradio needs a toolchain not affected by GCC bug 43744 and 64735" > +comment "gnuradio needs a toolchain not affected by GCC bug 43744" > depends on BR2_TOOLCHAIN_HAS_GCC_BUG_43744 > depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 You're not really removing it here :-) > +comment "gnuradio needs a gcc >= 9.3.0" > + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_9 This should be in the main Config.in comment: comment "gnuradio needs a toolchain w/ C++, NPTL, wchar, dynamic library, gcc >= 9" Thomas
On Fri, 9 Dec 2022 15:50:05 +0100 Thomas Petazzoni <thomas.petazzoni@bootlin.com> wrote: > On Fri, 9 Dec 2022 10:57:03 +0100 > Gwenhael Goavec-Merou <gwenj@trabucayre.com> wrote: > > > From: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com> > > > > Since commit 5a15095f65c655356989c91e52da1746cd96f41b gnuradio requires > > gcc >= 9.3.0 > > > > This patch add this dependency and removes BR2_TOOLCHAIN_HAS_GCC_BUG_64735 > > dependency because it is only required for gcc < 7. > > > > Also gcc restriction is required because volk needs a toolchain with a gcc > 7. > > > > fix: > > - http://autobuild.buildroot.net/results/6a82605c58f9ef9eb6c14603777dd8523dd00aa5/ > > - http://autobuild.buildroot.net/results/c7c4ae76954e388ab639b39fd521d90acfe4edc9/ > > > > Signed-off-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com> > > --- > > package/gnuradio/Config.in | 7 +++++-- > > 1 file changed, 5 insertions(+), 2 deletions(-) > > > > diff --git a/package/gnuradio/Config.in b/package/gnuradio/Config.in > > index de19732cfb..2028cfb483 100644 > > --- a/package/gnuradio/Config.in > > +++ b/package/gnuradio/Config.in > > @@ -4,10 +4,13 @@ comment "gnuradio needs a toolchain w/ C++, NPTL, wchar, dynamic library" > > depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ > > !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS > > > > -comment "gnuradio needs a toolchain not affected by GCC bug 43744 and 64735" > > +comment "gnuradio needs a toolchain not affected by GCC bug 43744" > > depends on BR2_TOOLCHAIN_HAS_GCC_BUG_43744 > > depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 > > You're not really removing it here :-) Not enought cofee :-/ > > > +comment "gnuradio needs a gcc >= 9.3.0" > > + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_9 > > This should be in the main Config.in comment: > > comment "gnuradio needs a toolchain w/ C++, NPTL, wchar, dynamic library, gcc >= 9" > > Thomas Thanks Gwenhael > -- > Thomas Petazzoni, co-owner and CEO, Bootlin > Embedded Linux and Kernel engineering and training > https://bootlin.com
diff --git a/package/gnuradio/Config.in b/package/gnuradio/Config.in index de19732cfb..2028cfb483 100644 --- a/package/gnuradio/Config.in +++ b/package/gnuradio/Config.in @@ -4,10 +4,13 @@ comment "gnuradio needs a toolchain w/ C++, NPTL, wchar, dynamic library" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS -comment "gnuradio needs a toolchain not affected by GCC bug 43744 and 64735" +comment "gnuradio needs a toolchain not affected by GCC bug 43744" depends on BR2_TOOLCHAIN_HAS_GCC_BUG_43744 depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735 +comment "gnuradio needs a gcc >= 9.3.0" + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_9 + config BR2_PACKAGE_GNURADIO bool "gnuradio" depends on BR2_INSTALL_LIBSTDCPP @@ -16,8 +19,8 @@ config BR2_PACKAGE_GNURADIO depends on BR2_USE_MMU # use fork() depends on BR2_USE_WCHAR # boost depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS # boost-atomic, boost-thread + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_9 depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_43744 - depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # boost-thread select BR2_PACKAGE_BOOST select BR2_PACKAGE_BOOST_ATOMIC select BR2_PACKAGE_BOOST_DATE_TIME