Fix for CONC-271:

RPM layout now works for other 64-bit architectures than x86_64. Thx to Michal Schorn for contributing this patch.
mariadb-corporation · Jul 25, 2017 · 843c492 · 843c492
1 parent 35d6fb1
commit 843c492
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/cmake/install.cmake b/cmake/install.cmake
@@ -76,11 +76,11 @@ SET(INSTALL_PLUGINDIR_DEFAULT "lib/mariadb/plugin")
 # 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")