summaryrefslogtreecommitdiff
path: root/dev-db
diff options
context:
space:
mode:
authorThomas Deutschmann <whissi@gentoo.org>2021-03-02 17:24:45 +0100
committerThomas Deutschmann <whissi@gentoo.org>2021-03-02 18:15:44 +0100
commit23e96561eec030b2c42fc38a6a9b163aea2f1c88 (patch)
treeaee4ce7a019e057755708cc1cfa4b5a880afa143 /dev-db
parentx11-misc/mugshot: drop old version (diff)
downloadgentoo-23e96561eec030b2c42fc38a6a9b163aea2f1c88.tar.gz
gentoo-23e96561eec030b2c42fc38a6a9b163aea2f1c88.tar.bz2
gentoo-23e96561eec030b2c42fc38a6a9b163aea2f1c88.zip
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@gentoo.org>
Diffstat (limited to 'dev-db')
-rw-r--r--dev-db/mariadb-connector-c/files/mariadb-connector-c-3.1.11-fix-flow-control-statement.patch14
-rw-r--r--dev-db/mariadb-connector-c/mariadb-connector-c-3.1.11.ebuild3
-rw-r--r--dev-db/mariadb-connector-c/mariadb-connector-c-3.1.12.ebuild1
3 files changed, 17 insertions, 1 deletions
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 000000000000..0b5a2d44cec5
--- /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 65abb644ccf7..65570a7fd69c 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 f5b20304f800..80f4c976d4b6 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() {