[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb-connector-c/, dev-db/mariadb-connector-c/files/

["Thomas Deutschmann" <whissi@gentoo.org>]

commit:     23e96561eec030b2c42fc38a6a9b163aea2f1c88
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  2 16:24:45 2021 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Mar  2 17:15:44 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23e96561

dev-db/mariadb-connector-c: fix flow control statement

Closes: https://bugs.gentoo.org/772398
Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 ...adb-connector-c-3.1.11-fix-flow-control-statement.patch | 14 ++++++++++++++
 .../mariadb-connector-c/mariadb-connector-c-3.1.11.ebuild  |  3 ++-
 .../mariadb-connector-c/mariadb-connector-c-3.1.12.ebuild  |  1 +
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.1.11-fix-flow-control-statement.patch b/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.1.11-fix-flow-control-statement.patch
new file mode 100644
index 00000000000..0b5a2d44cec
--- /dev/null
+++ b/dev-db/mariadb-connector-c/files/mariadb-connector-c-3.1.11-fix-flow-control-statement.patch
@@ -0,0 +1,14 @@
+https://github.com/mariadb-corporation/mariadb-connector-c/pull/158
+
+--- a/cmake/ConnectorName.cmake
++++ b/cmake/ConnectorName.cmake
+@@ -22,7 +22,7 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Windows")
+     SET(MACHINE_NAME "x64")
+   ELSE()
+     SET(MACHINE_NAME "32")
+-  END()
++  ENDIF()
+ ENDIF()
+ 
+ SET(product_name "mysql-connector-c-${CPACK_PACKAGE_VERSION}-${PLATFORM_NAME}${CONCAT_SIGN}${MACHINE_NAME}")
+ 

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.11.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.11.ebuild
index 65abb644ccf..65570a7fd69 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.11.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -49,6 +49,7 @@ RDEPEND="${DEPEND}"
 PATCHES=(
 	"${FILESDIR}"/gentoo-layout-3.0.patch
 	"${FILESDIR}"/${PN}-3.1.3-fix-pkconfig-file.patch
+	"${FILESDIR}"/${PN}-3.1.11-fix-flow-control-statement.patch
 )
 
 src_configure() {

diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.12.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.12.ebuild
index f5b20304f80..80f4c976d4b 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.12.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.1.12.ebuild
@@ -49,6 +49,7 @@ RDEPEND="${DEPEND}"
 PATCHES=(
 	"${FILESDIR}"/gentoo-layout-3.0.patch
 	"${FILESDIR}"/${PN}-3.1.3-fix-pkconfig-file.patch
+	"${FILESDIR}"/${PN}-3.1.11-fix-flow-control-statement.patch
 )
 
 src_configure() {