Accepting request 895835 from home:kstreitova:branches:server:database
- set INSTALL_LAYOUT=RPM and adjust libdir, includedir, plugindir and pcdir values to fix mariadb_config output. Also fix the missing "%s" in private_library.patch so it shows the correct path for plugindir [bsc#1179921] [bsc#1183878] OBS-URL: https://build.opensuse.org/request/show/895835 OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb-connector-c?expand=0&rev=68
This commit is contained in:
parent
ce9f01eb7c
commit
eae9b5c259
@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu May 27 18:48:59 UTC 2021 - Kristyna Streitova <kstreitova@suse.com>
|
||||
|
||||
- set INSTALL_LAYOUT=RPM and adjust libdir, includedir, plugindir
|
||||
and pcdir values to fix mariadb_config output. Also fix the
|
||||
missing "%s" in private_library.patch so it shows the correct
|
||||
path for plugindir [bsc#1179921] [bsc#1183878]
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu May 27 09:31:16 UTC 2021 - Kristyna Streitova <kstreitova@suse.com>
|
||||
|
||||
|
@ -127,12 +127,13 @@ export CFLAGS="%{optflags} -fno-strict-aliasing"
|
||||
%endif
|
||||
-DWITH_EXTERNAL_ZLIB:BOOL=ON \
|
||||
-DMARIADB_UNIX_ADDR:STRING=%{_rundir}/mysql/mysql.sock \
|
||||
-DINSTALL_LIBDIR:STRING=%{_libdir} \
|
||||
-DINSTALL_INCLUDEDIR:STRING=%{_includedir}/mysql \
|
||||
-DINSTALL_PLUGINDIR:STRING=%{_libdir}/mysql/plugin/ \
|
||||
-DINSTALL_LAYOUT=RPM \
|
||||
-DINSTALL_LIBDIR:STRING=%{_lib} \
|
||||
-DINSTALL_INCLUDEDIR:STRING=include/mysql \
|
||||
-DINSTALL_PLUGINDIR:STRING=%{_lib}/mysql/plugin/ \
|
||||
-DWITH_MYSQLCOMPAT=ON \
|
||||
-DWITH_SSL=OPENSSL \
|
||||
-DINSTALL_PCDIR="%{_libdir}/pkgconfig"
|
||||
-DINSTALL_PCDIR="%{_lib}/pkgconfig"
|
||||
%make_jobs
|
||||
|
||||
%install
|
||||
|
@ -8,10 +8,10 @@ static linking, create a private shared library that simply
|
||||
exports all symbols. With the exception of exported symbols, it is
|
||||
identical to the regular library.
|
||||
|
||||
Index: mariadb-connector-c-3.1.11-src/libmariadb/CMakeLists.txt
|
||||
Index: mariadb-connector-c-3.1.13-src/libmariadb/CMakeLists.txt
|
||||
===================================================================
|
||||
--- mariadb-connector-c-3.1.11-src.orig/libmariadb/CMakeLists.txt
|
||||
+++ mariadb-connector-c-3.1.11-src/libmariadb/CMakeLists.txt
|
||||
--- mariadb-connector-c-3.1.13-src.orig/libmariadb/CMakeLists.txt
|
||||
+++ mariadb-connector-c-3.1.13-src/libmariadb/CMakeLists.txt
|
||||
@@ -414,6 +414,12 @@ IF(CMAKE_SIZEOF_VOID_P EQUAL 8 AND MSVC)
|
||||
SET_TARGET_PROPERTIES(mariadbclient PROPERTIES STATIC_LIBRARY_FLAGS "/machine:x64")
|
||||
ENDIF()
|
||||
@ -50,15 +50,15 @@ Index: mariadb-connector-c-3.1.11-src/libmariadb/CMakeLists.txt
|
||||
|
||||
IF(MSVC)
|
||||
# On Windows, install PDB
|
||||
Index: mariadb-connector-c-3.1.11-src/mariadb_config/mariadb_config.c.in
|
||||
Index: mariadb-connector-c-3.1.13-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
|
||||
--- mariadb-connector-c-3.1.13-src.orig/mariadb_config/mariadb_config.c.in
|
||||
+++ mariadb-connector-c-3.1.13-src/mariadb_config/mariadb_config.c.in
|
||||
@@ -30,6 +30,7 @@ static char *mariadb_progname;
|
||||
#define INCLUDE "-I%s/@INSTALL_INCLUDEDIR@ -I%s/@INSTALL_INCLUDEDIR@/mysql"
|
||||
#define LIBS "-L%s/@INSTALL_LIBDIR@/ -lmariadb"
|
||||
#define LIBS_SYS "@extra_dynamic_LDFLAGS@"
|
||||
+#define PRIVATE_LIBS "-L@INSTALL_LIBDIR@ -lmariadbprivate " LIBS_SYS
|
||||
+#define PRIVATE_LIBS "-L%s/@INSTALL_LIBDIR@ -lmariadbprivate " LIBS_SYS
|
||||
#define CFLAGS INCLUDE
|
||||
#define VERSION "@MARIADB_CLIENT_VERSION@"
|
||||
#define CC_VERSION "@CPACK_PACKAGE_VERSION@"
|
||||
|
Loading…
Reference in New Issue
Block a user