maria-developers team mailing list archive

[Sergei Golubchik <serg@xxxxxxxxxxx>]

Hi, Sergey!

Ok to push.

I didn't like it at first, as x86_64 is amd64 on FreeBSD, x64 on
Windows, and I don't know what else can there be. For example, FreeBSD
doesn't use /usr/lib64.

But your change is for RPM packages only - so it's fine.

On Feb 18, Sergey Vojtovich wrote:
> revision-id: fd8e846a3b049903706267d58e6d8e61eea97df8 (mariadb-10.1.11-17-gfd8e846)
> parent(s): db5b51fb7e3360d4ebc303bd67363bc8324e86b6
> committer: Sergey Vojtovich
> timestamp: 2016-02-18 11:01:22 +0400
> message:
> 
> MDEV-9564 - added s390x to lib64 INSTALL_LIBDIR handling
> 
> Adjusted INSTALL_LIBDIR detection so that it is set to "lib64" on any 64bit
> system (not only x86_64). New condition is insipired by GNUInstallDirs cmake
> module.
> 
> ---
>  cmake/install_layout.cmake | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/cmake/install_layout.cmake b/cmake/install_layout.cmake
> index 757166b..d1a261f 100644
> --- a/cmake/install_layout.cmake
> +++ b/cmake/install_layout.cmake
> @@ -137,7 +137,7 @@ SET(INSTALL_SCRIPTDIR_RPM               "bin")
>  SET(INSTALL_SYSCONFDIR_RPM		"/etc")
>  SET(INSTALL_SYSCONF2DIR_RPM             "/etc/my.cnf.d")
>  #
> -IF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
> +IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
>    SET(INSTALL_LIBDIR_RPM                "lib64")
>    SET(INSTALL_PLUGINDIR_RPM             "lib64/mysql/plugin")
>  ELSE()

Regards,
Sergei
Chief Architect MariaDB
and security@xxxxxxxxxxx