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

49 lines
2.1 KiB
Diff
Raw Normal View History

Accepting request 482195 from home:adamm:branches:server:database Initial package of MariaDB Connector/C This package is required for other connectors, like MariaDB Connector/ODBC OBS-URL: https://build.opensuse.org/request/show/482195 OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb-connector-c?expand=0&rev=1
2017-03-23 12:15:46 +00:00
Author: Adam Majer <amajer@suse.de>
Date: Fri Mar 3 15:59:09 CET 2017
Summary: Remove pure ugliness with paths
Accepting request 523733 from home:kstreitova:branches:server:database - 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
2017-09-12 14:29:43 +00:00
Index: mariadb-connector-c-3.0.2-src/mariadb_config/mariadb_config.c.in
Accepting request 482195 from home:adamm:branches:server:database Initial package of MariaDB Connector/C This package is required for other connectors, like MariaDB Connector/ODBC OBS-URL: https://build.opensuse.org/request/show/482195 OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb-connector-c?expand=0&rev=1
2017-03-23 12:15:46 +00:00
===================================================================
Accepting request 523733 from home:kstreitova:branches:server:database - 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
2017-09-12 14:29:43 +00:00
--- 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 @@
Accepting request 482195 from home:adamm:branches:server:database Initial package of MariaDB Connector/C This package is required for other connectors, like MariaDB Connector/ODBC OBS-URL: https://build.opensuse.org/request/show/482195 OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb-connector-c?expand=0&rev=1
2017-03-23 12:15:46 +00:00
Accepting request 523733 from home:kstreitova:branches:server:database - 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
2017-09-12 14:29:43 +00:00
static char *mariadb_progname;
Accepting request 482195 from home:adamm:branches:server:database Initial package of MariaDB Connector/C This package is required for other connectors, like MariaDB Connector/ODBC OBS-URL: https://build.opensuse.org/request/show/482195 OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb-connector-c?expand=0&rev=1
2017-03-23 12:15:46 +00:00
Accepting request 523733 from home:kstreitova:branches:server:database - 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
2017-09-12 14:29:43 +00:00
-#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"
Accepting request 539318 from home:kstreitova:branches:server:database - mariadb-connector-c is now a provider of the libmariadb library for mariadb and others - add compatibility symlinks and Provides/Obsoletes - change LIBDIR, INCLUDEDIR and PLUGINDIR paths to be the same as it was in the mariadb package (compatibility reasons) - add baselibs.conf - add %{mariadb_version} macro that should correspond with the current version of the mariadb package - refresh absolute_path_fix.patch and private_library.patch OBS-URL: https://build.opensuse.org/request/show/539318 OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb-connector-c?expand=0&rev=17
2017-11-06 15:24:00 +00:00
+#define LIBS "-L@INSTALL_LIBDIR@ -lmariadb "\
Accepting request 523733 from home:kstreitova:branches:server:database - 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
2017-09-12 14:29:43 +00:00
"@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@"
Accepting request 539318 from home:kstreitova:branches:server:database - mariadb-connector-c is now a provider of the libmariadb library for mariadb and others - add compatibility symlinks and Provides/Obsoletes - change LIBDIR, INCLUDEDIR and PLUGINDIR paths to be the same as it was in the mariadb package (compatibility reasons) - add baselibs.conf - add %{mariadb_version} macro that should correspond with the current version of the mariadb package - refresh absolute_path_fix.patch and private_library.patch OBS-URL: https://build.opensuse.org/request/show/539318 OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb-connector-c?expand=0&rev=17
2017-11-06 15:24:00 +00:00
Index: mariadb-connector-c-3.0.2-src/mariadb_config/libmariadb.pc.in
===================================================================
--- mariadb-connector-c-3.0.2-src.orig/mariadb_config/libmariadb.pc.in
+++ mariadb-connector-c-3.0.2-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@
Reference in New Issue Copy Permalink