From 0926673826f850b82a0d808325699653e7e9cef1 Mon Sep 17 00:00:00 2001
From: mreid-tt <943378+mreid-tt@users.noreply.github.com>
Date: Fri, 1 Dec 2023 13:45:44 -0400
Subject: [PATCH] Amend fix for mysqlclient dependencies

---
 cross/syncstorage-rs/Makefile | 2 --
 spk/ffsync/Makefile           | 4 ++++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/cross/syncstorage-rs/Makefile b/cross/syncstorage-rs/Makefile
index 234d6e519c4..4567c296126 100644
--- a/cross/syncstorage-rs/Makefile
+++ b/cross/syncstorage-rs/Makefile
@@ -24,8 +24,6 @@ CARGO_BUILD_ARGS += --locked
 DEPENDS = cross/openssl3
 # for mysqlclient
 DEPENDS += cross/mysql-connector-c
-ENV += MYSQLCLIENT_CFLAGS="$(CFLAGS) -I$(STAGING_INSTALL_PREFIX)/include/mysql -I$(STAGING_INSTALL_PREFIX)/$(PYTHON_INC_DIR)"
-ENV += MYSQLCLIENT_LDFLAGS="$(LDFLAGS)"
 
 # To find libpython in prebuilt or local built python
 ifneq ($(PYTHON_STAGING_PREFIX),)
diff --git a/spk/ffsync/Makefile b/spk/ffsync/Makefile
index 80600d110ab..206666f96eb 100644
--- a/spk/ffsync/Makefile
+++ b/spk/ffsync/Makefile
@@ -35,6 +35,10 @@ ADMIN_PORT = $(SERVICE_PORT)
 
 CONF_DIR         = src/conf/
 
+# [mysqlclient]
+ENV += MYSQLCLIENT_CFLAGS="$(CFLAGS) -I$(STAGING_INSTALL_PREFIX)/include/mysql -I$(STAGING_INSTALL_PREFIX)/$(PYTHON_INC_DIR)"
+ENV += MYSQLCLIENT_LDFLAGS="$(LDFLAGS)"
+
 POST_STRIP_TARGET = ffsync_extra_install
 
 include ../../mk/spksrc.python.mk