Diff mysql-connector-c-8.0.31 with a mysql-connector-c-8.0.32-r1

/usr/portage/dev-db/mysql-connector-c/mysql-connector-c-8.0.32-r1.ebuild 2023-10-09 14:52:29.324368346 +0300
1 1
# Copyright 1999-2023 Gentoo Authors
2 2
# Distributed under the terms of the GNU General Public License v2
3 3

  
4
EAPI=7
4
EAPI=8
5 5

  
6 6
inherit cmake-multilib flag-o-matic
7 7

  
8
# wrap the config script
9
MULTILIB_CHOST_TOOLS=( /usr/bin/mysql_config )
10

  
11 8
DESCRIPTION="C client library for MariaDB/MySQL"
12 9
HOMEPAGE="https://dev.mysql.com/downloads/"
13 10

  
......
27 24
IUSE="ldap static-libs"
28 25

  
29 26
RDEPEND="
30
	>=app-arch/lz4-0_p131:=[${MULTILIB_USEDEP}]
27
	>=app-arch/lz4-1.9.4:=[${MULTILIB_USEDEP}]
31 28
	app-arch/zstd:=[${MULTILIB_USEDEP}]
32
	sys-libs/zlib:=[${MULTILIB_USEDEP}]
29
	dev-libs/openssl:=[${MULTILIB_USEDEP}]
30
	>=sys-libs/zlib-1.2.13:=[${MULTILIB_USEDEP}]
33 31
	ldap? ( dev-libs/cyrus-sasl:=[${MULTILIB_USEDEP}] )
34
	dev-libs/openssl:0=[${MULTILIB_USEDEP}]
35 32
"
36 33
DEPEND="${RDEPEND}"
37

  
38 34
# Avoid file collisions, #692580
39
RDEPEND+=" !<dev-db/mysql-5.6.45-r1"
40
RDEPEND+=" !=dev-db/mysql-5.7.23*"
41
RDEPEND+=" !=dev-db/mysql-5.7.24*"
42
RDEPEND+=" !=dev-db/mysql-5.7.25*"
43
RDEPEND+=" !=dev-db/mysql-5.7.26-r0"
44
RDEPEND+=" !=dev-db/mysql-5.7.27-r0"
45
RDEPEND+=" !<dev-db/percona-server-5.7.26.29-r1"
35
RDEPEND+="
36
	!<dev-db/mysql-5.6.45-r1
37
	!=dev-db/mysql-5.7.23*
38
	!=dev-db/mysql-5.7.24*
39
	!=dev-db/mysql-5.7.25*
40
	!=dev-db/mysql-5.7.26-r0
41
	!=dev-db/mysql-5.7.27-r0
42
	!<dev-db/percona-server-5.7.26.29-r1
43
"
46 44

  
47 45
DOCS=( README )
48 46

  
47
# Wrap the config script
48
MULTILIB_CHOST_TOOLS=( /usr/bin/mysql_config )
49

  
49 50
PATCHES=(
50 51
	"${FILESDIR}"/${PN}-8.0.22-always-build-decompress-utilities.patch
51 52
	"${FILESDIR}"/${PN}-8.0.19-do-not-install-comp_err.patch
52 53
	"${FILESDIR}"/${PN}-8.0.27-res_n.patch
54
	"${FILESDIR}"/${PN}-8.0.32-musl.patch
53 55
)
54 56

  
55 57
src_prepare() {
......
82 84
}
83 85

  
84 86
multilib_src_configure() {
85
	CMAKE_BUILD_TYPE="RelWithDebInfo"
86

  
87 87
	# Code is now requiring C++17 due to https://github.com/mysql/mysql-server/commit/236ab55bedd8c9eacd80766d85edde2a8afacd08
88 88
	append-cxxflags -std=c++17
89 89

  
......
104 104
		-DSHARED_LIB_PATCH_VERSION="0"
105 105
		-DCMAKE_POSITION_INDEPENDENT_CODE=ON
106 106
		-DWITHOUT_SERVER=ON
107
		-DWITH_BUILD_ID=OFF
107 108
	)
108 109

  
109 110
	cmake_src_configure
110 111
}
111 112

  
112 113
multilib_src_install_all() {
114
	# Not a GNU info file, more like a tiny README.
115
	rm "${ED}"/usr/share/info/mysql.info || die
116

  
113 117
	doman \
114 118
		man/my_print_defaults.1 \
115 119
		man/perror.1 \
Thank you!