diff options
Diffstat (limited to 'dev-db/mysql/mysql-8.0.27.ebuild')
| -rw-r--r-- | dev-db/mysql/mysql-8.0.27.ebuild | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/dev-db/mysql/mysql-8.0.27.ebuild b/dev-db/mysql/mysql-8.0.27.ebuild index a6a52bcee87b..18dda6ee1678 100644 --- a/dev-db/mysql/mysql-8.0.27.ebuild +++ b/dev-db/mysql/mysql-8.0.27.ebuild @@ -12,12 +12,12 @@ MY_PV="${PV//_pre*}" MY_P="${PN}-${MY_PV}" # Patch version -PATCH_SET="https://dev.gentoo.org/~whissi/dist/mysql/${PN}-8.0.27-patches-02.tar.xz" +PATCH_SET=( https://dev.gentoo.org/~{whissi,dlan}/dist/mysql/${PN}-8.0.27-patches-03.tar.xz ) SRC_URI="https://cdn.mysql.com/Downloads/MySQL-8.0/mysql-boost-${MY_PV}.tar.gz https://cdn.mysql.com/archives/mysql-8.0/mysql-boost-${MY_PV}.tar.gz http://downloads.mysql.com/archives/MySQL-8.0/${PN}-boost-${MY_PV}.tar.gz - ${PATCH_SET}" + ${PATCH_SET[@]}" HOMEPAGE="https://www.mysql.com/" DESCRIPTION="A fast, multi-threaded, multi-user SQL database server" @@ -37,7 +37,7 @@ REQUIRED_USE="?? ( tcmalloc jemalloc ) tcmalloc? ( server )" # -ppc, -riscv for bug #761715 -KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips -ppc ppc64 -riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris" +KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips -ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris" # Shorten the path because the socket path length must be shorter than 107 chars # and we will run a mysql server during test phase @@ -170,6 +170,7 @@ src_unpack() { src_prepare() { eapply "${WORKDIR}"/mysql-patches + eapply "${FILESDIR}"/${PN}-8.0.27-gcc12.patch # Avoid rpm call which would trigger sandbox, #692368 sed -i \ @@ -1084,7 +1085,7 @@ pkg_config() { log-slave-updates \ ; do optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}" - egrep -sq -- "${optexp}" "${helpfile}" && mysqld_options+=( "${optfull}" ) + grep -E -sq -- "${optexp}" "${helpfile}" && mysqld_options+=( "${optfull}" ) done # Prepare timezones, see |