[MDEV-22053] Missing support for Debian Install Layout in C/C subproject Created: 2020-03-26  Updated: 2020-04-14  Resolved: 2020-04-14

Status: Closed
Project: MariaDB Server
Component/s: Packaging
Affects Version/s: 10.2
Fix Version/s: 10.5.3

Type: Bug Priority: Major
Reporter: Georg Richter Assignee: Otto Kekäläinen
Resolution: Fixed Votes: 0
Labels: None

Issue Links:
Blocks
blocks CONC-304 Rename the static library to libmaria... Closed
blocks CONC-456 Implement INSTALL_PLUGINDIR build fla... Closed

 Description   

Building the server package with cmake parameter -DINSTALL_LAYOUT=DEB will result in wrong installation directories for Connector/C.

How to fix:

--- a/cmake/mariadb_connector_c.cmake
 
+++ b/cmake/mariadb_connector_c.cmake
 
@@ -24,6 +24,8 @@ SET(CONC_WITH_MYSQLCOMPAT ON)
 
 
 IF (INSTALL_LAYOUT STREQUAL "RPM")
 
   SET(CONC_INSTALL_LAYOUT "RPM")
 
+ELSEIF (INSTALL_LAYOUT STREQUAL "DEB")
 
+  SET(CONC_INSTALL_LAYOUT "DEB")
 
 ELSE()
 
   SET(CONC_INSTALL_LAYOUT "DEFAULT")
 
 ENDIF()



 Comments   
Comment by Otto Kekäläinen [ 2020-03-26 ]

You can't change this on 10.2, that would change the file paths and break packaging in stable releases 10.2, 10.3 and 10.4. This is OK to do in 10.5 and I am already working on it. However, this change does not seem to be enough, I'll post you more details later.. Assigned to myself, no point in Sergei putting time on this now when he did not have time to do this in the past month. I have enough info from Georg to complete this.

Comment by Otto Kekäläinen [ 2020-03-26 ]

It does not work because in libmariadb/install.cmake there is at the bottom the section that starts like this:

#
 
# Overwrite defaults
 
#
 
...
 
IF(INSTALL_PLUGINDIR)
 
  SET(INSTALL_PLUGINDIR_${INSTALL_LAYOUT} ${INSTALL_PLUGINDIR})
 
ENDIF()

The server passes a value for INSTALL_PLUGINDIR, so the INSTALL_PLUGINDIR_DEB has no function.

Comment by Otto Kekäläinen [ 2020-03-26 ]

Related PR: https://github.com/mariadb-corporation/mariadb-connector-c/pull/130

Comment by Otto Kekäläinen [ 2020-03-26 ]

Fixing PR: https://github.com/MariaDB/server/pull/1468/commits

Follow-up PR: https://github.com/MariaDB/server/pull/1478

Comment by Otto Kekäläinen [ 2020-04-14 ]

This was closed via https://github.com/MariaDB/server/commit/4bc31a904f22290801075deed949733ba2133974

Generated at Thu Feb 08 09:11:50 UTC 2024 using Jira 8.20.16#820016-sha1:9d11dbea5f4be3d4cc21f03a88dd11d8c8687422.