Skip to contentSkip to conversation

ODB: C++ Object-Relational Mapping (ORM): New packages.

PATCH New Kamel Bouhara 2 participants 12 messages May 14, 2020 – May 19, 2020

lore
Share & tools
lore
#0 lore raw

cover ODB: C++ Object-Relational Mapping (ORM): New packages.

ODB is an open-source, cross-platform, and cross-database object-relational mapping (ORM) system for C++. It allows you to persist C++ objects to a relational database without having to deal with tables, columns, or SQL and without manually writing any mapping code. ODB supports MySQL, SQLite, PostgreSQL, Oracle, and Microsoft SQL Server relational databases as well as C++98/03 and C++11 language standards.

It also comes with optional profiles for Boost and Qt which allow you to seamlessly use value types, containers, and smart pointers from these libraries in your persistent C++ classes.

There are three main components to use ODB (and a single dependency):

- libcutl: This library is ODB's only dependency.

- odb: This is a compiler that takes a specially crafted c++ header file and auto-generates a schema that works with libodb and the subsequent libodb-database library.

It would be used as such: odb -d <database> --generate-query --generate-schema file.hxx

- libodb: This package contains the common ODB runtime library. Every application that includes code generated by the ODB compiler will need to link to this library.

- libodb-pgsql: This package contains the PostgreSQL ODB runtime library.

- libodb-mysql: This package contains the MySQL ODB runtime library.

- libodb-boost: This package contains the Boost ODB runtime library.

Every application that includes code generated for the PostgreSQL, MySQL or Boost, will need to link to those libraries.

Adam Duskett (4):
package/libcutl: new package
package/odb: new package
package/libodb: new package
package/libodb-pgsql: new package

Kamel Bouhara (2):
package/libodb-mysql: new package
package/libodb-boost: new package

 Config.in                                     |   4 +
 DEVELOPERS                                    |   8 +
 package/Config.in                             |   4 +
 package/Config.in.host                        |   1 +
 package/libcutl/libcutl.hash                  |   6 +
 package/libcutl/libcutl.mk                    |  15 +
 package/libodb-boost/Config.in                |  15 +
 package/libodb-boost/libodb.hash              |   6 +
 package/libodb-boost/libodb.mk                |  15 +
 ...-syntax-issue-while-checking-ldflags.patch |  35 ++
 package/libodb-mysql/Config.in                |  15 +
 package/libodb-mysql/libodb-mysql.hash        |   4 +
 package/libodb-mysql/libodb-mysql.mk          |  16 +
 package/libodb-pgsql/Config.in                |  15 +
 package/libodb-pgsql/libodb-pgsql.hash        |   6 +
 package/libodb-pgsql/libodb-pgsql.mk          |  16 +
 package/libodb/Config.in                      |  13 +
 package/libodb/libodb.hash                    |   6 +
 package/libodb/libodb.mk                      |  15 +
 package/odb/Config.in.host                    |  11 +
 .../GCC_6_input_location_translation.patch    |  34 ++
 package/odb/GCC_6_port_part1.patch            | 312 ++++++++++++
 package/odb/GCC_6_port_part2.patch            |  48 ++
 package/odb/GCC_8_adaptation.patch            |  32 ++
 package/odb/GCC_8_port.patch                  | 226 +++++++++
 .../odb/add_initial_support_for_GCC_9.patch   | 233 +++++++++
 ...espace_aliases_when_parsing_GCC_tree.patch |  30 ++
 package/odb/no_need_of_tm.h.patch             |  23 +
 package/odb/odb.hash                          |   6 +
 package/odb/odb.mk                            |  20 +
 package/odb/remove_gratuitous_classes.patch   | 444 ++++++++++++++++++
 package/odb/series                            |  10 +
 package/odb/switch_to_C++11.patch             | 352 ++++++++++++++
 support/dependencies/dependencies.sh          |  10 +
 34 files changed, 2006 insertions(+)
 create mode 100644 package/libcutl/libcutl.hash
 create mode 100644 package/libcutl/libcutl.mk
 create mode 100644 package/libodb-boost/Config.in
 create mode 100644 package/libodb-boost/libodb.hash
 create mode 100644 package/libodb-boost/libodb.mk
 create mode 100644 package/libodb-mysql/0001-fix-syntax-issue-while-checking-ldflags.patch
 create mode 100644 package/libodb-mysql/Config.in
 create mode 100644 package/libodb-mysql/libodb-mysql.hash
 create mode 100644 package/libodb-mysql/libodb-mysql.mk
 create mode 100644 package/libodb-pgsql/Config.in
 create mode 100644 package/libodb-pgsql/libodb-pgsql.hash
 create mode 100644 package/libodb-pgsql/libodb-pgsql.mk
 create mode 100644 package/libodb/Config.in
 create mode 100644 package/libodb/libodb.hash
 create mode 100644 package/libodb/libodb.mk
 create mode 100644 package/odb/Config.in.host
 create mode 100644 package/odb/GCC_6_input_location_translation.patch
 create mode 100644 package/odb/GCC_6_port_part1.patch
 create mode 100644 package/odb/GCC_6_port_part2.patch
 create mode 100644 package/odb/GCC_8_adaptation.patch
 create mode 100644 package/odb/GCC_8_port.patch
 create mode 100644 package/odb/add_initial_support_for_GCC_9.patch
 create mode 100644 package/odb/handle_namespace_aliases_when_parsing_GCC_tree.patch
 create mode 100644 package/odb/no_need_of_tm.h.patch
 create mode 100644 package/odb/odb.hash
 create mode 100644 package/odb/odb.mk
 create mode 100644 package/odb/remove_gratuitous_classes.patch
 create mode 100644 package/odb/series
 create mode 100644 package/odb/switch_to_C++11.patch

--
2.25.0

#1 lore raw

PATCH 1/6 package/libcutl: new package

From: Adam Duskett <[email protected]>

libcutl is distributed in source code and includes the standard autotools build system as well as the VC++ project files. It is a dependency for odb.

Because ODB is a host-only package, and no other package depends on libcutl, this package will also be a host-only package.

---
 DEVELOPERS                   |  1 +
 package/libcutl/libcutl.hash |  6 ++++++
 package/libcutl/libcutl.mk   | 15 +++++++++++++++
 3 files changed, 22 insertions(+)
 create mode 100644 package/libcutl/libcutl.hash
 create mode 100644 package/libcutl/libcutl.mk
DEVELOPERS +1 -0
index dd44331b85..e64b90a1aa 100644
@@ -42,6 +42,7 @@ F:	package/imx-usb-loader/
 F:	package/janus-gateway/
 F:	package/json-for-modern-cpp/
 F:	package/libcpprestsdk/
+F:	package/libcutl/
 F:	package/libressl/
 F:	package/libselinux/
 F:	package/libsemanage/
