[arch-commits] Commit in mysql-connector-c++/repos (8 files)

Christian Hesse eworm at archlinux.org
Fri Jul 17 13:58:39 UTC 2015


    Date: Friday, July 17, 2015 @ 15:58:39
  Author: eworm
Revision: 137055

archrelease: copy trunk to community-testing-i686, community-testing-x86_64

Added:
  mysql-connector-c++/repos/community-testing-i686/
  mysql-connector-c++/repos/community-testing-i686/PKGBUILD
    (from rev 137054, mysql-connector-c++/trunk/PKGBUILD)
  mysql-connector-c++/repos/community-testing-i686/mariadb_api.patch
    (from rev 137054, mysql-connector-c++/trunk/mariadb_api.patch)
  mysql-connector-c++/repos/community-testing-i686/mysql_cxx_linkage.patch
    (from rev 137054, mysql-connector-c++/trunk/mysql_cxx_linkage.patch)
  mysql-connector-c++/repos/community-testing-x86_64/
  mysql-connector-c++/repos/community-testing-x86_64/PKGBUILD
    (from rev 137054, mysql-connector-c++/trunk/PKGBUILD)
  mysql-connector-c++/repos/community-testing-x86_64/mariadb_api.patch
    (from rev 137054, mysql-connector-c++/trunk/mariadb_api.patch)
  mysql-connector-c++/repos/community-testing-x86_64/mysql_cxx_linkage.patch
    (from rev 137054, mysql-connector-c++/trunk/mysql_cxx_linkage.patch)

--------------------------------------------------+
 community-testing-i686/PKGBUILD                  |   52 +++++++++++++++++++++
 community-testing-i686/mariadb_api.patch         |   13 +++++
 community-testing-i686/mysql_cxx_linkage.patch   |   13 +++++
 community-testing-x86_64/PKGBUILD                |   52 +++++++++++++++++++++
 community-testing-x86_64/mariadb_api.patch       |   13 +++++
 community-testing-x86_64/mysql_cxx_linkage.patch |   13 +++++
 6 files changed, 156 insertions(+)

Copied: mysql-connector-c++/repos/community-testing-i686/PKGBUILD (from rev 137054, mysql-connector-c++/trunk/PKGBUILD)
===================================================================
--- community-testing-i686/PKGBUILD	                        (rev 0)
+++ community-testing-i686/PKGBUILD	2015-07-17 13:58:39 UTC (rev 137055)
@@ -0,0 +1,52 @@
+# $Id$
+# Maintainer: Christian Hesse <mail at eworm.de>
+# Contributor: Marcel Korpel <marcel[dot]korpel[at]gmail>
+# Contributor: Muflone http://www.muflone.com/contacts/english/
+# Contributor: Ilya Kuznetsov <monochrome.r42 at gmail.com>
+# Contributor: Christian Hesse <mail at eworm.de>
+
+pkgname=mysql-connector-c++
+pkgver=1.1.6
+pkgrel=1
+pkgdesc='A MySQL database connector for C++'
+arch=('i686' 'x86_64')
+url='http://dev.mysql.com/doc/connector-cpp/en/'
+license=('GPL')
+depends=('libmariadbclient')
+makedepends=('cmake' 'boost')
+validpgpkeys=('A4A9406876FCBD3C456770C88C718D3B5072E1F5')
+source=("http://cdn.mysql.com/Downloads/Connector-C++/${pkgname}-${pkgver}.tar.gz"{,.asc}
+	'mysql_cxx_linkage.patch'
+	'mariadb_api.patch')
+sha256sums=('ad710b3900cae3be94656825aa70319cf7a96e1ad46bf93e07275f3606f69447'
+            'SKIP'
+            '65d3375f2c5a066d92a400a8eea90bf6001eafc57ec7aac56610f8829b42bb8c'
+            '1694ead0b9c9cb7803a76f56e3871b4f64f045a07fa390cf18bc15be798035ee')
+
+prepare() {
+	cd "${srcdir}/${pkgname}-${pkgver}/"
+
+	patch -Np1 < "${srcdir}/mysql_cxx_linkage.patch"
+	patch -Np1 < "${srcdir}/mariadb_api.patch"
+}
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}/"
+
+	cmake . -Wno-dev \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_INSTALL_LIBDIR=/usr/lib \
+		-DMYSQLCPPCONN_BUILD_EXAMPLES=OFF \
+		-DMYSQL_LIB=/usr/lib/libmysqlclient.so
+	make
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}/"
+
+	make DESTDIR="${pkgdir}" install
+
+	rm "${pkgdir}"/usr/{ANNOUNCEMENT,COPYING,README,INSTALL,Licenses_for_Third-Party_Components.txt,lib/libmysqlcppconn-static.a}
+}
+

