Dynamically link to mariadb-libs (pkgrel 1 linked dynamically but used static headers)

Remove now unused options related to c connector

2 files changed, 10 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a3f4bee9a125..5cc99cae1f6c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = mariadb-connector-odbc
 	pkgdesc = A standardized, LGPL licensed ODBC database driver for MariaDB
 	pkgver = 3.1.17
-	pkgrel = 1
+	pkgrel = 2
 	url = https://mariadb.com/kb/en/mariadb/mariadb-connector-odbc/
 	install = mariadb-connector-odbc.install
 	arch = x86_64
@@ -12,10 +12,9 @@ pkgbase = mariadb-connector-odbc
 	depends = unixodbc>=2.3
 	depends = openssl
 	depends = zlib
+	depends = mariadb-libs
 	conflicts = mariadb-connector-odbc-bin
 	source = https://downloads.mariadb.com/Connectors/odbc/connector-odbc-3.1.17/mariadb-connector-odbc-3.1.17-src.tar.gz
-	source = https://downloads.mariadb.com/Connectors/c/connector-c-3.3.2/mariadb-connector-c-3.3.2-src.tar.gz
 	sha256sums = d2eb92f1dd3eecc6e721a8172b6455afef77505a344a3d5e260ee2f7a02a6efc
-	sha256sums = 7e0722e07d30bb906fac9fe10fb582cde1e148e05a83d9ca7b6fcc884b68fbce
 
 pkgname = mariadb-connector-odbc
diff --git a/PKGBUILD b/PKGBUILD
index 33bdef0f9871..ff859655ddac 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,22 +5,21 @@ conflicts=('mariadb-connector-odbc-bin')
 pkgver=3.1.17
 _c_pkgver=3.3.2
 
-pkgrel=1
+pkgrel=2
 pkgdesc="A standardized, LGPL licensed ODBC database driver for MariaDB"
 arch=('x86_64' 'armv7h')
 url="https://mariadb.com/kb/en/mariadb/mariadb-connector-odbc/"
 license=('LGPL')
-depends=('unixodbc>=2.3' 'openssl' 'zlib')
+depends=('unixodbc>=2.3' 'openssl' 'zlib' 'mariadb-libs')
 makedepends=('git' 'cmake')
-source=("https://downloads.mariadb.com/Connectors/odbc/connector-odbc-${pkgver}/mariadb-connector-odbc-${pkgver}-src.tar.gz"
-        "https://downloads.mariadb.com/Connectors/c/connector-c-${_c_pkgver}/mariadb-connector-c-${_c_pkgver}-src.tar.gz")
-sha256sums=('d2eb92f1dd3eecc6e721a8172b6455afef77505a344a3d5e260ee2f7a02a6efc'
-            '7e0722e07d30bb906fac9fe10fb582cde1e148e05a83d9ca7b6fcc884b68fbce')
+source=("https://downloads.mariadb.com/Connectors/odbc/connector-odbc-${pkgver}/mariadb-connector-odbc-${pkgver}-src.tar.gz")
+sha256sums=('d2eb92f1dd3eecc6e721a8172b6455afef77505a344a3d5e260ee2f7a02a6efc')
 install=mariadb-connector-odbc.install
 
 prepare() {
     cd $pkgname-$pkgver-src
-    [ -d libmariadb ] || ln -s ../mariadb-connector-c-${_c_pkgver}-src libmariadb
+    # Arch is still installing libs to /usr/include/mysql while mariadb is expecting them at /usr/include/mariadb
+    sed -i -e 's#/usr/include/mariadb#/usr/include/mysql#g' CMakeLists.txt
     cd ..
     rm -Rf build
     mkdir build
@@ -30,12 +29,10 @@ build() {
     cd build
     cmake \
         -DCMAKE_BUILD_TYPE=RELEASE \
-        -DWITH_EXTERNAL_ZLIB=ON \
-        -DWITH_OPENSSL=ON \
-        -DWITH_SSL=OPENSSL \
+        -DMARIADB_LINK_DYNAMIC=ON \
+        -DUSE_SYSTEM_INSTALLED_LIB=ON \
         -DINSTALL_LIB_SUFFIX=lib \
         -DCMAKE_INSTALL_PREFIX=/usr \
-        -DMARIADB_UNIX_ADDR=/run/mysqld/mysqld.sock \
         ../$pkgname-$pkgver-src
     make
 }