summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Bishop2018-08-22 08:14:27 -0400
committerAaron Bishop2018-08-22 08:14:27 -0400
commit1804f3276fe462d1042d538618b331d4936fdfba (patch)
treeb2f5164f70d25ff570f4d7298103cad2a0ca572f
parenta005f6ea8df968c08fc5ff4fb509d382f48f4bb8 (diff)
downloadaur-1804f3276fe462d1042d538618b331d4936fdfba.tar.gz
3.0.6
mariadb-connector-c is built as cmake dependency instead of making a makedepends use cmake to install ODBCLibs and Documentation components
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD30
2 files changed, 24 insertions, 16 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 71ad7243c151..0306fbb319c2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = mariadb-connector-odbc
pkgdesc = MariaDB Connector/ODBC is a standardized, LGPL licensed database driver using the industry standard ODBC API
- pkgver = 3.0.5
- pkgrel = 3
+ pkgver = 3.0.6
+ pkgrel = 1
url = https://mariadb.com/kb/en/mariadb/mariadb-connector-odbc/
install = mariadb-connector-odbc.install
arch = x86_64
@@ -13,8 +13,10 @@ pkgbase = mariadb-connector-odbc
depends = openssl
conflicts = mariadb-connector-odbc-bin
options = staticlibs
- source = https://downloads.mariadb.org/interstitial/connector-odbc-3.0.5/mariadb-connector-odbc-3.0.5-ga-src.tar.gz
- sha1sums = c2b26efbc9332dec5322a5de70436e5516cda8fa
+ source = https://downloads.mariadb.org/interstitial/connector-odbc-3.0.6/mariadb-connector-odbc-3.0.6-ga-src.tar.gz
+ source = https://downloads.mariadb.org/interstitial/connector-c-3.0.6/mariadb-connector-c-3.0.6-src.tar.gz
+ sha256sums = 1b45b801774ea356f56ca7eb5dc5d58df8c0e61893c9f9901c4d716e34d5d71d
+ sha256sums = 2b2d18dc969dc385f7f740e4db112300e11bc626c9ba9aa05c284704095b9e48
pkgname = mariadb-connector-odbc
diff --git a/PKGBUILD b/PKGBUILD
index 5418686b1198..225f486a3b8f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
pkgname=mariadb-connector-odbc
conflicts=('mariadb-connector-odbc-bin')
-pkgver=3.0.5
-pkgrel=3
+pkgver=3.0.6
+pkgrel=1
pkgdesc="MariaDB Connector/ODBC is a standardized, LGPL licensed database driver using the industry standard ODBC API"
arch=('x86_64' 'i686')
url="https://mariadb.com/kb/en/mariadb/mariadb-connector-odbc/"
@@ -11,15 +11,19 @@ license=('LGPL')
depends=('unixodbc>=2.3' 'openssl')
makedepends=('git' 'cmake')
options=('staticlibs')
-source=("https://downloads.mariadb.org/interstitial/connector-odbc-${pkgver}/${pkgname}-${pkgver}-ga-src.tar.gz")
+source=("https://downloads.mariadb.org/interstitial/connector-odbc-${pkgver}/${pkgname}-${pkgver}-ga-src.tar.gz"
+ "https://downloads.mariadb.org/interstitial/connector-c-${pkgver}/mariadb-connector-c-${pkgver}-src.tar.gz")
-sha1sums=('c2b26efbc9332dec5322a5de70436e5516cda8fa')
+sha256sums=('1b45b801774ea356f56ca7eb5dc5d58df8c0e61893c9f9901c4d716e34d5d71d'
+ '2b2d18dc969dc385f7f740e4db112300e11bc626c9ba9aa05c284704095b9e48')
install=mariadb-connector-odbc.install
prepare() {
- cd "$srcdir"
- rm -Rf build $pkgname-$pkgver-ga-src/CMakeCache.txt
+ cd $pkgname-$pkgver-ga-src
+ [ -d libmariadb ] || ln -s ../mariadb-connector-c-$pkgver-src libmariadb
+ cd ..
+ rm -Rf build
mkdir build
cd build
cmake ../$pkgname-$pkgver-ga-src \
@@ -31,14 +35,16 @@ prepare() {
build() {
cd build
- make maodbc
+ make
}
package() {
- # The cmake install is completely hosed right now so do it manually. It's only 3 files.
+ cd build
+ DESTDIR="$pkgdir" cmake -DCOMPONENT=ODBCLibs -P cmake_install.cmake
+ DESTDIR="$pkgdir" cmake -DCOMPONENT=Documentation -P cmake_install.cmake
cd "$pkgdir"
- mkdir -p usr/lib usr/share/licenses/$pkgname
- install "${srcdir}/build/libmaodbc.so" usr/lib/libmaodbc.so
- install "$srcdir/$pkgname-$pkgver-ga-src/COPYING" usr/share/licenses/$pkgname/COPYING
- install "$srcdir/$pkgname-$pkgver-ga-src/README" usr/share/licenses/$pkgname/README
+ mv usr/share/doc/{mariadb_connector_odbc,$pkgname}
+ [ -d usr/lib64 ] && mv usr/lib64 usr/lib
+ mkdir -p usr/share/licenses/$pkgname
+ mv usr/share/doc/$pkgname/COPYING usr/share/licenses/$pkgname/COPYING
}