From b6c06dffb3c3a7cb7d439a8cc18148b0aacb5159 Mon Sep 17 00:00:00 2001 From: ChenZanYu Date: Tue, 4 Apr 2023 09:26:02 +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 Signed-off-by: ChenZanYu --- ...-5.14-solve-ilp32-strace-build-error.patch | 28 +++++++++++++++++++ strace.spec | 4 +++ 2 files changed, 32 insertions(+) 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 +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 +--- + 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..dc34c0b 100644 --- a/strace.spec +++ b/strace.spec @@ -21,6 +21,7 @@ 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. @@ -105,6 +106,9 @@ wait %{_mandir}/man1/* %changelog +* Tue Apr 4 2023 chenzanyu - 5.14-4 +- solve ilp32 strace build error + * Tue Jan 10 2023 Hui Li - 5.14-3 - Add loongarch64 architecture -- Gitee