[Buildroot] [PATCH 0/4] Add odb host variant and fix gcc-11 build

[Buildroot] [PATCH 0/4] Add odb host variant and fix gcc-11 build

[Kamel Bouhara via buildroot]

Hello,

Here is a short patch series that fix odb build issue with gcc-11
and add a host variant of the libodb package required by the host-odb
compiler. The host-libodb-boost variant is only required when boost
package is enabled.

Kamel Bouhara (1):
  package/libodb-boost: add host variant

Thomas Petazzoni (3):
  package/odb: backport more upstream commits to fix build with gcc 11.x
  package/odb: add dependency on host-libodb
  package/libodb: add host variant

 package/libodb-boost/libodb-boost.mk          |  5 +-
 package/libodb/libodb.mk                      |  2 +
 .../0012-Adjust-to-changes-in-GCC-11.patch    | 50 ++++++++++++++
 ...kup-ambiguity-causing-error-with-GCC.patch | 68 +++++++++++++++++++
 package/odb/odb.mk                            |  8 ++-
 5 files changed, 131 insertions(+), 2 deletions(-)
 create mode 100644 package/odb/0012-Adjust-to-changes-in-GCC-11.patch
 create mode 100644 package/odb/0013-Resolve-name-lookup-ambiguity-causing-error-with-GCC.patch

--
2.25.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 1/4] package/odb: backport more upstream commits to fix build with gcc 11.x

[Kamel Bouhara via buildroot]

From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

Commit ac9855e761443dee4f9d461b83e12443d37e8678 ("package/odb: fix
build with gcc 11") already fixed some gcc 11.x issues, but not all of
them. This commit backports two upstream patches fixing the remaining
issues, ensuring host-odb can be built on a gcc 11.x machine.

Fixes:

  http://autobuild.buildroot.net/results/d37c4271e66d923f7af6a4e3dbad603fcd1c8119/

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
Note: the above autobuilder issue has stopped appearing after
September 29, 2021, which initially sounded odd. However, on October
3, we started rejecting build results from Xogium's autobuilder (for
other reasons), and all those issues were coming from Xogium's
autobuilder. And this is pretty logical: Xogium's autobuilder was
known to be running a very recent Arch Linux, and therefore was the
only autobuild machine running gcc 11.x as the host compiler.
---
 .../0012-Adjust-to-changes-in-GCC-11.patch    | 50 ++++++++++++++
 ...kup-ambiguity-causing-error-with-GCC.patch | 68 +++++++++++++++++++
 2 files changed, 118 insertions(+)
 create mode 100644 package/odb/0012-Adjust-to-changes-in-GCC-11.patch
 create mode 100644 package/odb/0013-Resolve-name-lookup-ambiguity-causing-error-with-GCC.patch

