From 2b4bf7e647845bd72cff849b7993cf9f6d6e0d2c Mon Sep 17 00:00:00 2001 From: wk333 <13474090681@163.com> Date: Mon, 13 May 2024 15:50:14 +0800 Subject: [PATCH] Fix sw64 patch fail (cherry picked from commit 38b11dfe87fd99f0f56d92a2179281bb50343de9) --- ck-0.6.0-sw.patch | 16 ---------------- ck-Add-sw64-architecture.patch | 2 +- ck.spec | 5 ++++- 3 files changed, 5 insertions(+), 18 deletions(-) delete mode 100755 ck-0.6.0-sw.patch diff --git a/ck-0.6.0-sw.patch b/ck-0.6.0-sw.patch deleted file mode 100755 index 4a8481e..0000000 --- a/ck-0.6.0-sw.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -Naur ck-0.6.0.org/configure ck-0.6.0.sw/configure ---- ck-0.6.0.org/configure 2022-09-14 10:55:40.750000000 +0800 -+++ ck-0.6.0.sw/configure 2022-09-15 13:37:57.490000000 +0800 -@@ -369,6 +369,12 @@ - fi - - case $PLATFORM in -+ "sw_64") -+ RTM_ENABLE="CK_MD_RTM_DISABLE" -+ MM="${MM:-"CK_MD_RMO"}" -+ PLATFORM=sw_64 -+ ENVIRONMENT=64 -+ ;; - "macppc"|"Power Macintosh"|"powerpc") - RTM_ENABLE="CK_MD_RTM_DISABLE" - LSE_ENABLE="CK_MD_LSE_DISABLE" diff --git a/ck-Add-sw64-architecture.patch b/ck-Add-sw64-architecture.patch index b25d072..f906640 100644 --- a/ck-Add-sw64-architecture.patch +++ b/ck-Add-sw64-architecture.patch @@ -23,7 +23,7 @@ index 340e05c..6941c13 100755 + ENVIRONMENT=64 + ;; + - "macppc"|"Power Macintosh"|"powerpc"|"powerpcspe") + "macppc"|"Power Macintosh"|"powerpc") RTM_ENABLE="CK_MD_RTM_DISABLE" LSE_ENABLE="CK_MD_LSE_DISABLE" -- diff --git a/ck.spec b/ck.spec index 0af55c4..ac81bf4 100644 --- a/ck.spec +++ b/ck.spec @@ -1,6 +1,6 @@ Name: ck Version: 0.6.0 -Release: 5 +Release: 6 Summary: Concurrency programming lib License: BSD URL: http://concurrencykit.org/ @@ -70,6 +70,9 @@ rm %{buildroot}%{_libdir}/libck.a %ldconfig_scriptlets %changelog +* Mon May 13 2024 wangkai <13474090681@163.com> - 0.6.0-6 +- Fix sw64 patch fail + * Mon Feb 13 2023 yaoxin - 0.6.0-5 - Add loongarch64 support -- Gitee