Copied: mysql-connector-c++/repos/community-testing-i686/mariadb_api.patch (from rev 137054, mysql-connector-c++/trunk/mariadb_api.patch)
===================================================================
--- community-testing-i686/mariadb_api.patch	                        (rev 0)
+++ community-testing-i686/mariadb_api.patch	2015-07-17 13:58:39 UTC (rev 137055)
@@ -0,0 +1,13 @@
+diff --git a/driver/nativeapi/libmysql_static_proxy.cpp b/driver/nativeapi/libmysql_static_proxy.cpp
+index 703c0f3..1569e55 100644
+--- a/driver/nativeapi/libmysql_static_proxy.cpp
++++ b/driver/nativeapi/libmysql_static_proxy.cpp
+@@ -319,7 +319,7 @@ LibmysqlStaticProxy::options(MYSQL * mysql, enum mysql_option option, const void
+ int
+ LibmysqlStaticProxy::get_option(MYSQL * mysql, enum mysql_option option, const void *arg)
+ {
+-#if MYSQL_VERSION_ID >= 50703
++#if not defined MARIADB_BASE_VERSION && MYSQL_VERSION_ID >= 50703
+ 	if (::mysql_get_option(mysql, option, arg)) {
+ 		throw sql::InvalidArgumentException("Unsupported option provided to mysql_get_option()");
+ 	} else {

Copied: mysql-connector-c++/repos/community-testing-i686/mysql_cxx_linkage.patch (from rev 137054, mysql-connector-c++/trunk/mysql_cxx_linkage.patch)
===================================================================
--- community-testing-i686/mysql_cxx_linkage.patch	                        (rev 0)
+++ community-testing-i686/mysql_cxx_linkage.patch	2015-07-17 13:58:39 UTC (rev 137055)
@@ -0,0 +1,13 @@
+diff --git a/FindMySQL.cmake b/FindMySQL.cmake
+index c73337a..d76fdbd 100644
+--- a/FindMySQL.cmake
++++ b/FindMySQL.cmake
+@@ -462,7 +462,7 @@ if(NOT WIN32)
+     endif()
+ 
+     if(NOT MYSQL_CXXFLAGS)
+-      if(MYSQL_CXX_LINKAGE OR MYSQL_NUM_VERSION GREATER 50603)
++      if(MYSQL_CXX_LINKAGE)
+         _mysql_conf(MYSQL_CXXFLAGS "--cxxflags")
+         set(MYSQL_CXX_LINKAGE 1)
+       else()

Copied: mysql-connector-c++/repos/community-testing-x86_64/PKGBUILD (from rev 137054, mysql-connector-c++/trunk/PKGBUILD)
===================================================================
--- community-testing-x86_64/PKGBUILD	                        (rev 0)
+++ community-testing-x86_64/PKGBUILD	2015-07-17 13:58:39 UTC (rev 137055)
@@ -0,0 +1,52 @@
+# $Id$
+# Maintainer: Christian Hesse <mail at eworm.de>
+# Contributor: Marcel Korpel <marcel[dot]korpel[at]gmail>
+# Contributor: Muflone http://www.muflone.com/contacts/english/
+# Contributor: Ilya Kuznetsov <monochrome.r42 at gmail.com>
+# Contributor: Christian Hesse <mail at eworm.de>
+
+pkgname=mysql-connector-c++
+pkgver=1.1.6
+pkgrel=1
+pkgdesc='A MySQL database connector for C++'
+arch=('i686' 'x86_64')
+url='http://dev.mysql.com/doc/connector-cpp/en/'
+license=('GPL')
+depends=('libmariadbclient')
+makedepends=('cmake' 'boost')
+validpgpkeys=('A4A9406876FCBD3C456770C88C718D3B5072E1F5')
+source=("http://cdn.mysql.com/Downloads/Connector-C++/${pkgname}-${pkgver}.tar.gz"{,.asc}
+	'mysql_cxx_linkage.patch'
+	'mariadb_api.patch')
+sha256sums=('ad710b3900cae3be94656825aa70319cf7a96e1ad46bf93e07275f3606f69447'
+            'SKIP'
+            '65d3375f2c5a066d92a400a8eea90bf6001eafc57ec7aac56610f8829b42bb8c'
+            '1694ead0b9c9cb7803a76f56e3871b4f64f045a07fa390cf18bc15be798035ee')
+
+prepare() {
+	cd "${srcdir}/${pkgname}-${pkgver}/"
+
+	patch -Np1 < "${srcdir}/mysql_cxx_linkage.patch"
+	patch -Np1 < "${srcdir}/mariadb_api.patch"
+}
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}/"
+
+	cmake . -Wno-dev \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_INSTALL_LIBDIR=/usr/lib \
+		-DMYSQLCPPCONN_BUILD_EXAMPLES=OFF \
+		-DMYSQL_LIB=/usr/lib/libmysqlclient.so
+	make
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}/"
+
+	make DESTDIR="${pkgdir}" install
+
+	rm "${pkgdir}"/usr/{ANNOUNCEMENT,COPYING,README,INSTALL,Licenses_for_Third-Party_Components.txt,lib/libmysqlcppconn-static.a}
+}
+

