From a1dbbbcb734bc0382ed076690fc5bfb7912bab2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=B5=9E=E5=AE=87?=
 <8802395+chen-zanyu@user.noreply.gitee.com>
Date: Tue, 4 Apr 2023 08:30:26 +0000
Subject: [PATCH] When constructing, HAVE_ARCH_OLD_TIME64_SYSCALLS SIZEOF_LONG
 == 8, resulting in failure to build ilp32, need to add SIZEOF_LONG == 4 to
 fit ilp32
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 陈赞宇 <8802395+chen-zanyu@user.noreply.gitee.com>
---
 ...-5.14-solve-ilp32-strace-build-error.patch | 28 +++++++++++++++++++
 strace.spec                                   |  7 ++++-
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 strace-5.14-solve-ilp32-strace-build-error.patch

diff --git a/strace-5.14-solve-ilp32-strace-build-error.patch b/strace-5.14-solve-ilp32-strace-build-error.patch
new file mode 100644
index 0000000..330838a
--- /dev/null
+++ b/strace-5.14-solve-ilp32-strace-build-error.patch
@@ -0,0 +1,28 @@
+From cab8b0976b7b1c7653728ab27014b2553416981b Mon Sep 17 00:00:00 2001
+From: chenzanyu <chenzanyu@huawei.com>
+Date: Tue, 4 Apr 2023 16:13:37 +0800
+Subject: [PATCH] strace: solve ilp32 strace build error
+
+reason: When constructing, HAVE_ARCH_OLD_TIME64_SYSCALLS SIZEOF_LONG == 8,
+resulting in failure to build ilp32, need to add SIZEOF_LONG == 4 to fit ilp32
+
+Signed-off-by: chenzanyu <chenzanyu@huawei.com>
+---
+ src/arch_defs.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/arch_defs.h b/src/arch_defs.h
+index bb35252..e3d2bf3 100644
+--- a/src/arch_defs.h
++++ b/src/arch_defs.h
+@@ -66,7 +66,7 @@
+ # endif
+
+ # ifndef HAVE_ARCH_OLD_TIME64_SYSCALLS
+-#  define HAVE_ARCH_OLD_TIME64_SYSCALLS (SIZEOF_LONG == 8)
++#  define HAVE_ARCH_OLD_TIME64_SYSCALLS ((SIZEOF_LONG == 4) || (SIZEOF_LONG == 8))
+ # endif
+
+ # ifndef MIN_KLONGSIZE
+--
+2.12.3
diff --git a/strace.spec b/strace.spec
index b84f6d4..46e4906 100644
--- a/strace.spec
+++ b/strace.spec
@@ -3,7 +3,7 @@
 Summary: Tracks and displays system calls associated with a running process
 Name: strace
 Version: 5.14
-Release: 3
+Release: 4
 # The test suite is GPLv2+, all the rest is LGPLv2.1+.
 License: LGPL-2.1+ and GPL-2.0+
 # Some distros require Group tag to be present,
@@ -21,8 +21,10 @@ Source: strace-%{version}.tar.gz
 Patch1: strace-5.14-sw.patch
 %endif
 Patch2: strace-5.14-loongarch64.patch
+Patch3: strace-5.14-solve-ilp32-strace-build-error.patch
 BuildRequires: gcc gzip
 
+
 # Install Bluetooth headers for AF_BLUETOOTH sockets decoding.
 %if 0%{?fedora} >= 18 || 0%{?centos} >= 6 || 0%{?rhel} >= 8 || 0%{?suse_version} >= 1200 || 0%{?openEuler} >= 1
 BuildRequires: pkgconfig(bluez)
@@ -105,6 +107,9 @@ wait
 %{_mandir}/man1/*
 
 %changelog
+* Tue Apr 4 2023 chenzanyu <chenzanyu@huawei.com> - 5.14-4
+- solve ilp32 strace build error
+
 * Tue Jan 10 2023 Hui Li<lihui@loongson.cn> - 5.14-3
 - Add loongarch64 architecture
 
-- 
Gitee