From 0d626bb02373133e9ef9743f9763bbe6e0e50aaf Mon Sep 17 00:00:00 2001
From: mreid-tt <943378+mreid-tt@users.noreply.github.com>
Date: Thu, 12 Sep 2024 15:04:21 -0400
Subject: [PATCH 1/2] Update diesel to v2.2.4

---
 cross/diesel/Makefile | 4 ++--
 cross/diesel/digests  | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/cross/diesel/Makefile b/cross/diesel/Makefile
index 148d383f9d6..327b9556ed0 100644
--- a/cross/diesel/Makefile
+++ b/cross/diesel/Makefile
@@ -1,5 +1,5 @@
 PKG_NAME = diesel
-PKG_VERS = 2.1.6
+PKG_VERS = 2.2.4
 PKG_EXT = tar.gz
 PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://github.com/diesel-rs/diesel/archive
@@ -18,7 +18,7 @@ LICENSE  = MIT
 # build the cli tool for mysql
 RUST_SRC_DIR = $(WORK_DIR)/$(PKG_DIR)/diesel_cli
 CARGO_BUILD_ARGS += --no-default-features
-CARGO_BUILD_ARGS += --features=mysql
+CARGO_BUILD_ARGS += --features=mysql,mysqlclient-sys/buildtime_bindgen
 
 # we support MariaDB 10 only
 # we must define the mysql db socket, since the rust binaries (mysqlclient-sys)
diff --git a/cross/diesel/digests b/cross/diesel/digests
index 8edac5e464b..ecd70bac559 100644
--- a/cross/diesel/digests
+++ b/cross/diesel/digests
@@ -1,3 +1,3 @@
-diesel-2.1.6.tar.gz SHA1 ddb02dcb75dbfe03c8ab9cf905599390ae62d329
-diesel-2.1.6.tar.gz SHA256 60775915f615d41b65f31861ed01e467961677b7e430c6cc58d22c0b9bc17baf
-diesel-2.1.6.tar.gz MD5 294d6e5a841aaa4ec54ecf786f0e8993
+diesel-2.2.4.tar.gz SHA1 89cb0abb070116154fb1cf23f43bfd4e8ca77c33
+diesel-2.2.4.tar.gz SHA256 519e761055dea9abf6172b8ec15c0fd0da53c859e6b6809daeb104bbecd6fe57
+diesel-2.2.4.tar.gz MD5 da184bae3ccb2c4d1478da157196f46c

From 2650aa674081053645654f3878c534e244da2037 Mon Sep 17 00:00:00 2001
From: mreid-tt <943378+mreid-tt@users.noreply.github.com>
Date: Mon, 7 Oct 2024 18:15:24 -0400
Subject: [PATCH 2/2] Update mysql config

---
 cross/diesel/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cross/diesel/Makefile b/cross/diesel/Makefile
index 327b9556ed0..b2035285a62 100644
--- a/cross/diesel/Makefile
+++ b/cross/diesel/Makefile
@@ -25,8 +25,8 @@ CARGO_BUILD_ARGS += --features=mysql,mysqlclient-sys/buildtime_bindgen
 # do not read settings from bin/mysql_conf
 export "MYSQL_DB_SOCKET=/run/mysqld/mysqld10.sock"
 
-# mysqlclient-sys: to find libmysqlclient
-ENV += MYSQLCLIENT_LIB_DIR=$(STAGING_INSTALL_PREFIX)/lib
+# let ./configure find mysql_config (it is a script and works for cross compile)
+ENV += "PATH=$(PATH):$(STAGING_INSTALL_PREFIX)/bin"
 # to find dependencies of libmysqlclient (libz)
 ENV += RUSTFLAGS="-Clink-arg=-Wl,--rpath,$(INSTALL_PREFIX)/lib -Clink-arg=-Wl,--rpath-link,$(STAGING_INSTALL_PREFIX)/lib"