From 01e85bc9a6ae86a5c2bfcbff63efe6009477a943 Mon Sep 17 00:00:00 2001 From: sunmin89 Date: Mon, 15 Apr 2024 11:14:30 +0800 Subject: [PATCH] Add clang support for qmake (cherry picked from commit 70fde62b49693d79ea5a0ba58c5df6b8f62e6045) --- Add-clang-support-for-qmake.patch | 30 ++++++++++++++++++++++++++++++ wpa_supplicant.spec | 6 ++++++ 2 files changed, 36 insertions(+) create mode 100644 Add-clang-support-for-qmake.patch diff --git a/Add-clang-support-for-qmake.patch b/Add-clang-support-for-qmake.patch new file mode 100644 index 0000000..8f76c09 --- /dev/null +++ b/Add-clang-support-for-qmake.patch @@ -0,0 +1,30 @@ +From dfd0125ffd4f2afd0ad78dfac4c8d588b1b666db Mon Sep 17 00:00:00 2001 +From: sunmin89 +Date: Wed, 3 Apr 2024 19:18:23 +0800 +Subject: [PATCH] Add support for qmake clang + +--- + wpa_supplicant/wpa_gui-qt4/wpa_gui.pro | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/wpa_supplicant/wpa_gui-qt4/wpa_gui.pro b/wpa_supplicant/wpa_gui-qt4/wpa_gui.pro +index 3fa734b..f8f9f71 100644 +--- a/wpa_supplicant/wpa_gui-qt4/wpa_gui.pro ++++ b/wpa_supplicant/wpa_gui-qt4/wpa_gui.pro +@@ -3,6 +3,13 @@ LANGUAGE = C++ + TRANSLATIONS = lang/wpa_gui_de.ts + greaterThan(QT_MAJOR_VERSION, 4): QT += widgets + ++#Add support for clang ++QMAKE_CC = clang ++QMAKE_CXX = clang++ ++QMAKE_LINK = clang++ ++QMAKE_AR = llvm-ar ++QMAKE_STRIP = llvm-strip ++ + CONFIG += qt warn_on release + + DEFINES += CONFIG_CTRL_IFACE +-- +2.27.0 + diff --git a/wpa_supplicant.spec b/wpa_supplicant.spec index 0ae8886..decfc45 100644 --- a/wpa_supplicant.spec +++ b/wpa_supplicant.spec @@ -14,6 +14,9 @@ Source5: %{name}.logrotate Patch0: backport-wpa_supplicant-PEAP-client-Update-Phase-2-authentication-requiremen.patch Patch6000: wpa_supplicant-gui-qt4.patch +%if "%{?toolchain}" == "clang" +Patch6001: Add-clang-support-for-qmake.patch +%endif BuildRequires: qt-devel >= 4.0 openssl-devel readline-devel dbus-devel libnl3-devel systemd-units docbook-utils Requires(post): systemd-sysv @@ -105,6 +108,9 @@ install -m644 %{name}/doc/docbook/*.5 %{buildroot}%{_mandir}/man5 * Mon Apr 15 2024 Han Jinpeng - 1:2.10-5 - Backport patch fix CVE-2023-52160 +* Mon Apr 15 2024 sunmin - 1:2.10-5 +- Add clang support for qmake + * Tue Sep 5 2023 xiaofan - 1:2.10-4 - fix wpa_cli not work -- Gitee