forked from pool/mariadb-connector-c
- New upstream version 3.0.2 * Array support for prepared statements (bulk operations) * TLS/SSL support for GnuTLS, Windows SChannel and LibreSSL * Support for passphrase protected keys * SHA256 authentication plugin - refreshed * mariadb-connector-c-2.3.1_unresolved_symbols.patch * absolute_path_fix.patch * private_library.patch - change sover from 2 to 3 - tweak build options * DMYSQL_UNIX_ADDR is now DMARIADB_UNIX_ADDR * DPLUGIN_INSTALL_DIR is now DINSTALL_PLUGINDIR * add DINSTALL_LIBDIR, WITH_MYSQLCOMPAT and DWITH_SSL - now we build also the following plugins: * auth_gssapi_client.so * remote_io.so * sha256_password.so - move libmysqlclient* libraries to %{_libdir} OBS-URL: https://build.opensuse.org/request/show/523733 OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb-connector-c?expand=0&rev=13
26 lines
1.1 KiB
Diff
26 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.0.2-src/mariadb_config/mariadb_config.c.in
|
|
===================================================================
|
|
--- mariadb-connector-c-3.0.2-src.orig/mariadb_config/mariadb_config.c.in
|
|
+++ mariadb-connector-c-3.0.2-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@/mariadb -lmariadb" \
|
|
"@extra_dynamic_LDFLAGS@"
|
|
#define LIBS_SYS "@extra_dynamic_LDFLAGS@"
|
|
#define CFLAGS INCLUDE
|
|
#define VERSION "@MARIADB_CLIENT_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@"
|