Bug#37038213 Deb packages should use system zlib where possible

Post push fix: older Ubuntu platforms have too old zlib.

Change-Id: I3105cbb930518ba447718680740b75d39ba1078d

Author: trosten

packaging/deb-in/CMakeLists.txt

@@ -58,6 +58,13 @@ ENDIF()
 # Change uppercase first letter of Ubuntu/Debian
 string(TOLOWER "${DEB_ID}" DEB_ID)
 
+# Ubuntu 20.04 and 22.04 has too old zlib
+IF(DEB_CODENAME STREQUAL "focal" OR DEB_CODENAME STREQUAL "jammy")
+  SET (DEB_ZLIB_OPTION "bundled")
+ELSE()
+  SET (DEB_ZLIB_OPTION "system")
+ENDIF()
+
 IF (WITH_NDB)
   SET (DEB_BASE_PRODUCT "cluster-")
   SET (DEB_BASE_PRODUCTC "Cluster ")

packaging/deb-in/deb_commercial.cmake

@@ -37,7 +37,7 @@ SET (DEB_RULES_PROFILE_GENERATE
                 -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \\
                 -DWITH_INNODB_MEMCACHED=1 \\
                 -DWITH_MECAB=system \\
-                -DWITH_ZLIB=system \\
+                -DWITH_ZLIB=${DEB_ZLIB_OPTION} \\
                 -DWITH_NUMA=ON \\
                 -DCOMPILATION_COMMENT=\"MySQL ${DEB_PRODUCTNAMEC} - ${DEB_LICENSENAME}\" \\
                 -DCOMPILATION_COMMENT_SERVER=\"MySQL ${DEB_PRODUCTNAMEC} Server - ${DEB_LICENSENAME}\" \\

packaging/deb-in/deb_debug.cmake

@@ -35,7 +35,7 @@ SET (DEB_RULES_DEBUG_CMAKE
 		-DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \\
 		-DWITH_INNODB_MEMCACHED=1 \\
 		-DWITH_MECAB=system \\
-		-DWITH_ZLIB=system \\
+		-DWITH_ZLIB=${DEB_ZLIB_OPTION} \\
 		-DWITH_NUMA=ON \\
 		-DCOMPILATION_COMMENT=\"MySQL ${DEB_PRODUCTNAMEC} - ${DEB_LICENSENAME} - Debug\" \\
 		-DCOMPILATION_COMMENT_SERVER=\"MySQL ${DEB_PRODUCTNAMEC} Server - ${DEB_LICENSENAME} - Debug\" \\

packaging/deb-in/rules.in

@@ -58,7 +58,7 @@ override_dh_auto_configure:
 		-DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \
 		-DWITH_INNODB_MEMCACHED=1 \
 		-DWITH_MECAB=system \
-		-DWITH_ZLIB=system \
+		-DWITH_ZLIB=@DEB_ZLIB_OPTION@ \
 		-DWITH_NUMA=ON \
 		-DCOMPILATION_COMMENT="MySQL @DEB_PRODUCTNAMEC@ - @DEB_LICENSENAME@" \
 		-DCOMPILATION_COMMENT_SERVER="MySQL @DEB_PRODUCTNAMEC@ Server - @DEB_LICENSENAME@" \