From a1a915c3327e78203a76f05cd1c88a93e7ab0ee1 Mon Sep 17 00:00:00 2001
From: Ariadne Conill <ariadne@dereferenced.org>
Date: Fri, 29 May 2020 11:54:23 -0600
Subject: [PATCH] main/mariadb-connector-c: fix include and libdir paths in
mariadb_config
---
main/mariadb-connector-c/APKBUILD | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/main/mariadb-connector-c/APKBUILD b/main/mariadb-connector-c/APKBUILD
index 250c700745e6..2ec588932371 100644
--- a/main/mariadb-connector-c/APKBUILD
+++ b/main/mariadb-connector-c/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=mariadb-connector-c
pkgver=3.1.8
-pkgrel=0
+pkgrel=1
pkgdesc="The MariaDB Native Client library (C driver)"
url="https://mariadb.org/"
arch="all"
@@ -19,14 +19,16 @@ build() {
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
+
+ # INSTALL_LIBDIR and INSTALL_INCLUDEDIR are relative to CMAKE_INSTALL_PREFIX.
cmake \
-DCMAKE_BUILD_TYPE=None \
-DCMAKE_INSTALL_PREFIX=/usr \
-DBUILD_SHARED_LIBS=True \
-DCMAKE_BUILD_TYPE=None \
-DCMAKE_C_FLAGS="$CFLAGS" \
- -DINSTALL_LIBDIR=/usr/lib \
- -DINSTALL_INCLUDEDIR=/usr/include/mysql \
+ -DINSTALL_LIBDIR=lib \
+ -DINSTALL_INCLUDEDIR=include/mysql \
\
-DMARIADB_PORT=3306 \
-DMARIADB_UNIX_ADDR=/run/mysqld/mysqld.sock \
--
GitLab