summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Bishop2017-10-16 17:03:14 -0400
committerAaron Bishop2017-10-16 17:03:14 -0400
commitf925e229f49edafde73b469f043639c9b6d4bb61 (patch)
tree5d3c8bf58d11c7b7bf581bdc79aad75a01b7bac3
parent87b3dc009f4890941f0053315e581c36c7e170a1 (diff)
parentf86b4379889e9718039e5858ea07522d692bc943 (diff)
downloadaur-f925e229f49edafde73b469f043639c9b6d4bb61.tar.gz
Merge branch 'master' of ssh://arch-aur/mariadb-connector-odbc
# Conflicts: # .SRCINFO # PKGBUILD
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD14
2 files changed, 8 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 587fa066424f..1997248448dd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -8,7 +8,7 @@ pkgbase = mariadb-connector-odbc
arch = i686
license = LGPL
makedepends = mariadb-connector-c>=3
- depends = unixodbc
+ depends = unixodbc>=2.3
depends = openssl
conflicts = mariadb-connector-odbc-bin
options = staticlibs
diff --git a/PKGBUILD b/PKGBUILD
index 5bae78e8af5d..55006d722c16 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@ pkgdesc="MariaDB Connector/ODBC is a standardized, LGPL licensed database driver
arch=('x86_64' 'i686')
url="https://mariadb.com/kb/en/mariadb/mariadb-connector-odbc/"
license=('LGPL')
-depends=('unixodbc' 'openssl')
+depends=('unixodbc>=2.3' 'openssl')
makedepends=('mariadb-connector-c>=3')
options=('staticlibs')
source=("https://downloads.mariadb.org/interstitial/connector-odbc-${pkgver}/${pkgname}-${pkgver}-ga-src.tar.gz"
@@ -28,12 +28,12 @@ prepare() {
mkdir build
cd build
cmake ../$pkgname-$pkgver-ga-src \
- -DCMAKE_BUILD_TYPE=RELEASE \
- -DWITH_EXTERNAL_ZLIB=ON \
- -DWITH_SQLITE=OFF \
- -DWITH_OPENSSL=ON \
- -DWITH_MYSQLCOMPAT=ON \
- -DCMAKE_INSTALL_PREFIX=/usr
+ -G"Unix Makefiles" \
+ -DWITH_OPENSSL=ON \
+ -DCMAKE_BUILD_TYPE=release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DMARIADB_INCLUDE_DIR=/usr/include/mariadb \
+ -DMARIADB_LIBRARY_DIR=/usr/lib/mariadb
}
build() {