d3a5a03ace
- New upstream version 3.1.3
* CONC-380: Fix CMake warnings
* CONC-345: heap-use-after-free in client_mpvio_read_packet
* CONC-423: Fix GnuTLS error with TLSv1.3
* CONC-424: Ignore SERVER_STATUS_CURSOR_EXISTS if client didn't
open a cursor before
* CONC-421: Fixed crash in GnuTLS when key and certificate are
in the same file
* CONC-429: Don't allow invalid characters in plugin names
* MDEV-19807: Fixed Location of PLUGINDIR if Connector/C is a
subproject
- refresh absolute_path_fix.patch and private_library.patch
OBS-URL: https://build.opensuse.org/request/show/721026
OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb-connector-c?expand=0&rev=45
41 lines
1.7 KiB
Diff
41 lines
1.7 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.1.3-src/mariadb_config/mariadb_config.c.in
|
|
===================================================================
|
|
--- mariadb-connector-c-3.1.3-src.orig/mariadb_config/mariadb_config.c.in
|
|
+++ mariadb-connector-c-3.1.3-src/mariadb_config/mariadb_config.c.in
|
|
@@ -5,13 +5,13 @@
|
|
|
|
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"
|
|
#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.1.3-src/mariadb_config/libmariadb.pc.in
|
|
===================================================================
|
|
--- mariadb-connector-c-3.1.3-src.orig/mariadb_config/libmariadb.pc.in
|
|
+++ mariadb-connector-c-3.1.3-src/mariadb_config/libmariadb.pc.in
|
|
@@ -7,8 +7,8 @@
|
|
#
|
|
|
|
prefix=@CMAKE_INSTALL_PREFIX@
|
|
-includedir=${prefix}/@INSTALL_INCLUDEDIR@/@SUFFIX_INSTALL_DIR@
|
|
-libdir=${prefix}/@INSTALL_LIBDIR@/@SUFFIX_INSTALL_DIR@
|
|
+includedir=@INSTALL_INCLUDEDIR@
|
|
+libdir=@INSTALL_LIBDIR@
|
|
|
|
Name: libmariadb
|
|
Version: @CPACK_PACKAGE_VERSION@
|