Skip to content

Commit 0077b1b

Browse files
committed
Bug#37038213 Deb packages should use system zlib
Convert deb build script to use zlib from system. Also turn off maintainer mode of debug build as debuild might add extra compiler options. Change-Id: I667ff7aabe4c3dea4f7cb31db51663517dc6cdc2
1 parent be463c1 commit 0077b1b

File tree

3 files changed

+4
-0
lines changed

3 files changed

+4
-0
lines changed

packaging/deb-in/deb_commercial.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ SET (DEB_RULES_PROFILE_GENERATE
3737
-DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \\
3838
-DWITH_INNODB_MEMCACHED=1 \\
3939
-DWITH_MECAB=system \\
40+
-DWITH_ZLIB=system \\
4041
-DWITH_NUMA=ON \\
4142
-DCOMPILATION_COMMENT=\"MySQL ${DEB_PRODUCTNAMEC} - ${DEB_LICENSENAME}\" \\
4243
-DCOMPILATION_COMMENT_SERVER=\"MySQL ${DEB_PRODUCTNAMEC} Server - ${DEB_LICENSENAME}\" \\

packaging/deb-in/deb_debug.cmake

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,14 @@ SET (DEB_RULES_DEBUG_CMAKE
2828
-DBUILD_CONFIG=mysql_release \\
2929
-DCMAKE_INSTALL_PREFIX=/usr \\
3030
-DCMAKE_BUILD_TYPE=Debug \\
31+
-DMYSQL_MAINTAINER_MODE=0 \\
3132
-DINSTALL_DOCDIR=share/mysql/docs \\
3233
-DINSTALL_LIBDIR=lib/$(DEB_HOST_MULTIARCH) \\
3334
-DSYSCONFDIR=/etc/mysql \\
3435
-DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \\
3536
-DWITH_INNODB_MEMCACHED=1 \\
3637
-DWITH_MECAB=system \\
38+
-DWITH_ZLIB=system \\
3739
-DWITH_NUMA=ON \\
3840
-DCOMPILATION_COMMENT=\"MySQL ${DEB_PRODUCTNAMEC} - ${DEB_LICENSENAME} - Debug\" \\
3941
-DCOMPILATION_COMMENT_SERVER=\"MySQL ${DEB_PRODUCTNAMEC} Server - ${DEB_LICENSENAME} - Debug\" \\

packaging/deb-in/rules.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ override_dh_auto_configure:
5858
-DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \
5959
-DWITH_INNODB_MEMCACHED=1 \
6060
-DWITH_MECAB=system \
61+
-DWITH_ZLIB=system \
6162
-DWITH_NUMA=ON \
6263
-DCOMPILATION_COMMENT="MySQL @DEB_PRODUCTNAMEC@ - @DEB_LICENSENAME@" \
6364
-DCOMPILATION_COMMENT_SERVER="MySQL @DEB_PRODUCTNAMEC@ Server - @DEB_LICENSENAME@" \

0 commit comments

Comments
 (0)