diff --git a/package/odb/0012-Adjust-to-changes-in-GCC-11.patch b/package/odb/0012-Adjust-to-changes-in-GCC-11.patch
new file mode 100644
index 0000000000..2959a71dea
--- /dev/null
+++ b/package/odb/0012-Adjust-to-changes-in-GCC-11.patch
@@ -0,0 +1,50 @@
+From 5a5656920c6b49902ae0da6a0da84efe6e5a66f0 Mon Sep 17 00:00:00 2001
+From: Boris Kolpackov <boris@codesynthesis.com>
+Date: Wed, 31 Mar 2021 10:45:21 +0200
+Subject: [PATCH] Adjust to changes in GCC 11
+
+[Upstream: 61d80f051293a7449a09081f60f48b8377bfbbad]
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
+---
+ odb/gcc.hxx | 20 ++++++++++++++++++++
+ 1 file changed, 20 insertions(+)
+
+diff --git a/odb/gcc.hxx b/odb/gcc.hxx
+index fb6a1bf..d8ad590 100644
+--- a/odb/gcc.hxx
++++ b/odb/gcc.hxx
+@@ -164,6 +164,7 @@ gcc_tree_code_name (gcc_tree_code_type tc) {return tree_code_name[tc];}
+ // In GCC 9:
+ //
+ // INCLUDED_FROM     Became linemap_included_from_linemap().
++//
+ // LAST_SOURCE_LINE  Was removed apparently as no longer used. Studying
+ //                   the line-map.h diff from 8.3 suggests that the old
+ //                   implementation should still work.
+@@ -193,4 +194,23 @@ LAST_SOURCE_LINE (const line_map_ordinary* map)
+ 
+ #endif
+ 
++// In GCC 11:
++//
++// lookup_qualified_name() has a new interface.
++//
++// DECL_IS_BUILTIN became DECL_IS_UNDECLARED_BUILTIN.
++//
++#if BUILDING_GCC_MAJOR >= 11
++
++inline tree
++lookup_qualified_name (tree scope, tree name, bool type, bool complain)
++{
++  return lookup_qualified_name (
++    scope, name, (type ? LOOK_want::TYPE : LOOK_want::NORMAL), complain);
++}
++
++#define DECL_IS_BUILTIN(decl) DECL_IS_UNDECLARED_BUILTIN(decl)
++
++#endif
++
+ #endif // ODB_GCC_HXX
+-- 
+2.34.1
+
diff --git a/package/odb/0013-Resolve-name-lookup-ambiguity-causing-error-with-GCC.patch b/package/odb/0013-Resolve-name-lookup-ambiguity-causing-error-with-GCC.patch
new file mode 100644
index 0000000000..79c3d982fa
--- /dev/null
+++ b/package/odb/0013-Resolve-name-lookup-ambiguity-causing-error-with-GCC.patch
@@ -0,0 +1,68 @@
+From 60460df2a6d7b43a860a8f8b614c049ec0127ea8 Mon Sep 17 00:00:00 2001
+From: Boris Kolpackov <boris@codesynthesis.com>
+Date: Wed, 7 Jul 2021 09:26:57 +0200
+Subject: [PATCH] Resolve name lookup ambiguity causing error with GCC 11
+
+[Upstream: 47035c0f72efd99a2210cd45db6e42423fb74533]
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
+---
+ odb/relational/header.hxx | 2 ++
+ odb/relational/source.hxx | 8 ++++++++
+ 2 files changed, 10 insertions(+)
+
+diff --git a/odb/relational/header.hxx b/odb/relational/header.hxx
+index 63dea09..d7f78fa 100644
+--- a/odb/relational/header.hxx
++++ b/odb/relational/header.hxx
+@@ -50,6 +50,8 @@ namespace relational
+ 
+       typedef typename member_base_impl<T>::member_info member_info;
+ 
++      using member_base_impl<T>::container;
++
+       virtual bool
+       pre (member_info& mi)
+       {
+diff --git a/odb/relational/source.hxx b/odb/relational/source.hxx
+index 716aa10..7da25fc 100644
+--- a/odb/relational/source.hxx
++++ b/odb/relational/source.hxx
+@@ -1360,6 +1360,8 @@ namespace relational
+ 
+       typedef typename member_base_impl<T>::member_info member_info;
+ 
++      using member_base_impl<T>::container;
++
+       virtual bool
+       pre (member_info& mi)
+       {
+@@ -1744,6 +1746,8 @@ namespace relational
+ 
+       typedef typename member_base_impl<T>::member_info member_info;
+ 
++      using member_base_impl<T>::container;
++
+       virtual bool
+       pre (member_info& mi)
+       {
+@@ -2007,6 +2011,8 @@ namespace relational
+ 
+       typedef typename member_base_impl<T>::member_info member_info;
+ 
++      using member_base_impl<T>::container;
++
+       virtual void
+       set_null (member_info&) = 0;
+ 
+@@ -2458,6 +2464,8 @@ namespace relational
+ 
+       typedef typename member_base_impl<T>::member_info member_info;
+ 
++      using member_base_impl<T>::container;
++
+       virtual void
+       get_null (string const& var) const = 0;
+ 
+-- 
+2.34.1
+
-- 
2.25.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 2/4] package/odb: add dependency on host-libodb

[Kamel Bouhara via buildroot]

From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

host-odb installs the ODB compiler, which when executed at runtime,
needs access to the libodb headers. In order to have them installed,
add a dependency on host-libodb.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
[Kamel: Add optional host-libodb-boost dependency]
---
 package/odb/odb.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/package/odb/odb.mk b/package/odb/odb.mk
index 85c7ccb8bb..e7ba1fd48b 100644
--- a/package/odb/odb.mk
+++ b/package/odb/odb.mk
@@ -10,7 +10,13 @@ ODB_SOURCE = odb-$(ODB_VERSION).tar.bz2
 ODB_SITE = https://www.codesynthesis.com/download/odb/$(ODB_VERSION_MAJOR)
 ODB_LICENSE = GPL-3.0
 ODB_LICENSE_FILES = LICENSE
-HOST_ODB_DEPENDENCIES = host-libcutl
+# host-libodb is not needed to build host-odb, but it is needed to use
+# the ODB compiler, as it install header files that are needed at
+# runtime by the odb compiler.
+HOST_ODB_DEPENDENCIES = host-libcutl host-libodb
+ifeq ($(BR2_PACKAGE_BOOST),y)
+HOST_ODB_DEPENDENCIES += host-boost host-libodb-boost
+endif
 HOST_ODB_CONF_ENV = CXXFLAGS="$(HOST_CXXFLAGS) -std=c++11"
 
 # Prevent odb from trying to install the gcc plugin into the hosts
-- 
2.25.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 2/4] package/odb: add dependency on host-libodb

[Thomas Petazzoni via buildroot]

Hello Kamel,

On Fri, 25 Feb 2022 12:33:58 +0100
Kamel Bouhara via buildroot <buildroot@buildroot.org> wrote:

> +# host-libodb is not needed to build host-odb, but it is needed to use
> +# the ODB compiler, as it install header files that are needed at
> +# runtime by the odb compiler.
> +HOST_ODB_DEPENDENCIES = host-libcutl host-libodb

You're in PATCH 2/4, and you're using host-libodb, which is only added
in PATCH 3/4. There is a patch ordering issue in your series.

> +ifeq ($(BR2_PACKAGE_BOOST),y)
> +HOST_ODB_DEPENDENCIES += host-boost host-libodb-boost

You're in PATCH 2/4, and you're using host-libodb-boost, which is only
added in PATCH 4/4, so there's another ordering issue in your series.

Also, the host-boost dependency here seems useless to me, as it's
implied by the host-libodb-boost dependency.

Also, why do you use ifeq ($(BR2_PACKAGE_BOOST),y) ? I think it would
be much more logical to use ifeq ($(BR2_PACKAGE_LIBODB_BOOST),y), no ?

Best regards,

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 3/4] package/libodb: add host variant

