diff --git a/0001-support-sw_64-arch.patch b/0001-support-sw_64-arch.patch new file mode 100644 index 0000000000000000000000000000000000000000..22b009ca6c94781d1a831d182dc922008a12f05e --- /dev/null +++ b/0001-support-sw_64-arch.patch @@ -0,0 +1,37 @@ +From: zhangfeilong +Date: Tue, 19 Aug 2025 11:02:21 +0800 +Subject: Add sw64 support to config.guess config.sub. + +--- +diff --git a/config.guess b/config.guess +index 48a6846..b8fc0ac 100755 +--- a/config.guess 2025-08-18 14:57:28.154612825 +0800 ++++ b/config.guess 2025-08-18 14:59:14.467319816 +0800 +@@ -1053,6 +1053,9 @@ + sparc:Linux:*:* | sparc64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; ++ sw_64*:Linux:*:*) ++ echo ${UNAME_MACHINE}-sunway-linux-${LIBC} ++ exit ;; + tile*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; +--- a/config.sub 2025-08-18 14:50:19.843706942 +0800 ++++ b/config.sub 2025-08-18 14:53:07.137966679 +0800 +@@ -311,6 +311,7 @@ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ + | spu \ ++ | sw_64 \ + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ + | ubicom32 \ + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ +@@ -394,6 +394,7 @@ + | k1om-* \ + | le32-* | le64-* \ + | lm32-* \ ++ | sw_64-* \ + | loongarch32-* | loongarch64-* | loongarchx32-* \ + | m32c-* | m32r-* | m32rle-* \ + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ diff --git a/add-sw64-to-generic_arches.patch b/add-sw64-to-generic_arches.patch new file mode 100644 index 0000000000000000000000000000000000000000..edffa6f105b36c020ce9a720b86a9af7393003b7 --- /dev/null +++ b/add-sw64-to-generic_arches.patch @@ -0,0 +1,29 @@ +From: zhangfeilong +Date: Tue, 19 Aug 2025 11:02:21 +0800 +Subject: Add sw64 support to macros macros.go + +--- +diff --git a/macros b/macros +index d6b2c80..a66eb2e 100644 +--- a/macros ++++ b/macros +@@ -241,7 +241,7 @@ + %pkg_vcmp() (%{expand:%%{pkg_version_cmp %1 %3}} %2 0) + + #arches macros +-%generic_arches %{ix86} x86_64 %{arm} aarch64 loongarch64 powerpc64le ppc64le ++%generic_arches %{ix86} x86_64 %{arm} aarch64 loongarch64 powerpc64le ppc64le sw_64 + %ldc_arches %{generic_arches} + %valgrind_arches %{generic_arches} + %nodejs_arches %{generic_arches} riscv64 +--- a/macros.go 2025-08-18 15:01:24.200623155 +0800 ++++ b/macros.go 2025-08-18 15:02:03.451622585 +0800 +@@ -12,7 +12,7 @@ + # redhat-rpm-macros. + + # Define arches for PA and SA +-%golang_arches %{ix86} x86_64 %{arm} aarch64 ppc64le s390x riscv64 loongarch64 ++%golang_arches %{ix86} x86_64 %{arm} aarch64 ppc64le s390x riscv64 loongarch64 sw_64 + %gccgo_arches %{mips} + %go_arches %{golang_arches} %{gccgo_arches} + diff --git a/openEuler-rpm-config.spec b/openEuler-rpm-config.spec index 14685f514e4c9fc32221d50b659a69bcc1945a6f..5966414495341a993b7b84efcbd13f3d385f9d24 100644 --- a/openEuler-rpm-config.spec +++ b/openEuler-rpm-config.spec @@ -3,7 +3,7 @@ Name: %{vendor}-rpm-config Version: 30 -Release: 58 +Release: 59 License: GPL+ Summary: specific rpm configuration files URL: https://gitee.com/openeuler/openEuler-rpm-config @@ -39,6 +39,8 @@ Patch25: Add-support-for-selecting-clang-as-a-toolchain.patch Patch26: Call-set_build_flags-cc-before-build-check-and-insta.patch Patch27: openEuler-rpm-config-add-optflags-for-loongarch64-and-sw_64.patch Patch28: add-riscv64-to-some-arches-macro.patch +Patch29: 0001-support-sw_64-arch.patch +Patch30: add-sw64-to-generic_arches.patch Provides: python-rpm-macros = %{?epoch:%{epoch}:}%{version}-%{release} Provides: python2-rpm-macros = %{?epoch:%{epoch}:}%{version}-%{release} @@ -150,6 +152,9 @@ sed -i "s/__vendor/%{vendor}/g" `grep "__vendor" -rl %{buildroot}%{_rpmconfigdir %{rpmvdir}/find-requires.ksyms %changelog +* Mon Aug 18 2025 zhangfeilong - 30-59 +- support sw_64 arch + * Thu Dec 19 2024 luhuaxin - 30-58 - ima: keep the process of OBS signing same as previous version