Merge branch 'mysql-8.4' into mysql-trunk

Change-Id: Id371228945ae44eee07507292d69d95e4d62bb51

Author: trosten

packaging/deb-in/control.in

@@ -6,9 +6,12 @@ Standards-Version: 3.9.8
 Homepage: http://www.mysql.com/
 Build-Depends: debhelper (>= 9.0.0),
  libaio-dev[linux-any],
+ libcurl4-openssl-dev,
  libncurses5-dev (>= 5.0-6),
- libjson-perl, libldap2-dev,
+ libjson-perl,
+ libldap2-dev,
  libsasl2-dev,
+ patchelf,
  perl,
  zlib1g-dev (>= 1:1.1.3-5),
  po-debconf,

packaging/rpm-docker/mysql.spec.in

@@ -107,13 +107,14 @@ BuildRequires:  cmake3 >= 3.14.6
 %{?el9:BuildRequires:  gcc-toolset-14-gcc}
 BuildRequires:  bison >= 3.0.4
 BuildRequires:  elfutils
+BuildRequires:  patchelf
 BuildRequires:  time
 BuildRequires:  cyrus-sasl-devel
 BuildRequires:  libaio-devel
 %if 0%{?commercial}
 BuildRequires:  krb5-devel
-BuildRequires:  libcurl-devel
 %endif
+BuildRequires:  libcurl-devel
 BuildRequires:  ncurses-devel
 BuildRequires:  numactl-devel
 BuildRequires:  openldap-devel

packaging/rpm-oel/mysql.spec.in

@@ -195,9 +195,13 @@ BuildRequires:  binutils
 BuildRequires:  dwz
 BuildRequires:  gcc-c++
 BuildRequires:  gcc
+BuildRequires:  libfido2-devel
+BuildRequires:  libquadmath-devel
+BuildRequires:  libudev-devel
 %endif # el10
 BuildRequires:  bison >= 3.0.4
 BuildRequires:  elfutils
+BuildRequires:  patchelf
 BuildRequires:  perl
 BuildRequires:  perl(Env)
 BuildRequires:  perl(Carp)
@@ -233,8 +237,8 @@ BuildRequires:  libaio-devel
 %if 0%{?commercial}
 BuildRequires:  cyrus-sasl-gssapi
 BuildRequires:  cyrus-sasl-scram
-BuildRequires:  libcurl-devel
 %endif
+BuildRequires:  libcurl-devel
 BuildRequires:  krb5-devel
 BuildRequires:  ncurses-devel
 BuildRequires:  numactl-devel

packaging/rpm-sles/mysql.spec.in

@@ -101,6 +101,7 @@ Vendor:         %{mysql_vendor}
 BuildRequires:  cmake >= 3.14.6
 BuildRequires:  bison >= 3.0.4
 BuildRequires:  elfutils
+BuildRequires:  patchelf
 BuildRequires:  perl
 BuildRequires:  perl(Config)
 BuildRequires:  perl(Cwd)
@@ -123,8 +124,8 @@ BuildRequires:  libaio-devel
 %if 0%{?commercial}
 BuildRequires:  cyrus-sasl-gssapi
 BuildRequires:  krb5-devel
-BuildRequires:  libcurl-devel
 %endif
+BuildRequires:  libcurl-devel
 BuildRequires:  libnuma-devel
 BuildRequires:  ncurses-devel
 BuildRequires:  openssl-devel