[Kamel Bouhara via buildroot]

From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
 package/libodb/libodb.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/libodb/libodb.mk b/package/libodb/libodb.mk
index 11ca9de866..b25e8ac501 100644
--- a/package/libodb/libodb.mk
+++ b/package/libodb/libodb.mk
@@ -12,5 +12,7 @@ LIBODB_INSTALL_STAGING = YES
 LIBODB_LICENSE = GPL-2.0
 LIBODB_LICENSE_FILES = LICENSE
 LIBODB_CONF_ENV = CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11"
+HOST_LIBODB_CONF_ENV = CXXFLAGS="$(HOST_CXXFLAGS) -std=c++11"
 
 $(eval $(autotools-package))
+$(eval $(host-autotools-package))
-- 
2.25.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 3/4] package/libodb: add host variant

[Thomas Petazzoni via buildroot]

On Fri, 25 Feb 2022 12:33:59 +0100
Kamel Bouhara via buildroot <buildroot@buildroot.org> wrote:

> From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
> 
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

I know this commit is originally from me in a local tree, but it needs
a commit description.

And your Signed-off-by.

Best regards,

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 4/4] package/libodb-boost: add host variant

[Kamel Bouhara via buildroot]

Add host variant of libodb-boost required by host-odb package.

Signed-off-by: Kamel Bouhara <kamel.bouhara@bootlin.com>
---
 package/libodb-boost/libodb-boost.mk | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/package/libodb-boost/libodb-boost.mk b/package/libodb-boost/libodb-boost.mk
index bac5f1e78f..7f2ad1fe72 100644
--- a/package/libodb-boost/libodb-boost.mk
+++ b/package/libodb-boost/libodb-boost.mk
@@ -11,7 +11,10 @@ LIBODB_BOOST_SITE = https://www.codesynthesis.com/download/odb/$(LIBODB_BOOST_VE
 LIBODB_BOOST_INSTALL_STAGING = YES
 LIBODB_BOOST_LICENSE = GPL-2.0
 LIBODB_BOOST_LICENSE_FILES = LICENSE
-LIBODB_BOOST_DEPENDENCIES = boost libodb
+LIBODB_BOOST_DEPENDENCIES = boost libodb \
+			    host-boost \
+			    host-libodb
 LIBODB_BOOST_CONF_ENV = CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11"
 
 $(eval $(autotools-package))
