039fdbed92
Related: #1501933 Add 'Conflicts' with mariadb package on F<28 Related: #1506441 Patch extension
34 lines
1.6 KiB
Diff
34 lines
1.6 KiB
Diff
--- mariadb-connector-c-3.0.2-src/cmake/install.cmake 2017-07-19 11:31:02.000000000 +0200
|
|
+++ mariadb-connector-c-3.0.2-src/cmake/install.cmake.patched 2017-07-24 18:04:45.791679206 +0200
|
|
@@ -76,11 +76,11 @@ SET(INSTALL_PLUGINDIR_DEFAULT "lib/maria
|
|
# RPM layout
|
|
#
|
|
SET(INSTALL_BINDIR_RPM "bin")
|
|
-IF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64" AND CMAKE_SIZEOF_VOID_P EQUAL 8)
|
|
+IF((CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64le" OR CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "s390x") AND CMAKE_SIZEOF_VOID_P EQUAL 8)
|
|
SET(INSTALL_LIBDIR_RPM "lib64/mariadb")
|
|
SET(INSTALL_PLUGINDIR_RPM "lib64/mariadb/plugin")
|
|
ELSE()
|
|
- SET(INSTALL_LIBDIR_RPM "lib")
|
|
+ SET(INSTALL_LIBDIR_RPM "lib/mariadb")
|
|
SET(INSTALL_PLUGINDIR_RPM "lib/mariadb/plugin")
|
|
ENDIF()
|
|
SET(INSTALL_INCLUDEDIR_RPM "include")
|
|
|
|
|
|
|
|
|
|
--- mariadb-connector-c-3.0.2-src/mariadb_config/mariadb_config.c.in 2017-07-19 11:31:02.000000000 +0200
|
|
+++ mariadb-connector-c-3.0.2-src/mariadb_config/mariadb_config.c.in_patched 2017-10-25 12:32:42.075324299 +0200
|
|
@@ -5,8 +5,8 @@
|
|
|
|
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@"
|
|
+#define LIBS "-L@INSTALL_LIBDIR@/ -lmariadb "\
|
|
"@extra_dynamic_LDFLAGS@"
|
|
#define LIBS_SYS "@extra_dynamic_LDFLAGS@"
|
|
#define CFLAGS INCLUDE
|