forked from pool/mariadb-connector-c
- New upstream version 3.0.3 * Added support for new utf8mb4 character sets * MDEV-9059: Bundle first command with authentication packet * Build: support static OpenSSL on Windows * MDEV-14101: Add support for tls-version, via mysql_options(mysql, MARIADB_OPT_TLS_VERSION, value), where value must be "TLSv1.1", "TLSv1.2" or "TLSv1.3". * CONC-275: New indicator type STMT_INDICATOR_IGNORE_ROW for skipping particular parameter set in bulk operation (prepared statements). * MDEV-10361: Don't try to reconnect twice if mysql_ping failed. * Build fix for TSAN build with Clang * CONC-302: Fix output of mariadb_config * CONC-301: In case of a truncation the statement status was not updated correctly and further calls to mysql_stmt_fetch_column failed * MDEV-14647: Fixed crash when client receives extended ok packet with SESSION_TRACK_STATE_CHANGE information flag * CONC-297: setting MYSQL_OPT_LOCAL_INFILE failed on big endian systems. * MDEV-14514: mariadb_config returned wrong exit code when specifying an invalid option * MDEV-11546: Fixed timeout problem in Schannel * CONC-277: Allow reinitialization of the library if mysql_server_end() was called. * CONC-292: Fixed malloc result check in dynamic columns * MDEV-14165: The metadata length value for a column with a zerofill flag was calculated with a fixed length instead of using the reported length. * CONC-286: Force TLS/SSL usage if fingerprint parameters were OBS-URL: https://build.opensuse.org/request/show/598524 OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb-connector-c?expand=0&rev=26
50 lines
2.2 KiB
Diff
50 lines
2.2 KiB
Diff
Author: Adam Majer <amajer@suse.de>
|
||
Date: Fri Mar 3 15:59:09 CET 2017
|
||
Summary: Remove pure ugliness with paths
|
||
|
||
Index: mariadb-connector-c-3.0.3-src/mariadb_config/mariadb_config.c.in
|
||
===================================================================
|
||
--- mariadb-connector-c-3.0.3-src.orig/mariadb_config/mariadb_config.c.in
|
||
+++ mariadb-connector-c-3.0.3-src/mariadb_config/mariadb_config.c.in
|
||
@@ -5,14 +5,14 @@
|
||
|
||
static char *mariadb_progname;
|
||
|
||
-#define INCLUDE "-I@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@ -I@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@/mysql"
|
||
-#define LIBS "-L@CMAKE_INSTALL_PREFIX@/@INSTALL_LIBDIR@/ -lmariadb "\
|
||
+#define INCLUDE "-I@INSTALL_INCLUDEDIR@ -I@INSTALL_INCLUDEDIR@/mariadb"
|
||
+#define LIBS "-L@INSTALL_LIBDIR@ -lmariadb "\
|
||
"@extra_dynamic_LDFLAGS@"
|
||
#define LIBS_SYS "@extra_dynamic_LDFLAGS@"
|
||
#define CFLAGS INCLUDE
|
||
#define VERSION "@MARIADB_CLIENT_VERSION@"
|
||
#define CC_VERSION "@CPACK_PACKAGE_VERSION@"
|
||
-#define PLUGIN_DIR "@CMAKE_INSTALL_PREFIX@/@INSTALL_PLUGINDIR@"
|
||
+#define PLUGIN_DIR "@INSTALL_PLUGINDIR@"
|
||
#define SOCKET "@MARIADB_UNIX_ADDR@"
|
||
#define PORT "@MARIADB_PORT@"
|
||
#define TLS_LIBRARY_VERSION "@TLS_LIBRARY_VERSION@"
|
||
Index: mariadb-connector-c-3.0.3-src/mariadb_config/libmariadb.pc.in
|
||
===================================================================
|
||
--- mariadb-connector-c-3.0.3-src.orig/mariadb_config/libmariadb.pc.in
|
||
+++ mariadb-connector-c-3.0.3-src/mariadb_config/libmariadb.pc.in
|
||
@@ -6,14 +6,14 @@
|
||
# Dan Nicholson’s Guide to pkg-config (http://www.freedesktop.org/wiki/Software/pkg-config/)
|
||
#
|
||
|
||
-includedir=@PREFIX_INSTALL_DIR@/@INCLUDE_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@
|
||
-libdir=@PREFIX_INSTALL_DIR@/@INCLUDE_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@
|
||
+includedir=@INCLUDE_INSTALL_DIR@
|
||
+libdir=@INCLUDE_INSTALL_DIR@
|
||
prefix=@PREFIX_INSTALL_DIR@
|
||
|
||
Name: libmariadb
|
||
Version: @LIBMARIADB_VERSION@
|
||
Description: MariaDB Connector/C dynamic library
|
||
-Cflags: -I@PREFIX_INSTALL_DIR@/@INCLUDE_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ @CMAKE_C_FLAGS@
|
||
-Libs: -L@PREFIX_INSTALL_DIR@/@LIB_INSTALL_DIR@/@SUFFIX_INSTALL_DIR@ -lmariadb @extra_dynamic_LDFLAGS@
|
||
+Cflags: -I@INCLUDE_INSTALL_DIR@ @CMAKE_C_FLAGS@
|
||
+Libs: -L@LIB_INSTALL_DIR@ -lmariadb @extra_dynamic_LDFLAGS@
|
||
|
||
|