+$(eval $(host-autotools-package))
-- 
2.25.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 4/4] package/libodb-boost: add host variant

[Thomas Petazzoni via buildroot]

On Fri, 25 Feb 2022 12:34:00 +0100
Kamel Bouhara via buildroot <buildroot@buildroot.org> wrote:

> Add host variant of libodb-boost required by host-odb package.

This is a bit short, and I think just like PATCH 3/4, it needs a more
extensive explanation that the ODB compiler needs the libodb-boost
headers at compile time, and therefore installed in $(HOST_DIR).

> diff --git a/package/libodb-boost/libodb-boost.mk b/package/libodb-boost/libodb-boost.mk
> index bac5f1e78f..7f2ad1fe72 100644
> --- a/package/libodb-boost/libodb-boost.mk
> +++ b/package/libodb-boost/libodb-boost.mk
> @@ -11,7 +11,10 @@ LIBODB_BOOST_SITE = https://www.codesynthesis.com/download/odb/$(LIBODB_BOOST_VE
>  LIBODB_BOOST_INSTALL_STAGING = YES
>  LIBODB_BOOST_LICENSE = GPL-2.0
>  LIBODB_BOOST_LICENSE_FILES = LICENSE
> -LIBODB_BOOST_DEPENDENCIES = boost libodb
> +LIBODB_BOOST_DEPENDENCIES = boost libodb \
> +			    host-boost \
> +			    host-libodb

This seems wrong. Why is libodb-boost depending on host-libodb-boost.
At least, this makes the dependencies added in your PATCH 2/4 a bit
irrelevant.

I guess what you need to do instead is:

HOST_LIBODB_BOOST_DEPENDENCIES = hoost-boost host-libodb

And rely on the logic in odb.mk to pull in host-libodb-boost when
BR2_PACKAGE_LIBODB_BOOST=y.

Could you fix your patch series, and send a new iteration?

Thanks!

Thomas
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 4/4] package/libodb-boost: add host variant

[Kamel Bouhara via buildroot]

On Sat, Feb 26, 2022 at 11:35:38AM +0100, Thomas Petazzoni wrote:
> On Fri, 25 Feb 2022 12:34:00 +0100
> Kamel Bouhara via buildroot <buildroot@buildroot.org> wrote:
>
> > Add host variant of libodb-boost required by host-odb package.
>
> This is a bit short, and I think just like PATCH 3/4, it needs a more
> extensive explanation that the ODB compiler needs the libodb-boost
> headers at compile time, and therefore installed in $(HOST_DIR).
>

Ack.

> > diff --git a/package/libodb-boost/libodb-boost.mk b/package/libodb-boost/libodb-boost.mk
> > index bac5f1e78f..7f2ad1fe72 100644
> > --- a/package/libodb-boost/libodb-boost.mk
> > +++ b/package/libodb-boost/libodb-boost.mk
> > @@ -11,7 +11,10 @@ LIBODB_BOOST_SITE = https://www.codesynthesis.com/download/odb/$(LIBODB_BOOST_VE
> >  LIBODB_BOOST_INSTALL_STAGING = YES
> >  LIBODB_BOOST_LICENSE = GPL-2.0
> >  LIBODB_BOOST_LICENSE_FILES = LICENSE
> > -LIBODB_BOOST_DEPENDENCIES = boost libodb
> > +LIBODB_BOOST_DEPENDENCIES = boost libodb \
> > +			    host-boost \
> > +			    host-libodb
>
> This seems wrong. Why is libodb-boost depending on host-libodb-boost.
> At least, this makes the dependencies added in your PATCH 2/4 a bit
> irrelevant.
>

Actually, that is the host variant that is depending on it. Your
following comments are completely right.

Thanks !

> I guess what you need to do instead is:
>
> HOST_LIBODB_BOOST_DEPENDENCIES = hoost-boost host-libodb
>
> And rely on the logic in odb.mk to pull in host-libodb-boost when
> BR2_PACKAGE_LIBODB_BOOST=y.
>

> Could you fix your patch series, and send a new iteration?
>
> Thanks!
>
> Thomas
> --
> Thomas Petazzoni, co-owner and CEO, Bootlin
> Embedded Linux and Kernel engineering and training
> https://bootlin.com

--
Kamel Bouhara, Bootlin
Embedded Linux and kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot