0002-mariadb-FTBFS-fix.patch 1.4 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051
  1. From 552474a477989d0d3514f126b8e314dccc27878c Mon Sep 17 00:00:00 2001
  2. From: Kamel Bouhara <kamel.bouhara@bootlin.com>
  3. Date: Wed, 1 Jul 2020 08:58:24 +0200
  4. Subject: [PATCH] mariadb FTBFS fix
  5. From: https://sources.debian.org/patches/libodb-mysql/2.4.0-4/mariadb_FTBFS_fix.patch/
  6. Description: fix FTBFS with recent MariaDB versions
  7. Don't include internal an header, only the main one.
  8. Bug-Debian: https://bugs.debian.org/919374
  9. Forwarded: no
  10. Author: Laszlo Boszormenyi (GCS) <gcs@debian.org>
  11. Signed-off-by: Kamel Bouhara <kamel.bouhara@bootlin.com>
  12. ---
  13. odb/mysql/mysql-types.hxx | 4 ++--
  14. odb/mysql/version.hxx | 2 +-
  15. 2 files changed, 3 insertions(+), 3 deletions(-)
  16. diff --git a/odb/mysql/mysql-types.hxx b/odb/mysql/mysql-types.hxx
  17. index 1254ccd..0e8f9a8 100644
  18. --- a/odb/mysql/mysql-types.hxx
  19. +++ b/odb/mysql/mysql-types.hxx
  20. @@ -11,9 +11,9 @@ typedef char my_bool;
  21. typedef struct st_mysql_bind MYSQL_BIND;
  22. #ifdef LIBODB_MYSQL_INCLUDE_SHORT
  23. -# include <mysql_time.h>
  24. +# include <mysql.h>
  25. #else
  26. -# include <mysql/mysql_time.h>
  27. +# include <mysql/mysql.h>
  28. #endif
  29. #endif // ODB_MYSQL_MYSQL_TYPES_HXX
  30. diff --git a/odb/mysql/version.hxx b/odb/mysql/version.hxx
  31. index 05b4ba5..e711c2e 100644
  32. --- a/odb/mysql/version.hxx
  33. +++ b/odb/mysql/version.hxx
  34. @@ -12,7 +12,7 @@
  35. #ifdef LIBODB_MYSQL_INCLUDE_SHORT
  36. # include <mysql_version.h>
  37. #else
  38. -# include <mysql/mysql_version.h>
  39. +# include <mysql/mysql.h>
  40. #endif
  41. #include <odb/version.hxx>
  42. --
  43. 2.26.2