From 593691024ca7bcda4d52beb4d3deaea8c712434e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
Date: Sat, 22 Feb 2020 10:44:57 +0100
Subject: testing/mariadb-connector-odbc: fix build with CMake None build type

---
 testing/mariadb-connector-odbc/APKBUILD | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'testing')

diff --git a/testing/mariadb-connector-odbc/APKBUILD b/testing/mariadb-connector-odbc/APKBUILD
index 7890094d36..dc0d87f4de 100644
--- a/testing/mariadb-connector-odbc/APKBUILD
+++ b/testing/mariadb-connector-odbc/APKBUILD
@@ -17,16 +17,14 @@ build() {
 	if [ "$CBUILD" != "$CHOST" ]; then
 		CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
 	fi
-	cmake \
+	# Link to /usr/include/mysql necessary when using system installed mariadb-connector-c
+	CFLAGS="$CFLAGS -I/usr/include/mysql" \
+		cmake \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib \
 		-DBUILD_SHARED_LIBS=True \
 		-DCMAKE_BUILD_TYPE=None \
-		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-		-DCMAKE_C_FLAGS="$CFLAGS" \
-		-DCMAKE_C_FLAGS_RELEASE="-I/usr/include/mysql" \
 		${CMAKE_CROSSOPTS} .
-	# Link to /usr/include/mysql necessary when using system installed mariadb-connector-c
 	make
 }
 
-- 
cgit v1.2.3