db: change types to avoid headers changing between architectures

Triggered by looking at why Python doesn't find db.h (because it greps db.h for
a regex, and db.h is actually a oe_multilib_header wrapper) I realised that the
only reason we have to oe_multilib_header db.h is because one typedef is
different between 32-bit and 64-bit architectures.

However, the typedef is for a 64-bit integer so instead of using long (64-bit)
or long long (32-bit), just use int64_t.  Some of the overly complicated
configure tests need to be deleted after this change but that is safe as we're
building in a controlled environment and can assume int64_t exists.

With this done the header doesn't change between architectures, and it doesn't
need to be wrapped by oe_multilib_header.

(From OE-Core rev: 60aa20b8b691e5a72a6a11bf795b86c6359db886)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

2 files changed, 61 insertions, 3 deletions

diff --git a/meta/recipes-support/db/db/sequence-type.patch b/meta/recipes-support/db/db/sequence-type.patch
new file mode 100644
index 0000000000..a6fe3d62a0
--- /dev/null
+++ b/meta/recipes-support/db/db/sequence-type.patch
@@ -0,0 +1,59 @@
+configure wants to use host-specific types to get a 64-bit integer in db.h
+instead of using an alias such as int64_t.  This means that the header differs
+in multilib environments for no good reason, so replace the type with the alias
+in stdint.h.
+
+This then breaks the overly complicated type check but as we know that int64_t
+exists and works, we can just delete that.
+
+Upstream-Status: Pending
+Signed-off-by: Ross Burton <ross.burton@intel.com>
+
+--- a/dist/aclocal/sequence.m4~ 2013-09-09 16:35:02.000000000 +0100
++++ b/dist/aclocal/sequence.m4  2017-11-01 13:21:45.472295971 +0000
+@@ -24 +24 @@
+-               db_cv_seq_type="long"
++               db_cv_seq_type="int64_t"
+@@ -31 +31 @@
+-               db_cv_seq_type="long long"
++               db_cv_seq_type="int64_t"
+@@ -41,38 +41 @@
+-       # Test to see if we can declare variables of the appropriate size
+-       # and format them.  If we're cross-compiling, all we get is a link
+-       # test, which won't test for the appropriate printf format strings.
+-       if test "$db_cv_build_sequence" = "yes"; then
+-               AC_TRY_RUN([
+-               main() {
+-                       $db_cv_seq_type l;
+-                       unsigned $db_cv_seq_type u;
+-                       char buf@<:@100@:>@;
+-
+-                       buf@<:@0@:>@ = 'a';
+-                       l = 9223372036854775807LL;
+-                       (void)snprintf(buf, sizeof(buf), $db_cv_seq_fmt, l);
+-                       if (strcmp(buf, "9223372036854775807"))
+-                               return (1);
+-                       u = 18446744073709551615ULL;
+-                       (void)snprintf(buf, sizeof(buf), $db_cv_seq_ufmt, u);
+-                       if (strcmp(buf, "18446744073709551615"))
+-                               return (1);
+-                       return (0);
+-               }],, [db_cv_build_sequence="no"],
+-               AC_TRY_LINK(,[
+-                       $db_cv_seq_type l;
+-                       unsigned $db_cv_seq_type u;
+-                       char buf@<:@100@:>@;
+-
+-                       buf@<:@0@:>@ = 'a';
+-                       l = 9223372036854775807LL;
+-                       (void)snprintf(buf, sizeof(buf), $db_cv_seq_fmt, l);
+-                       if (strcmp(buf, "9223372036854775807"))
+-                               return (1);
+-                       u = 18446744073709551615ULL;
+-                       (void)snprintf(buf, sizeof(buf), $db_cv_seq_ufmt, u);
+-                       if (strcmp(buf, "18446744073709551615"))
+-                               return (1);
+-                       return (0);
+-               ],, [db_cv_build_sequence="no"]))
+-       fi
++       db_cv_build_sequence="yes"
diff --git a/meta/recipes-support/db/db_5.3.28.bb b/meta/recipes-support/db/db_5.3.28.bb
index 66282600f5..fb4befbaf7 100644
--- a/meta/recipes-support/db/db_5.3.28.bb
+++ b/meta/recipes-support/db/db_5.3.28.bb
@@ -23,6 +23,7 @@ SRC_URI += "file://arm-thumb-mutex_db5.patch \
             file://fix-parallel-build.patch \
             file://0001-atomic-Rename-local-__atomic_compare_exchange-to-avo.patch \
             file://0001-configure-Add-explicit-tag-options-to-libtool-invoca.patch \
+            file://sequence-type.patch \
            "
 # We are not interested in official latest 6.x versions;
 # let's track what debian is using.
@@ -34,7 +35,7 @@ SRC_URI[sha256sum] = "e0a992d740709892e81f9d93f06daf305cf73fb81b545afe7247804317
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=ed1158e31437f4f87cdd4ab2b8613955"
 
-inherit autotools multilib_header
+inherit autotools
 
 # Put virtual/db in any appropriate provider of a
 # relational database, use it as a dependency in
@@ -112,8 +113,6 @@ do_install_append() {
         ln -s db51/db.h ${D}/${includedir}/db.h
         ln -s db51/db_cxx.h ${D}/${includedir}/db_cxx.h
 
-        oe_multilib_header db51/db.h
-
         # The docs end up in /usr/docs - not right.
         if test -d "${D}/${prefix}/docs"
         then