Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ODBC-311 Connector/ODBC libraries go to the wrong directories and it … #46

Merged
merged 1 commit into from Jun 11, 2021

Conversation

abychko
Copy link
Contributor

@abychko abychko commented May 13, 2021

…breaks packaging

  • enabled build with OpenSSL by default on UNIX
  • added deb and rpm variables to set the layout accordingly
  • added properly configured layout for rpm packages
  • added properly configured layout for deb packages

it's not possible to hardcode all multiarch tuples on debian without
GNUInstallDirs. so, only ia32 and amd64 are in place
now, install layout is fixed and project can be built/tested on other systems
(not deb and not rpm). it's only install_layout, so it doesn't include cpack packaging

CMakeLists.txt Show resolved Hide resolved
cmake/install.cmake Show resolved Hide resolved
cmake/install.cmake Outdated Show resolved Hide resolved
@abychko abychko force-pushed the master branch 4 times, most recently from db7fbdd to 9239796 Compare May 15, 2021 05:08
…breaks packaging

* enabled build with OpenSSL by default on UNIX
* added deb and rpm variables to set the layout accordingly
* added properly configured layout for rpm packages
* added properly configured layout for deb packages

it's not possible to hardcode all multiarch tuples on debian without
GNUInstallDirs. so, only ia32 and amd64 are in place
now, install layout is fixed and project can be built/tested on other systems
(not deb and not rpm)
SET(INSTALL_LIB_SUFFIX "lib" CACHE STRING "Directory, under which to install libraries, e.g. lib or lib64")
IF("${CMAKE_SIZEOF_VOID_P}" EQUAL "8" AND EXISTS "/usr/lib64/")
SET(INSTALL_LIB_SUFFIX "lib64")
ENDIF()
Copy link
Member

@vuvova vuvova May 21, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The link that Otto provided in ODBC-311, shows

-DINSTALL_LIBDIR=lib/$(DEB_HOST_MULTIARCH)/odbc

it seems to imply that libraries should go into /usr/lib/x86_64-linux-gnu/odbc and not into /usr/lib64/...
If it really is the Debian convention, you shouldn't do lib64 here for DEB

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's moved from main CMakeLists.txt to install.cmake to set default bintar paths.
and there are duplicated variables for the same things, yes, but I didn't introduce them

@lawrinn lawrinn merged commit 8ce387a into mariadb-corporation:master Jun 11, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants