summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Evans <grknight@tuffmail.com>2014-04-17 16:18:56 -0400
committerBrian Evans <grknight@tuffmail.com>2014-04-17 16:18:56 -0400
commit7515e4ec76382418d4746c5c22c150e27360f8a1 (patch)
tree10bf87af1b34b130cc8a536090d4141e90746264
parent[mariadb] Version bump (diff)
downloadmysql-7515e4ec76382418d4746c5c22c150e27360f8a1.tar.gz
mysql-7515e4ec76382418d4746c5c22c150e27360f8a1.tar.bz2
mysql-7515e4ec76382418d4746c5c22c150e27360f8a1.zip
[myodbc] Version bump
Signed-off-by: Brian Evans <grknight@tuffmail.com>
-rw-r--r--dev-db/myodbc/Manifest2
-rw-r--r--dev-db/myodbc/myodbc-5.2.6.ebuild (renamed from dev-db/myodbc/myodbc-5.2.5.ebuild)2
2 files changed, 3 insertions, 1 deletions
diff --git a/dev-db/myodbc/Manifest b/dev-db/myodbc/Manifest
index ed3dbfb..f52d0b6 100644
--- a/dev-db/myodbc/Manifest
+++ b/dev-db/myodbc/Manifest
@@ -1 +1 @@
-DIST mysql-connector-odbc-5.2.5-src.tar.gz 581313 SHA256 54e35c646bb4d972bc18fba40d486059aac336d838269bef8049d1d78ebfb96a SHA512 a503df647690073e5b6b02ea49b3db380e6524388addd37b9993dcc0d0fb325c0d1e0954bbbc5a01e5d59c1ee20aab021dce731f89debfe07e61f9caad31e5cc WHIRLPOOL f3c0e42760142436c84756f2c75c2351185be7ade9101d0ff6ecdd762d6421f01d8ce333673edef4a84c6b2c832a52e5ac47ec8403df376ba15df8e60480bed1
+DIST mysql-connector-odbc-5.2.6-src.tar.gz 595963 SHA256 005bba26358819bb5db48d23e8eb4a94cc234dfa103dd47a6c2602e7e70ad17b SHA512 9732b3034bdeb24700d0369d066fb43ca6f0327c2d3a3f1fff77d51ab37a83139536a7caae377791d979132c9640d67fddb4040095478924f4c8139ec6f404a5 WHIRLPOOL d8f0fc2cc7ec0b7602a2e6434d2680174dd50fe1d16dd03e0370ba1ec7807b09a83411e62aca3d68d540c1a564c759cbfea63c2d3adb6b642286a49d4dfc1330
diff --git a/dev-db/myodbc/myodbc-5.2.5.ebuild b/dev-db/myodbc/myodbc-5.2.6.ebuild
index 0dfdd64..7d1ee67 100644
--- a/dev-db/myodbc/myodbc-5.2.5.ebuild
+++ b/dev-db/myodbc/myodbc-5.2.6.ebuild
@@ -43,7 +43,9 @@ src_prepare() {
src_configure() {
# The RPM_BUILD flag does nothing except install to /usr/lib64 when "x86_64"
+ # MYSQL_CXX_LINKAGE expects "mysql_config --cxxflags" which doesn't exist on MariaDB
mycmakeargs+=(
+ -DMYSQL_CXX_LINKAGE=0
-DWITH_UNIXODBC=1
-DRPM_BUILD=1
-DMYSQL_LIB="$(mysql_config --variable=pkglibdir)/libmysqlclient_r.so"