pool/mariadb-connector-c
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 889355 from server:database

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/889355
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mariadb-connector-c?expand=0&rev=28
This commit is contained in:
Dominique Leuenberger 2021-04-30 22:46:20 +00:00 committed by Git OBS Bridge
parent c5494e8ea2
commit 88457f6c78
3 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
mariadb-connector-c-cmake-3.20.patch Normal file
View File

@ -0,0 +1,24 @@
From 242cab8cbcd91af882233730a83627d3b12ced83 Mon Sep 17 00:00:00 2001
From: Vladislav Vaintroub <wlad@mariadb.com>
Date: Fri, 12 Mar 2021 00:01:11 +0100
Subject: [PATCH] Fix syntax error in cmake 3.20
https://github.com/mariadb-corporation/mariadb-connector-c/commit/242cab8cbc
---
cmake/ConnectorName.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cmake/ConnectorName.cmake b/cmake/ConnectorName.cmake
index b7bbbad8..357b8ac0 100644
--- 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}")

8
mariadb-connector-c.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Apr 29 12:04:20 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
- Add mariadb-connector-c-cmake-3.20.patch: Fix build with cmake
3.20.
-------------------------------------------------------------------
Wed Mar 3 23:31:24 UTC 2021 - Kristyna Streitova <kstreitova@suse.com>
@ -7,7 +13,7 @@ Wed Mar 3 23:31:24 UTC 2021 - Kristyna Streitova <kstreitova@suse.com>
* CONC-521: Fixed warning on MacOS when including ucontext.h
* CONC-518: Check if mysql->options.extension was allocated before
checking async_context
* CONC-517: C/C looks for plugins in wrong location on Windows
* CONC-517: C/C looks for plugins in wrong location on Windows
-------------------------------------------------------------------
Thu Nov 5 13:53:30 UTC 2020 - Adam Majer <adam.majer@suse.de>

2
mariadb-connector-c.spec
View File

@ -39,6 +39,7 @@ Source3: baselibs.conf
Patch1: mariadb-connector-c-2.3.1_unresolved_symbols.patch
Patch3: absolute_path_fix.patch
Patch4: private_library.patch
Patch5: mariadb-connector-c-cmake-3.20.patch
BuildRequires: cmake
BuildRequires: curl-devel
BuildRequires: pkgconfig
@ -115,6 +116,7 @@ This package holds the development files.
%patch1 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%build
# plugin types seems to require no aliasing assumptions