Copied: mysql-connector-c++/repos/community-testing-x86_64/mariadb_api.patch (from rev 137054, mysql-connector-c++/trunk/mariadb_api.patch)
===================================================================
--- community-testing-x86_64/mariadb_api.patch	                        (rev 0)
+++ community-testing-x86_64/mariadb_api.patch	2015-07-17 13:58:39 UTC (rev 137055)
@@ -0,0 +1,13 @@
+diff --git a/driver/nativeapi/libmysql_static_proxy.cpp b/driver/nativeapi/libmysql_static_proxy.cpp
+index 703c0f3..1569e55 100644
+--- a/driver/nativeapi/libmysql_static_proxy.cpp
++++ b/driver/nativeapi/libmysql_static_proxy.cpp
+@@ -319,7 +319,7 @@ LibmysqlStaticProxy::options(MYSQL * mysql, enum mysql_option option, const void
+ int
+ LibmysqlStaticProxy::get_option(MYSQL * mysql, enum mysql_option option, const void *arg)
+ {
+-#if MYSQL_VERSION_ID >= 50703
++#if not defined MARIADB_BASE_VERSION && MYSQL_VERSION_ID >= 50703
+ 	if (::mysql_get_option(mysql, option, arg)) {
+ 		throw sql::InvalidArgumentException("Unsupported option provided to mysql_get_option()");
+ 	} else {

Copied: mysql-connector-c++/repos/community-testing-x86_64/mysql_cxx_linkage.patch (from rev 137054, mysql-connector-c++/trunk/mysql_cxx_linkage.patch)
===================================================================
--- community-testing-x86_64/mysql_cxx_linkage.patch	                        (rev 0)
+++ community-testing-x86_64/mysql_cxx_linkage.patch	2015-07-17 13:58:39 UTC (rev 137055)
@@ -0,0 +1,13 @@
+diff --git a/FindMySQL.cmake b/FindMySQL.cmake
+index c73337a..d76fdbd 100644
+--- a/FindMySQL.cmake
++++ b/FindMySQL.cmake
+@@ -462,7 +462,7 @@ if(NOT WIN32)
+     endif()
+ 
+     if(NOT MYSQL_CXXFLAGS)
+-      if(MYSQL_CXX_LINKAGE OR MYSQL_NUM_VERSION GREATER 50603)
++      if(MYSQL_CXX_LINKAGE)
+         _mysql_conf(MYSQL_CXXFLAGS "--cxxflags")
+         set(MYSQL_CXX_LINKAGE 1)
+       else()



More information about the arch-commits mailing list