Skip to content

Commit 32d38c5

Browse files
authored
Modified mysql to explicitly not use curl. (microsoft#10940)
1 parent c681276 commit 32d38c5

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

SPECS/mysql/mysql.spec

+9-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Summary: MySQL.
44
Name: mysql
55
Version: 8.0.40
6-
Release: 2%{?dist}
6+
Release: 3%{?dist}
77
License: GPLv2 with exceptions AND LGPLv2 AND BSD
88
Vendor: Microsoft Corporation
99
Distribution: Azure Linux
@@ -38,14 +38,18 @@ Development headers for developing applications linking to maridb
3838
%prep
3939
%autosetup -p1
4040

41-
# Remove unused, bundled version of protobuf.
41+
# Remove bundled versions of some tools to guarantee they are
42+
# not used by MySQL:
4243
# We're building with the '-DWITH_PROTOBUF=system' option.
4344
rm -r extra/protobuf
45+
# We're building with the '-DWITH_CURL=none' option.
46+
rm -r extra/curl
4447

4548
%build
4649
cmake . \
4750
-DCMAKE_INSTALL_PREFIX=%{_prefix} \
4851
-DWITH_BOOST=boost/boost_1_77_0 \
52+
-DWITH_CURL=none \
4953
-DWITH_PROTOBUF=system \
5054
-DINSTALL_MANDIR=share/man \
5155
-DINSTALL_DOCDIR=share/doc \
@@ -103,6 +107,9 @@ sudo -u test make test || { cat Testing/Temporary/LastTest.log; false; }
103107
%{_libdir}/pkgconfig/mysqlclient.pc
104108

105109
%changelog
110+
* Tue Nov 05 2024 Pawel Winogrodzki <[email protected]> - 8.0.40-3
111+
- Explicitly setting "WITH_CURL=none".
112+
106113
* Mon Oct 28 2024 Pawel Winogrodzki <[email protected]> - 8.0.40-2
107114
- Switch to ALZ version of protobuf instead of using the bundled one.
108115

0 commit comments

Comments
 (0)