package/libcutl/libcutl.hash new file +6 -0
new file mode 100644
index 0000000000..1e0baa7f6e
@@ -0,0 +1,6 @@
+# From https://www.codesynthesis.com/download/libcutl/1.10/libcutl-1.10.0.tar.bz2.sha1
+sha1	2885b79529f8caeb13687d722f5c114186f56956	libcutl-1.10.0.tar.bz2
+
+# Locally Computed
+sha256	125163c670e372b47d5626d54379ff8fbaded6ccd5db77ac0bf5912a4017121c	libcutl-1.10.0.tar.bz2
+sha256	c7aa98c5af3b67174f16b12a1fed4332a51cd524b82c69e85baa4c2c412da239	LICENSE
package/libcutl/libcutl.mk new file +15 -0
new file mode 100644
index 0000000000..49c05e6019
@@ -0,0 +1,15 @@
+################################################################################
+#
+# libcutl
+#
+################################################################################
+
+LIBCUTL_VERSION_MAJOR = 1.10
+LIBCUTL_VERSION = $(LIBCUTL_VERSION_MAJOR).0
+LIBCUTL_SOURCE = libcutl-$(LIBCUTL_VERSION).tar.bz2
+LIBCUTL_SITE = https://www.codesynthesis.com/download/libcutl/$(LIBCUTL_VERSION_MAJOR)
+LIBCUTL_INSTALL_STAGING = YES
+LIBCUTL_LICENSE = MIT
+LIBCUTL_LICENSE_FILES = LICENSE
+
+$(eval $(host-autotools-package))
Signature · 1 line
2.25.0
#2 lore raw

PATCH 2/6 package/odb: new package

In reply to Kamel Bouhara

From: Adam Duskett <[email protected]>

ODB is an open-source, cross-platform, and cross-database object-relational mapping (ORM) system for C++. It allows you to persist C++ objects to a relational database without having to deal with tables, columns, or SQL and without manually writing any mapping code.

ODB supports MySQL, SQLite, PostgreSQL, Oracle, and Microsoft SQL Server relational databases as well as C++98/03 and C++11 language standards. It also comes with optional profiles for Boost and Qt which allow you to seamlessly use value types, containers, and smart pointers from these libraries in your persistent C++ classes.

This package is used for auto-generating ODB specific header files into useable code that can be linked against a seperate libodb and a specific libodb database library. As such, it is only needed as a host program and is not user selectable.

[Kamel: Fixe incorrect odb license, Add a hidden boolean BR2_NEEDS_HOST_GCC_PLUGIN_SUPPORT, Add a check in in support/dependencies/dependencies.sh to verify that gcc plugins can be built for the host gcc.]

---
 Config.in                                     |   4 +
 DEVELOPERS                                    |   1 +
 package/Config.in.host                        |   1 +
 package/odb/Config.in.host                    |  11 +
 .../GCC_6_input_location_translation.patch    |  34 ++
 package/odb/GCC_6_port_part1.patch            | 312 ++++++++++++
 package/odb/GCC_6_port_part2.patch            |  48 ++
 package/odb/GCC_8_adaptation.patch            |  32 ++
 package/odb/GCC_8_port.patch                  | 226 +++++++++
 .../odb/add_initial_support_for_GCC_9.patch   | 233 +++++++++
 ...espace_aliases_when_parsing_GCC_tree.patch |  30 ++
 package/odb/no_need_of_tm.h.patch             |  23 +
 package/odb/odb.hash                          |   6 +
 package/odb/odb.mk                            |  20 +
 package/odb/remove_gratuitous_classes.patch   | 444 ++++++++++++++++++
 package/odb/series                            |  10 +
 package/odb/switch_to_C++11.patch             | 352 ++++++++++++++
 support/dependencies/dependencies.sh          |  10 +
 18 files changed, 1797 insertions(+)
 create mode 100644 package/odb/Config.in.host
 create mode 100644 package/odb/GCC_6_input_location_translation.patch
 create mode 100644 package/odb/GCC_6_port_part1.patch
 create mode 100644 package/odb/GCC_6_port_part2.patch
 create mode 100644 package/odb/GCC_8_adaptation.patch
 create mode 100644 package/odb/GCC_8_port.patch
 create mode 100644 package/odb/add_initial_support_for_GCC_9.patch
 create mode 100644 package/odb/handle_namespace_aliases_when_parsing_GCC_tree.patch
 create mode 100644 package/odb/no_need_of_tm.h.patch
 create mode 100644 package/odb/odb.hash
 create mode 100644 package/odb/odb.mk
 create mode 100644 package/odb/remove_gratuitous_classes.patch
 create mode 100644 package/odb/series
 create mode 100644 package/odb/switch_to_C++11.patch
Config.in +4 -0
index 48fd36ff98..269f9d5594 100644
@@ -79,6 +79,10 @@ config BR2_HOSTARCH_NEEDS_IA32_COMPILER
 # UTF8 locale.
 config BR2_NEEDS_HOST_UTF8_LOCALE
 	bool
+# Hidden boolean selected by packages that need the host to install the
+# gcc-plugin-devel package
+config BR2_NEEDS_HOST_GCC_PLUGIN_SUPPORT
+	bool
 
 source "arch/Config.in"
 
DEVELOPERS +1 -0
index e64b90a1aa..66ce95b4e1 100644
@@ -50,6 +50,7 @@ F:	package/libsepol/
 F:	package/libwebsockets/
 F:	package/mender-grubenv/
 F:	package/nginx-naxsi/
+F:	package/odb/
 F:	package/openjdk/
 F:	package/openjdk-bin/
 F:	package/php/
package/Config.in.host +1 -0
index dfea478868..7dc1e46e97 100644
@@ -81,5 +81,6 @@ menu "Host utilities"
 	source "package/xorriso/Config.in.host"
 	source "package/zip/Config.in.host"
 	source "package/zstd/Config.in.host"
+	source "package/odb/Config.in.host"
 
 endmenu
package/odb/Config.in.host new file +11 -0
new file mode 100644
index 0000000000..a0d551ccd1
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_HOST_ODB
+	bool "host-odb"
+	default n
+	select BR2_NEEDS_HOST_GCC_PLUGIN_SUPPORT
+	help
+	  This is a compiler that takes a specially crafted c++ header
+	  file and auto-generates a schema that works with libodb and
+	  the subsequent libodb-database library.
+
+comment "Host ODB compiler"
+
package/odb/GCC_6_input_location_translation.patch new file +34 -0
new file mode 100644
index 0000000000..391bff316b
@@ -0,0 +1,34 @@
+From ec777147024fde72e4411cc6b1e1e49f4a1d1804 Mon Sep 17 00:00:00 2001
+From: Boris Kolpackov <[email protected]>
+Date: Fri, 23 Dec 2016 10:18:01 +0200
+Subject: Fix bug in GCC 6 input_location translation
+From debsources: https://sources.debian.org/patches/odb/2.4.0-12/GCC_6_input_location_translation.patch/
+
+Signed-off-by: Kamel Bouhara <[email protected]>
+---
+ odb/cxx-lexer.cxx | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/odb/cxx-lexer.cxx b/odb/cxx-lexer.cxx
+index 64df296..ae045d9 100644
+--- a/odb/cxx-lexer.cxx
++++ b/odb/cxx-lexer.cxx
+@@ -106,7 +106,15 @@ next (string& token, tree* node)
+ location_t cxx_pragma_lexer::
+ location () const
+ {
++  // Starting from GCC 6 the input location seem to require the same
++  // translation as what we do in real_source_location().
++  //
++#if BUILDING_GCC_MAJOR >= 6
++  return linemap_resolve_location (
++    line_table, input_location, LRK_MACRO_EXPANSION_POINT, 0);
++#else
+   return input_location;
++#endif
+ }
+
+ string cxx_pragma_lexer::
+--
+cgit v1.1
+
package/odb/GCC_6_port_part1.patch new file +312 -0

