forked from pool/mariadb-connector-c
- Update to release 3.1.11: * CONC-513: MSAN use-of-uninitialized-value in strstr() * CONC-512: truncation check for float values fails on i386 due * to Intel FPU optimization bug in gcc * CONC-510: Fix crash when loading plugins in mysql_server_init() * CONC-508: Added support for passwords > 255 characters * CONC-507: Fixed race condition in ma_net_init * CONC-501: Added support for TLS v1.3 cipher suites * MDEV-21612: Removed unused command COM_MULTI - changes in release 3.1.10: * CONC-500: Fixed error when loading intermediate chained certificates * MDEV-18818: Fixed wrong zlib in mariadb_config when building inside server package * CONC-498: MYSQL_UNIX_ADDR and MYSQL_PORT are now defined * Added new build option WIITH_ICONV=ON/OFF. When set to OFF (default) API function mariadb_convert_string will always return -1 and sets errorcode to ENOTSUP. * mariadb_config now tries to determine the path of execution or uses MARIADB_CONFIG environment variable before falling back and using CMAKE_INSTALL_PREFIX for location of libraries and include files * added --variables option for mariadb_config. Supported values are pkgincludedir, pkglibdir and pkgplugindir. - absolute_path_fix.patch, private_library.patch: refreshed OBS-URL: https://build.opensuse.org/request/show/846503 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mariadb-connector-c?expand=0&rev=26
33 lines
1.1 KiB
Diff
33 lines
1.1 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.11-src/mariadb_config/libmariadb.pc.in
|
|
===================================================================
|
|
--- mariadb-connector-c-3.1.11-src.orig/mariadb_config/libmariadb.pc.in
|
|
+++ mariadb-connector-c-3.1.11-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@
|
|
Index: mariadb-connector-c-3.1.11-src/mariadb_config/mariadb_config.c.in
|
|
===================================================================
|
|
--- mariadb-connector-c-3.1.11-src.orig/mariadb_config/mariadb_config.c.in
|
|
+++ mariadb-connector-c-3.1.11-src/mariadb_config/mariadb_config.c.in
|
|
@@ -210,7 +210,7 @@ end:
|
|
}
|
|
if (!p || !p[0])
|
|
{
|
|
- strncpy(installation_dir, "@CMAKE_SYSROOT@@CMAKE_INSTALL_PREFIX@", PATH_MAX - 1);
|
|
+ installation_dir[0] = 0;
|
|
return;
|
|
}
|
|
}
|