diff --git a/0001-lldb-Replace-linux-uio.h-with-sys-uio.h-in-NativeReg.patch b/0001-lldb-Replace-linux-uio.h-with-sys-uio.h-in-NativeReg.patch new file mode 100644 index 0000000..7f29261 --- /dev/null +++ b/0001-lldb-Replace-linux-uio.h-with-sys-uio.h-in-NativeReg.patch @@ -0,0 +1,37 @@ +From 5e391985709f0ab585d46ad534b4f3b48c6a68f9 Mon Sep 17 00:00:00 2001 +From: Pavel Labath +Date: Wed, 29 Jun 2022 14:48:54 +0200 +Subject: [PATCH] [lldb] Replace linux/uio.h with sys/uio.h in + NativeRegisterContextLinux_s390x + +Fixes PR56280. +--- + .../Process/Linux/NativeRegisterContextLinux_s390x.cpp | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +diff --git a/lldb/source/Plugins/Process/Linux/NativeRegisterContextLinux_s390x.cpp b/lldb/source/Plugins/Process/Linux/NativeRegisterContextLinux_s390x.cpp +index 0c3afd66ee25..121f405e546e 100644 +--- a/lldb/source/Plugins/Process/Linux/NativeRegisterContextLinux_s390x.cpp ++++ b/lldb/source/Plugins/Process/Linux/NativeRegisterContextLinux_s390x.cpp +@@ -10,16 +10,14 @@ + + #include "NativeRegisterContextLinux_s390x.h" + #include "Plugins/Process/Linux/NativeProcessLinux.h" ++#include "Plugins/Process/Utility/RegisterContextLinux_s390x.h" + #include "lldb/Host/HostInfo.h" + #include "lldb/Utility/DataBufferHeap.h" + #include "lldb/Utility/Log.h" + #include "lldb/Utility/RegisterValue.h" + #include "lldb/Utility/Status.h" +- +-#include "Plugins/Process/Utility/RegisterContextLinux_s390x.h" +- +-#include + #include ++#include + + using namespace lldb_private; + using namespace lldb_private::process_linux; +-- +2.37.1 + diff --git a/lldb.spec b/lldb.spec index 1587e69..bf0c066 100644 --- a/lldb.spec +++ b/lldb.spec @@ -4,7 +4,7 @@ Name: lldb Version: %{lldb_version}%{?rc_ver:~rc%{rc_ver}} -Release: 2%{?dist} +Release: 3%{?dist} Summary: Next generation high-performance debugger License: NCSA @@ -37,7 +37,7 @@ Requires: python3-lldb #/usr/include/linux/uio.h:17:8: error: redefinition of 'struct iovec' # 17 | struct iovec # | ^~~~~ -Patch0: remove-uio-include.patch +Patch0: 0001-lldb-Replace-linux-uio.h-with-sys-uio.h-in-NativeReg.patch # For origin certification BuildRequires: gnupg2 @@ -131,6 +131,9 @@ rm -f %{buildroot}%{python3_sitearch}/six.* %{python3_sitearch}/lldb %changelog +* Tue Aug 09 2022 Nikita Popov - 14.0.5-3 +- Fix s390x build + * Thu Jul 21 2022 Fedora Release Engineering - 14.0.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/remove-uio-include.patch b/remove-uio-include.patch deleted file mode 100644 index 55d50ff..0000000 --- a/remove-uio-include.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN lldb-14.0.5.src.orig/source/Plugins/Process/Linux/NativeRegisterContextLinux_s390x.cpp lldb-14.0.5.src/source/Plugins/Process/Linux/NativeRegisterContextLinux_s390x.cpp ---- a/lldb-14.0.5.src.orig/source/Plugins/Process/Linux/NativeRegisterContextLinux_s390x.cpp 2022-06-10 16:47:36.000000000 +0200 -+++ b/lldb-14.0.5.src/source/Plugins/Process/Linux/NativeRegisterContextLinux_s390x.cpp 2022-06-20 14:28:03.551079680 +0200 -@@ -18,7 +18,7 @@ - - #include "Plugins/Process/Utility/RegisterContextLinux_s390x.h" - --#include -+//#include - #include - - using namespace lldb_private;