312 lines not on this page · raw message

package/odb/GCC_6_port_part2.patch new file +48 -0

48 lines not on this page · raw message

package/odb/GCC_8_adaptation.patch new file +32 -0
new file mode 100644
index 0000000000..2f0f3585cb
@@ -0,0 +1,32 @@
+From 006bbc5748a8197d7874550cc9186545f1c55ad8 Mon Sep 17 00:00:00 2001
+From: Boris Kolpackov <[email protected]>
+Date: Tue, 7 Nov 2017 16:57:35 +0200
+Subject: Fix GCC 8 adaptation to be compatible with previous versions
+From debsources: https://sources.debian.org/patches/odb/2.4.0-12/GCC_8_adaptation.patch/
+
+Signed-off-by: Kamel Bouhara <[email protected]>
+---
+ odb/validator.cxx | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/odb/validator.cxx b/odb/validator.cxx
+index 75757cd..9dcdabf 100644
+--- a/odb/validator.cxx
++++ b/odb/validator.cxx
+@@ -1231,7 +1231,13 @@ namespace
+             compiler, get_identifier ("has_lt_operator"), false, false);
+
+           if (has_lt_operator_ != error_mark_node)
++          {
++#if BUILDING_GCC_MAJOR >= 8
+             has_lt_operator_ = OVL_FIRST (has_lt_operator_);
++#else
++            has_lt_operator_ = OVL_CURRENT (has_lt_operator_);
++#endif
++          }
+           else
+           {
+             os << unit.file () << ": error: unable to resolve has_lt_operator "
+--
+cgit v1.1
+
package/odb/GCC_8_port.patch new file +226 -0

226 lines not on this page · raw message

package/odb/add_initial_support_for_GCC_9.patch new file +233 -0

233 lines not on this page · raw message

package/odb/handle_namespace_aliases_when_parsing_GCC_tree.patch new file +30 -0
new file mode 100644
index 0000000000..c75cb4ca17
@@ -0,0 +1,30 @@
+From 3a1788234bfaa96ee093b68e9ba02cf7d5bdffe6 Mon Sep 17 00:00:00 2001
+From: Boris Kolpackov <[email protected]>
+Date: Fri, 5 Oct 2018 07:20:18 +0200
+Subject: Handle namespace aliases when parsing GCC tree
+From debsources: https://sources.debian.org/patches/odb/2.4.0-12/handle_namespace_aliases_when_parsing_GCC_tree.patch/
+
+Signed-off-by: Kamel Bouhara <[email protected]>
+---
+ odb/parser.cxx | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/odb/parser.cxx b/odb/parser.cxx
+index 968903c..7cce486 100644
+--- a/odb/parser.cxx
++++ b/odb/parser.cxx
+@@ -906,6 +906,11 @@ collect (tree ns)
+       continue;
+ #endif
+
++    // Ignore namespace aliases.
++    //
++    if (DECL_NAMESPACE_ALIAS (decl))
++      continue;
++
+     if (!DECL_IS_BUILTIN (decl) || DECL_NAMESPACE_STD_P (decl))
+     {
+       if (trace)
+--
+cgit v1.1
+
package/odb/no_need_of_tm.h.patch new file +23 -0
new file mode 100644
index 0000000000..93bc446488
@@ -0,0 +1,23 @@
+Description:  <tm.h> include in gcc.hxx appears to be no longer necessary
+ On MIPS this file pulls in enum processor which conflicts with our class
+ processor.
+Origin: upstream, http://scm.codesynthesis.com/?p=odb/odb.git;a=commitdiff;h=f0bbc17aeed1b636782a4b92e8191d90f310d0a2;hp=95cb59ee9e7770bd38e14bc86069b7c4d80ea08e
+Forwarded: not-needed
+Author: Boris Kolpackov <[email protected]>
+Last-Update: 2015-06-01
+From debsources: https://sources.debian.org/patches/odb/2.4.0-12/no_need_of_tm.h.patch/
+
+Signed-off-by: Kamel Bouhara <[email protected]>
+---
+
+--- odb-2.4.0.orig/odb/gcc.hxx
++++ odb-2.4.0/odb/gcc.hxx
+@@ -46,8 +46,6 @@ extern "C"
+ #include <tree.h>
+ #include <real.h>
+
+-#include <tm.h>
+-
+ #include <cpplib.h>
+ #include <cp/cp-tree.h>
+
package/odb/odb.hash new file +6 -0
new file mode 100644
index 0000000000..773a9c829b
@@ -0,0 +1,6 @@
+# From https://www.codesynthesis.com/products/odb/download.xhtml
+sha1	810fc02e591429ed19f5a2699d144fb611fb121b	odb-2.4.0.tar.bz2
+
+# Locally computed
+sha256	6785154fa98ea3977c8c2ab38cec16c4aa78c2c2039e80cd2908347b1c1d4198	odb-2.4.0.tar.bz2
+sha256	7983b82cb1f1686ac2b55420ded9c0f348f93dd17bf3e048ae3b25c1da51b80e	LICENSE
package/odb/odb.mk new file +20 -0
new file mode 100644
index 0000000000..11086471e6
@@ -0,0 +1,20 @@
+################################################################################
+#
+# odb
+#
+################################################################################
+
+ODB_VERSION_MAJOR = 2.4
+ODB_VERSION = $(ODB_VERSION_MAJOR).0
+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
+
+# Prevent odb from trying to install the gcc plugin into the hosts
+# gcc plugin directory. Instead, this will install the gcc plugin
+# into host/libexec/odb
+HOST_ODB_CONF_OPTS = --with-gcc-plugin-dir=no
+
+$(eval $(host-autotools-package))
package/odb/remove_gratuitous_classes.patch new file +444 -0

444 lines not on this page · raw message

package/odb/series new file +10 -0
new file mode 100644
index 0000000000..62329fddb5
@@ -0,0 +1,10 @@
+no_need_of_tm.h.patch
+remove_gratuitous_classes.patch
+GCC_6_port_part1.patch
+GCC_6_port_part2.patch
+GCC_6_input_location_translation.patch
+GCC_8_port.patch
+switch_to_C++11.patch
+GCC_8_adaptation.patch
+handle_namespace_aliases_when_parsing_GCC_tree.patch
+add_initial_support_for_GCC_9.patch
package/odb/switch_to_C++11.patch new file +352 -0

352 lines not on this page · raw message

support/dependencies/dependencies.sh +10 -0
index 98469bd70c..3f212c5845 100755
@@ -240,6 +240,16 @@ if grep -q ^BR2_HOSTARCH_NEEDS_IA32_COMPILER=y $BR2_CONFIG ; then
 	fi
 fi
 
+if grep ^BR2_NEEDS_HOST_GCC_PLUGIN_SUPPORT=y $BR2_CONFIG ; then
+	if ! gcc -print-file-name=plugin > /dev/null ; then
+		echo
+		echo "Your Buildroot configuration needs a compiler capable of building gcc plugins."
+		echo "If you're running a Debian/Ubuntu distribution, install gcc-X-plugin-dev package."
+		echo "For other distributions, refer to their documentation."
+		exit 1 ;
+	fi
+fi
+
 # Check that the Perl installation is complete enough for Buildroot.
 required_perl_modules="Data::Dumper" # Needed to build host-autoconf
 required_perl_modules="$required_perl_modules ExtUtils::MakeMaker" # Used by host-libxml-parser-perl
Signature · 1 line
2.25.0
#3 lore raw

PATCH 2/6 package/odb: new package

Hello,

Quoted 2 lines · On Thu, 14 May 2020 16:33:21 +0200 Kamel Bouhara <[email protected]>…

[Kamel: Fixe incorrect odb license, Add a hidden boolean

Fixe -> Fix

Quoted 3 lines

BR2_NEEDS_HOST_GCC_PLUGIN_SUPPORT, Add a check in in support/dependencies/dependencies.sh to verify that gcc plugins can be built for the host gcc.]

Would be nice to have that as a bullet list:

[Kamel:
- do this
- do that
- do this other thing]

Quoted 22 lines
---
 Config.in                                     |   4 +
 DEVELOPERS                                    |   1 +
 package/Config.in.host                        |   1 +
 package/odb/Config.in.host                    |  11 +
 .../GCC_6_input_location_translation.patch    |  34 ++
 package/odb/GCC_6_port_part1.patch            | 312 ++++++++++++
 package/odb/GCC_6_port_part2.patch            |  48 ++
 package/odb/GCC_8_adaptation.patch            |  32 ++
 package/odb/GCC_8_port.patch                  | 226 +++++++++
 .../odb/add_initial_support_for_GCC_9.patch   | 233 +++++++++
 ...espace_aliases_when_parsing_GCC_tree.patch |  30 ++
 package/odb/no_need_of_tm.h.patch             |  23 +
 package/odb/odb.hash                          |   6 +
 package/odb/odb.mk                            |  20 +
 package/odb/remove_gratuitous_classes.patch   | 444 ++++++++++++++++++
 package/odb/series                            |  10 +
 package/odb/switch_to_C++11.patch             | 352 ++++++++++++++
 support/dependencies/dependencies.sh          |  10 +
 18 files changed, 1797 insertions(+)
 create mode 100644 package/odb/Config.in.host
Quoted 8 lines
 create mode 100644 package/odb/GCC_6_input_location_translation.patch
 create mode 100644 package/odb/GCC_6_port_part1.patch
 create mode 100644 package/odb/GCC_6_port_part2.patch
 create mode 100644 package/odb/GCC_8_adaptation.patch
 create mode 100644 package/odb/GCC_8_port.patch
 create mode 100644 package/odb/add_initial_support_for_GCC_9.patch
 create mode 100644 package/odb/handle_namespace_aliases_when_parsing_GCC_tree.patch
 create mode 100644 package/odb/no_need_of_tm.h.patch

All patches should be named 0001-...patch 0002-...patch, etc. I.e please import them in Git, and use "git format-patch -N" to generate them.

Config.in config BR2_HOSTARCH_NEEDS_IA32_COMPILER · line 81

Quoted 8 lines
Config.in +0 -0
index 48fd36ff98..269f9d5594 100644
@@ -79,6 +79,10 @@ config BR2_HOSTARCH_NEEDS_IA32_COMPILER
 # UTF8 locale.
 config BR2_NEEDS_HOST_UTF8_LOCALE
 	bool

Missing blank line.

Config.in config BR2_HOSTARCH_NEEDS_IA32_COMPILER · line 83

Quoted 2 lines
Config.in +2 -0
+# Hidden boolean selected by packages that need the host to install the
+# gcc-plugin-devel package

Description should not really be about installing the gcc-plugin-devel package, but about having support for building gcc plugins.

Config.in config BR2_HOSTARCH_NEEDS_IA32_COMPILER · line 85

Quoted 2 lines
Config.in +2 -0
+config BR2_NEEDS_HOST_GCC_PLUGIN_SUPPORT
+	bool

Also, this change, and the change in support/dependencies/dependencies.sh should be in a separate commit.

package/odb/Config.in.host line 3

Quoted 9 lines
package/odb/Config.in.host new file +3 -0
new file mode 100644
index 0000000000..a0d551ccd1
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_HOST_ODB
+	bool "host-odb"
+	default n

Not needed, default n is the default.

package/odb/Config.in.host line 10

Quoted 7 lines
package/odb/Config.in.host new file +7 -0
+	select BR2_NEEDS_HOST_GCC_PLUGIN_SUPPORT
+	help
+	  This is a compiler that takes a specially crafted c++ header
+	  file and auto-generates a schema that works with libodb and
+	  the subsequent libodb-database library.
+
+comment "Host ODB compiler"

Why do we have this comment ?

support/dependencies/dependencies.sh if grep -q ^BR2_HOSTARCH_NEEDS_IA32_COMPILER=y $BR2_CONFIG ; then · line 244

Quoted 10 lines
support/dependencies/dependencies.sh +2 -0
index 98469bd70c..3f212c5845 100755
@@ -240,6 +240,16 @@ if grep -q ^BR2_HOSTARCH_NEEDS_IA32_COMPILER=y $BR2_CONFIG ; then
 	fi
 fi
 
+if grep ^BR2_NEEDS_HOST_GCC_PLUGIN_SUPPORT=y $BR2_CONFIG ; then
+	if ! gcc -print-file-name=plugin > /dev/null ; then

Are you sure this is a good test? I just removed the gcc-plugin-devel package on my distro, and this still returns a "valid" value:

thomas at windsurf:~$ gcc -print-file-name=plugin /usr/lib/gcc/x86_64-redhat-linux/10/plugin thomas at windsurf:~$ echo $?
0
thomas at windsurf:~$ rpm -qa | grep "gcc.*plugin" thomas at windsurf:~$

Something like this:

echo "#include <gcc-plugin.h>" | g++ -I$(g++ -print-file-name=plugin)/include -x c++ -c - -o /dev/null

will instead test if <gcc-plugin.h> is really installed. On my system, it fails when gcc-plugin-devel is not installed, and it succeeds when it's there. Of course, don't use g++ directly, but $(HOSTCXX).

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#4 lore raw

PATCH 2/6 package/odb: new package

Quoted 2 lines · Thomas Petazzoni

Hello,

Hello Thomas,

Thanks for the review, I'll take all you comments and sent a v2.

Kamel

Quoted 130 lines
Quoted 2 lines · On Thu, 14 May 2020 16:33:21 +0200 Kamel Bouhara <[email protected]>…

[Kamel: Fixe incorrect odb license, Add a hidden boolean

Fixe -> Fix

Quoted 3 lines

BR2_NEEDS_HOST_GCC_PLUGIN_SUPPORT, Add a check in in support/dependencies/dependencies.sh to verify that gcc plugins can be built for the host gcc.]

Would be nice to have that as a bullet list:

[Kamel:
- do this
- do that
- do this other thing]

Quoted 22 lines
---
 Config.in                                     |   4 +
 DEVELOPERS                                    |   1 +
 package/Config.in.host                        |   1 +
 package/odb/Config.in.host                    |  11 +
 .../GCC_6_input_location_translation.patch    |  34 ++
 package/odb/GCC_6_port_part1.patch            | 312 ++++++++++++
 package/odb/GCC_6_port_part2.patch            |  48 ++
 package/odb/GCC_8_adaptation.patch            |  32 ++
 package/odb/GCC_8_port.patch                  | 226 +++++++++
 .../odb/add_initial_support_for_GCC_9.patch   | 233 +++++++++
 ...espace_aliases_when_parsing_GCC_tree.patch |  30 ++
 package/odb/no_need_of_tm.h.patch             |  23 +
 package/odb/odb.hash                          |   6 +
 package/odb/odb.mk                            |  20 +
 package/odb/remove_gratuitous_classes.patch   | 444 ++++++++++++++++++
 package/odb/series                            |  10 +
 package/odb/switch_to_C++11.patch             | 352 ++++++++++++++
 support/dependencies/dependencies.sh          |  10 +
 18 files changed, 1797 insertions(+)
 create mode 100644 package/odb/Config.in.host
Quoted 8 lines
 create mode 100644 package/odb/GCC_6_input_location_translation.patch
 create mode 100644 package/odb/GCC_6_port_part1.patch
 create mode 100644 package/odb/GCC_6_port_part2.patch
 create mode 100644 package/odb/GCC_8_adaptation.patch
 create mode 100644 package/odb/GCC_8_port.patch
 create mode 100644 package/odb/add_initial_support_for_GCC_9.patch
 create mode 100644 package/odb/handle_namespace_aliases_when_parsing_GCC_tree.patch
 create mode 100644 package/odb/no_need_of_tm.h.patch

All patches should be named 0001-...patch 0002-...patch, etc. I.e please import them in Git, and use "git format-patch -N" to generate them.

Config.in config BR2_HOSTARCH_NEEDS_IA32_COMPILER · line 81

Quoted 8 lines
Config.in +0 -0
index 48fd36ff98..269f9d5594 100644
@@ -79,6 +79,10 @@ config BR2_HOSTARCH_NEEDS_IA32_COMPILER
 # UTF8 locale.
 config BR2_NEEDS_HOST_UTF8_LOCALE
 	bool

Missing blank line.

Config.in config BR2_HOSTARCH_NEEDS_IA32_COMPILER · line 83

Quoted 2 lines
Config.in +2 -0
+# Hidden boolean selected by packages that need the host to install the
+# gcc-plugin-devel package

Description should not really be about installing the gcc-plugin-devel package, but about having support for building gcc plugins.

Config.in config BR2_HOSTARCH_NEEDS_IA32_COMPILER · line 85

Quoted 2 lines
Config.in +2 -0
+config BR2_NEEDS_HOST_GCC_PLUGIN_SUPPORT
+	bool

Also, this change, and the change in support/dependencies/dependencies.sh should be in a separate commit.

package/odb/Config.in.host line 3

Quoted 9 lines
package/odb/Config.in.host new file +3 -0
new file mode 100644
index 0000000000..a0d551ccd1
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_HOST_ODB
+	bool "host-odb"
+	default n

Not needed, default n is the default.

package/odb/Config.in.host line 10

Quoted 7 lines
package/odb/Config.in.host new file +7 -0
+	select BR2_NEEDS_HOST_GCC_PLUGIN_SUPPORT
+	help
+	  This is a compiler that takes a specially crafted c++ header
+	  file and auto-generates a schema that works with libodb and
+	  the subsequent libodb-database library.
+
+comment "Host ODB compiler"

Why do we have this comment ?

support/dependencies/dependencies.sh if grep -q ^BR2_HOSTARCH_NEEDS_IA32_COMPILER=y $BR2_CONFIG ; then · line 244

Quoted 10 lines
support/dependencies/dependencies.sh +2 -0
index 98469bd70c..3f212c5845 100755
@@ -240,6 +240,16 @@ if grep -q ^BR2_HOSTARCH_NEEDS_IA32_COMPILER=y $BR2_CONFIG ; then
 	fi
 fi
 
+if grep ^BR2_NEEDS_HOST_GCC_PLUGIN_SUPPORT=y $BR2_CONFIG ; then
+	if ! gcc -print-file-name=plugin > /dev/null ; then

Are you sure this is a good test? I just removed the gcc-plugin-devel package on my distro, and this still returns a "valid" value:

thomas at windsurf:~$ gcc -print-file-name=plugin /usr/lib/gcc/x86_64-redhat-linux/10/plugin thomas at windsurf:~$ echo $?
0
thomas at windsurf:~$ rpm -qa | grep "gcc.*plugin" thomas at windsurf:~$

Something like this:

echo "#include <gcc-plugin.h>" | g++ -I$(g++ -print-file-name=plugin)/include -x c++ -c - -o /dev/null

will instead test if <gcc-plugin.h> is really installed. On my system, it fails when gcc-plugin-devel is not installed, and it succeeds when it's there. Of course, don't use g++ directly, but $(HOSTCXX).

Quoted 7 lines

Thanks!

Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

--
Kamel Bouhara, Bootlin
Embedded Linux and kernel engineering
https://bootlin.com

#5 lore raw

PATCH 3/6 package/libodb: new package

In reply to Kamel Bouhara

From: Adam Duskett <[email protected]>

This package contains the common ODB runtime library. Every application that includes code generated by the ODB compiler will need to link to this library.

[Kamel: Fix incorrect license, Remove false dependency on host-odb]
---
 DEVELOPERS                 |  1 +
 package/Config.in          |  1 +
 package/libodb/Config.in   | 13 +++++++++++++
 package/libodb/libodb.hash |  6 ++++++
 package/libodb/libodb.mk   | 15 +++++++++++++++
 5 files changed, 36 insertions(+)
 create mode 100644 package/libodb/Config.in
 create mode 100644 package/libodb/libodb.hash
 create mode 100644 package/libodb/libodb.mk
DEVELOPERS +1 -0
index 66ce95b4e1..4c7c157e07 100644
@@ -43,6 +43,7 @@ F:	package/janus-gateway/
 F:	package/json-for-modern-cpp/
 F:	package/libcpprestsdk/
 F:	package/libcutl/
+F:	package/libodb/
 F:	package/libressl/
 F:	package/libselinux/
 F:	package/libsemanage/
package/Config.in +1 -0
index edf7687ab7..3891b36282 100644
@@ -1804,6 +1804,7 @@ menu "Other"
 	source "package/libloki/Config.in"
 	source "package/libnpth/Config.in"
 	source "package/libnspr/Config.in"
+	source "package/libodb/Config.in"
 	source "package/libpfm4/Config.in"
 	source "package/libplatform/Config.in"
 	source "package/libplist/Config.in"
package/libodb/Config.in new file +13 -0
new file mode 100644
index 0000000000..8312f47353
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_LIBODB
+	bool "libodb"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_INSTALL_LIBSTDCPP
+	help
+	  This package contains the common ODB runtime library. Every
+	  application that includes code generated by the ODB compiler
+	  will need to link to this library.
+
+	  https://www.codesynthesis.com/products/odb/
+
+comment "libodb needs a toolchain w/ C++, threads"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
package/libodb/libodb.hash new file +6 -0
new file mode 100644
index 0000000000..cea5b9eda2
@@ -0,0 +1,6 @@
+# From https://www.codesynthesis.com/projects/libcutl/
+sha1	42bd2a8023e338e004711e755eb30bd122b844a6	libodb-2.4.0.tar.bz2
+
+# Locally Computed
+sha256	66a1bb4e8bb6ef60cc79334f8028c4d4de98d87f2ff6f8123b4cfb7751ce0007	libodb-2.4.0.tar.bz2
+sha256	841105a470fc283851c63941510ffd403c726d1910b688f7df95914ab8b1b5a3	LICENSE
package/libodb/libodb.mk new file +15 -0
new file mode 100644
index 0000000000..f36d8957c0
@@ -0,0 +1,15 @@
+################################################################################
+#
+# libodb
+#
+################################################################################
+
+LIBODB_VERSION_MAJOR = 2.4
+LIBODB_VERSION = $(LIBODB_VERSION_MAJOR).0
+LIBODB_SOURCE = libodb-$(LIBODB_VERSION).tar.bz2
+LIBODB_SITE = https://www.codesynthesis.com/download/odb/$(LIBODB_VERSION_MAJOR)
+LIBODB_INSTALL_STAGING = YES
+LIBODB_LICENSE = GPL-2.0
+LIBODB_LICENSE_FILES = LICENSE
+
+$(eval $(autotools-package))
Signature · 1 line
2.25.0
#6 lore raw

PATCH 4/6 package/libodb-pgsql: new package

In reply to Kamel Bouhara

From: Adam Duskett <[email protected]>

This package contains the PostgreSQL ODB runtime library. Every application that includes code generated for the PostgreSQL database will need to link to this library.

[Kamel: Fix incorrect license, Remove false dependency on host-odb]
---
 DEVELOPERS                             |  1 +
 package/Config.in                      |  1 +
 package/libodb-pgsql/Config.in         | 15 +++++++++++++++
 package/libodb-pgsql/libodb-pgsql.hash |  6 ++++++
 package/libodb-pgsql/libodb-pgsql.mk   | 16 ++++++++++++++++
 5 files changed, 39 insertions(+)
 create mode 100644 package/libodb-pgsql/Config.in
 create mode 100644 package/libodb-pgsql/libodb-pgsql.hash
 create mode 100644 package/libodb-pgsql/libodb-pgsql.mk
DEVELOPERS +1 -0
index 4c7c157e07..abdee8541a 100644
@@ -44,6 +44,7 @@ F:	package/json-for-modern-cpp/
 F:	package/libcpprestsdk/
 F:	package/libcutl/
 F:	package/libodb/
+F:	package/libodb-pgsql/
 F:	package/libressl/
 F:	package/libselinux/
 F:	package/libsemanage/
package/Config.in +1 -0
index 3891b36282..59e714fb6a 100644
@@ -1319,6 +1319,7 @@ menu "Database"
 	source "package/hiredis/Config.in"
 	source "package/kompexsqlite/Config.in"
 	source "package/leveldb/Config.in"
+	source "package/libodb-pgsql/Config.in"
 	source "package/libgit2/Config.in"
 	source "package/libpqxx/Config.in"
 	source "package/mongodb/Config.in"
package/libodb-pgsql/Config.in new file +15 -0
new file mode 100644
index 0000000000..daaf4717f9
@@ -0,0 +1,15 @@
+config BR2_PACKAGE_LIBODB_PGSQL
+	bool "libodb-pgsql"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_PACKAGE_POSTGRESQL
+	select BR2_PACKAGE_LIBODB
+	help
+	  This package contains the PostgreSQL ODB runtime library.
+	  Every application that includes code generated for the
+	  PostgreSQL database will need to link to this library.
+
+	  https://www.codesynthesis.com/products/odb/
+
+comment "libodb-pgsql needs a toolchain w/ C++, threads"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
package/libodb-pgsql/libodb-pgsql.hash new file +6 -0
new file mode 100644
index 0000000000..5799f09236
@@ -0,0 +1,6 @@
+# From https://www.codesynthesis.com/download/odb/2.4/libodb-pgsql-2.4.0.tar.bz2.sha1
+sha1	4628d5e296da01dbaf8658fd402b4f709f30ea2d	libodb-pgsql-2.4.0.tar.bz2
+
+# Locally Computed
+sha256	778a4d38bd1161e1f0b368815514c3335da20c7584e3d07613526dcce53523bc	libodb-pgsql-2.4.0.tar.bz2
+sha256	841105a470fc283851c63941510ffd403c726d1910b688f7df95914ab8b1b5a3	LICENSE
package/libodb-pgsql/libodb-pgsql.mk new file +16 -0
new file mode 100644
index 0000000000..14e669153a
@@ -0,0 +1,16 @@
+################################################################################
+#
+# libodb-pgsql
+#
+################################################################################
+
+LIBODB_PGSQL_VERSION_MAJOR = 2.4
+LIBODB_PGSQL_VERSION = $(LIBODB_PGSQL_VERSION_MAJOR).0
+LIBODB_PGSQL_SOURCE = libodb-pgsql-$(LIBODB_PGSQL_VERSION).tar.bz2
+LIBODB_PGSQL_SITE = https://www.codesynthesis.com/download/odb/$(LIBODB_PGSQL_VERSION_MAJOR)
+LIBODB_PGSQL_LICENSE = GPL-2.0
+LIBODB_PGSQL_LICENSE_FILES = LICENSE
+LIBODB_PGSQL_INSTALL_STAGING = YES
+LIBODB_PGSQL_DEPENDENCIES += postgresql libodb
+
+$(eval $(autotools-package))
Signature · 1 line
2.25.0
#7 lore raw

PATCH 4/6 package/libodb-pgsql: new package

Quoted 35 lines · On Thu, 14 May 2020 16:33:23 +0200 Kamel Bouhara <[email protected]>…
DEVELOPERS +1 -0
index 4c7c157e07..abdee8541a 100644
@@ -44,6 +44,7 @@ F:	package/json-for-modern-cpp/
 F:	package/libcpprestsdk/
 F:	package/libcutl/
 F:	package/libodb/
+F:	package/libodb-pgsql/
 F:	package/libressl/
 F:	package/libselinux/
 F:	package/libsemanage/
package/Config.in +1 -0
index 3891b36282..59e714fb6a 100644
@@ -1319,6 +1319,7 @@ menu "Database"
 	source "package/hiredis/Config.in"
 	source "package/kompexsqlite/Config.in"
 	source "package/leveldb/Config.in"
+	source "package/libodb-pgsql/Config.in"
 	source "package/libgit2/Config.in"
 	source "package/libpqxx/Config.in"
 	source "package/mongodb/Config.in"
package/libodb-pgsql/Config.in new file +5 -0
new file mode 100644
index 0000000000..daaf4717f9
@@ -0,0 +1,15 @@
+config BR2_PACKAGE_LIBODB_PGSQL
+	bool "libodb-pgsql"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_PACKAGE_POSTGRESQL

package/libodb-pgsql/Config.in line 15

Quoted 10 lines
package/libodb-pgsql/Config.in new file +10 -0
+	select BR2_PACKAGE_LIBODB
+	help
+	  This package contains the PostgreSQL ODB runtime library.
+	  Every application that includes code generated for the
+	  PostgreSQL database will need to link to this library.
+
+	  https://www.codesynthesis.com/products/odb/
+
+comment "libodb-pgsql needs a toolchain w/ C++, threads"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS

We need a:

depends on BR2_PACKAGE_POSTGRESQL

here so that the comment does not appear when postgresql is not enabled.

package/libodb-pgsql/Config.in

Quoted 8 lines
package/libodb-pgsql/Config.in new file +8 -0
+LIBODB_PGSQL_VERSION_MAJOR = 2.4
+LIBODB_PGSQL_VERSION = $(LIBODB_PGSQL_VERSION_MAJOR).0
+LIBODB_PGSQL_SOURCE = libodb-pgsql-$(LIBODB_PGSQL_VERSION).tar.bz2
+LIBODB_PGSQL_SITE = https://www.codesynthesis.com/download/odb/$(LIBODB_PGSQL_VERSION_MAJOR)
+LIBODB_PGSQL_LICENSE = GPL-2.0
+LIBODB_PGSQL_LICENSE_FILES = LICENSE
+LIBODB_PGSQL_INSTALL_STAGING = YES
+LIBODB_PGSQL_DEPENDENCIES += postgresql libodb

The += sign can be just =

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#8 lore raw

PATCH 5/6 package/libodb-mysql: new package

In reply to Kamel Bouhara

This package contains the MySQL ODB runtime library. Every application that includes code generated for the MySQL database will need to link to this library.

---
 DEVELOPERS                                    |  3 ++
 package/Config.in                             |  1 +
 ...-syntax-issue-while-checking-ldflags.patch | 35 +++++++++++++++++++
 package/libodb-mysql/Config.in                | 15 ++++++++
 package/libodb-mysql/libodb-mysql.hash        |  4 +++
 package/libodb-mysql/libodb-mysql.mk          | 16 +++++++++
 6 files changed, 74 insertions(+)
 create mode 100644 package/libodb-mysql/0001-fix-syntax-issue-while-checking-ldflags.patch
 create mode 100644 package/libodb-mysql/Config.in
 create mode 100644 package/libodb-mysql/libodb-mysql.hash
 create mode 100644 package/libodb-mysql/libodb-mysql.mk
DEVELOPERS +3 -0
index abdee8541a..73a3a44ef8 100644
@@ -1409,6 +1409,9 @@ F:	package/easy-rsa/
 N:	Justin Maggard <[email protected]>
 F:	package/dtach/
 
+N:	Kamel Bouhara <[email protected]>
+F:	package/libodb-mysql/
+
 N:	Karoly Kasza <[email protected]>
 F:	package/irqbalance/
 F:	package/openvmtools/
package/Config.in +1 -0
index 59e714fb6a..651241dc0c 100644
@@ -1319,6 +1319,7 @@ menu "Database"
 	source "package/hiredis/Config.in"
 	source "package/kompexsqlite/Config.in"
 	source "package/leveldb/Config.in"
+	source "package/libodb-mysql/Config.in"
 	source "package/libodb-pgsql/Config.in"
 	source "package/libgit2/Config.in"
 	source "package/libpqxx/Config.in"
package/libodb-mysql/0001-fix-syntax-issue-while-checking-ldflags.patch new file +35 -0
new file mode 100644
index 0000000000..9d2013e3a0
@@ -0,0 +1,35 @@
+From 3af12d8d0f749751e487955c24260049e7a8eec6 Mon Sep 17 00:00:00 2001
+From: Kamel Bouhara <[email protected]>
+Date: Wed, 13 May 2020 16:58:22 +0200
+Subject: [PATCH] fix syntax issue while checking ldflags
+
+Signed-off-by: Kamel Bouhara <[email protected]>
+---
+ configure | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure b/configure
+index def5883..2d783f6 100755
+--- a/configure
++++ b/configure
+@@ -17574,7 +17574,7 @@ libmysqlclient_paths="none /usr/lib/mysql /usr/lib64/mysql"
+ 
+ for path in $libmysqlclient_paths; do
+ 
+-if test x"path" != xnone; then
++if test x"$path" != xnone; then
+   save_LDFLAGS="$LDFLAGS"
+   LDFLAGS="$LDFLAGS -L$path"
+ fi
+@@ -17753,7 +17753,7 @@ if test x"$libmysqlclient_found" = xyes; then
+   break;
+ fi
+ 
+-if test x"path" != xnone; then
++if test x"$path" != xnone; then
+   LDFLAGS="$save_LDFLAGS"
+ fi
+ 
+-- 
+2.25.0
+
package/libodb-mysql/Config.in new file +15 -0
new file mode 100644
index 0000000000..47daa27264
@@ -0,0 +1,15 @@
+config BR2_PACKAGE_LIBODB_MYSQL
+	bool "libodb-mysql"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_PACKAGE_MYSQL
+	select BR2_PACKAGE_LIBODB
+	help
+	  This package contains the MySQL ODB runtime library. Every application
+	  that includes code generated for the MySQL database will need to link
+	  to this library.
+
+	  https://www.codesynthesis.com/products/odb/
+
+comment "libodb-mysql needs a toolchain w/ C++, threads"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
package/libodb-mysql/libodb-mysql.hash new file +4 -0
new file mode 100644
index 0000000000..b5a1583036
@@ -0,0 +1,4 @@
+sha1	2021a67577354f1d6bed50c0b257c1920760eda7	libodb-mysql-2.4.0.tar.bz2
+
+sha256	ce2fcdb6ab4a02fc0aff263a891c56949fa41b89e65d7a40d8b656d3ebf0d9bc	libodb-2.4.0.tar.bz2
+sha256	841105a470fc283851c63941510ffd403c726d1910b688f7df95914ab8b1b5a3	LICENSE
package/libodb-mysql/libodb-mysql.mk new file +16 -0
new file mode 100644
index 0000000000..97cbcddf93
@@ -0,0 +1,16 @@
+################################################################################
+#
+# libodb-mysql
+#
+################################################################################
+
+LIBODB_MYSQL_VERSION_MAJOR = 2.4
+LIBODB_MYSQL_VERSION = $(LIBODB_MYSQL_VERSION_MAJOR).0
+LIBODB_MYSQL_SOURCE = libodb-mysql-$(LIBODB_MYSQL_VERSION).tar.bz2
+LIBODB_MYSQL_SITE = https://www.codesynthesis.com/download/odb/$(LIBODB_MYSQL_VERSION_MAJOR)
+LIBODB_MYSQL_INSTALL_STAGING = YES
+LIBODB_MYSQL_LICENSE = GPL-2.0
+LIBODB_MYSQL_LICENSE_FILES = LICENSE
+LIBODB_MYSQL_DEPENDENCIES = libodb mysql
+
+$(eval $(autotools-package))
Signature · 1 line
2.25.0
#9 lore raw

PATCH 5/6 package/libodb-mysql: new package

Hello,

Quoted 11 lines · On Thu, 14 May 2020 16:33:24 +0200 Kamel Bouhara <[email protected]>…
package/libodb-mysql/Config.in new file +5 -0
new file mode 100644
index 0000000000..47daa27264
@@ -0,0 +1,15 @@
+config BR2_PACKAGE_LIBODB_MYSQL
+	bool "libodb-mysql"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_PACKAGE_MYSQL

package/libodb-mysql/Config.in line 15

Quoted 10 lines
package/libodb-mysql/Config.in new file +10 -0
+	select BR2_PACKAGE_LIBODB
+	help
+	  This package contains the MySQL ODB runtime library. Every application
+	  that includes code generated for the MySQL database will need to link
+	  to this library.
+
+	  https://www.codesynthesis.com/products/odb/
+
+comment "libodb-mysql needs a toolchain w/ C++, threads"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS

Here as well, we need a:

depends on BR2_PACKAGE_MYSQL

package/libodb-mysql/Config.in

Quoted 8 lines
package/libodb-mysql/Config.in new file +8 -0
+LIBODB_MYSQL_VERSION_MAJOR = 2.4
+LIBODB_MYSQL_VERSION = $(LIBODB_MYSQL_VERSION_MAJOR).0
+LIBODB_MYSQL_SOURCE = libodb-mysql-$(LIBODB_MYSQL_VERSION).tar.bz2
+LIBODB_MYSQL_SITE = https://www.codesynthesis.com/download/odb/$(LIBODB_MYSQL_VERSION_MAJOR)
+LIBODB_MYSQL_INSTALL_STAGING = YES
+LIBODB_MYSQL_LICENSE = GPL-2.0
+LIBODB_MYSQL_LICENSE_FILES = LICENSE
+LIBODB_MYSQL_DEPENDENCIES = libodb mysql

Did you test this with both Buildroot packages that provide mysql, i.e oracle-mysql and mariadb ?

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#10 lore raw

PATCH 6/6 package/libodb-boost: new package

In reply to Kamel Bouhara

This package contains the Boost ODB profile library. The Boost profile provides support for persisting Boost smart pointers, containers, and value types with the ODB system.

---
 DEVELOPERS                       |  1 +
 package/Config.in                |  1 +
 package/libodb-boost/Config.in   | 15 +++++++++++++++
 package/libodb-boost/libodb.hash |  6 ++++++
 package/libodb-boost/libodb.mk   | 15 +++++++++++++++
 5 files changed, 38 insertions(+)
 create mode 100644 package/libodb-boost/Config.in
 create mode 100644 package/libodb-boost/libodb.hash
 create mode 100644 package/libodb-boost/libodb.mk
DEVELOPERS +1 -0
index 73a3a44ef8..a967870018 100644
@@ -1411,6 +1411,7 @@ F:	package/dtach/
 
 N:	Kamel Bouhara <[email protected]>
 F:	package/libodb-mysql/
+F:	package/libodb-boost/
 
 N:	Karoly Kasza <[email protected]>
 F:	package/irqbalance/
package/Config.in +1 -0
index 651241dc0c..d668e1d3e3 100644
@@ -1807,6 +1807,7 @@ menu "Other"
 	source "package/libnpth/Config.in"
 	source "package/libnspr/Config.in"
 	source "package/libodb/Config.in"
+	source "package/libodb-boost/Config.in"
 	source "package/libpfm4/Config.in"
 	source "package/libplatform/Config.in"
 	source "package/libplist/Config.in"
package/libodb-boost/Config.in new file +15 -0
new file mode 100644
index 0000000000..0456f28d82
@@ -0,0 +1,15 @@
+config BR2_PACKAGE_LIBODB_BOOST
+	bool "libodb-boost"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_PACKAGE_BOOST
+	select BR2_PACKAGE_LIBODB
+	help
+	  This package contains the common ODB runtime library. Every
+	  application that includes code generated by the ODB compiler
+	  will need to link to this library.
+
+	  https://www.codesynthesis.com/products/odb/
+
+comment "libodb-boost needs a toolchain w/ C++, threads"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
package/libodb-boost/libodb.hash new file +6 -0
new file mode 100644
index 0000000000..cea5b9eda2
@@ -0,0 +1,6 @@
+# From https://www.codesynthesis.com/projects/libcutl/
+sha1	42bd2a8023e338e004711e755eb30bd122b844a6	libodb-2.4.0.tar.bz2
+
+# Locally Computed
+sha256	66a1bb4e8bb6ef60cc79334f8028c4d4de98d87f2ff6f8123b4cfb7751ce0007	libodb-2.4.0.tar.bz2
+sha256	841105a470fc283851c63941510ffd403c726d1910b688f7df95914ab8b1b5a3	LICENSE
package/libodb-boost/libodb.mk new file +15 -0
new file mode 100644
index 0000000000..b99d50fe9f
@@ -0,0 +1,15 @@
+################################################################################
+#
+# libodb-boost
+#
+################################################################################
+
+LIBODB_BOOST_VERSION_MAJOR = 2.4
+LIBODB_BOOST_VERSION = $(LIBODB_BOOST_VERSION_MAJOR).0
+LIBODB_BOOST_SOURCE = libodb-boost-$(LIBODB_BOOST_VERSION).tar.bz2
+LIBODB_BOOST_SITE = https://www.codesynthesis.com/download/odb/$(LIBODB_BOOST_VERSION_MAJOR)
+LIBODB_BOOST_INSTALL_STAGING = YES
+LIBODB_BOOST_LICENSE = GPL-2.0
+LIBODB_BOOST_LICENSE_FILES = LICENSE
+
+$(eval $(autotools-package))
Signature · 1 line
2.25.0
#11 lore raw

PATCH 6/6 package/libodb-boost: new package

Hello,

Quoted 11 lines · On Thu, 14 May 2020 16:33:25 +0200 Kamel Bouhara <[email protected]>…
package/libodb-boost/Config.in new file +5 -0
new file mode 100644
index 0000000000..0456f28d82
@@ -0,0 +1,15 @@
+config BR2_PACKAGE_LIBODB_BOOST
+	bool "libodb-boost"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_PACKAGE_BOOST

package/libodb-boost/Config.in line 15

Quoted 10 lines
package/libodb-boost/Config.in new file +10 -0
+	select BR2_PACKAGE_LIBODB
+	help
+	  This package contains the common ODB runtime library. Every
+	  application that includes code generated by the ODB compiler
+	  will need to link to this library.
+
+	  https://www.codesynthesis.com/products/odb/
+
+comment "libodb-boost needs a toolchain w/ C++, threads"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS

depends on BR2_PACKAGE_BOOST

Quoted 9 lines
package/libodb-boost/libodb.mk new file +3 -0
new file mode 100644
index 0000000000..b99d50fe9f
@@ -0,0 +1,15 @@
+################################################################################
+#
+# libodb-boost

package/libodb-boost/libodb.mk line 13

Quoted 10 lines
package/libodb-boost/libodb.mk new file +10 -0
+#
+################################################################################
+
+LIBODB_BOOST_VERSION_MAJOR = 2.4
+LIBODB_BOOST_VERSION = $(LIBODB_BOOST_VERSION_MAJOR).0
+LIBODB_BOOST_SOURCE = libodb-boost-$(LIBODB_BOOST_VERSION).tar.bz2
+LIBODB_BOOST_SITE = https://www.codesynthesis.com/download/odb/$(LIBODB_BOOST_VERSION_MAJOR)
+LIBODB_BOOST_INSTALL_STAGING = YES
+LIBODB_BOOST_LICENSE = GPL-2.0
+LIBODB_BOOST_LICENSE_FILES = LICENSE

No dependency on boost and/or libodb ?

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com