Sync release from 22.03-LTS

This commit is contained in:
wk333 2024-03-20 17:19:11 +08:00
parent ee15451318
commit 8e297f3383
4 changed files with 103 additions and 1 deletions

View File

@ -0,0 +1,29 @@
From feb19456868ac62ba1b1b385703bed215e4451aa Mon Sep 17 00:00:00 2001
From: starlet-dx <15929766099@163.com>
Date: Mon, 13 Feb 2023 14:30:02 +0800
Subject: [PATCH 1/1] Add loongarch64 support
---
configure | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/configure b/configure
index e840d41..f367e80 100755
--- a/configure
+++ b/configure
@@ -369,6 +369,12 @@ if test "x$PLATFORM" = "x"; then
fi
case $PLATFORM in
+ "loongarch64")
+ RTM_ENABLE="CK_MD_RTM_DISABLE"
+ MM="${MM:-"CK_MD_RMO"}"
+ PLATFORM=loongarch64
+ ENVIRONMENT=64
+ ;;
"macppc"|"Power Macintosh"|"powerpc")
RTM_ENABLE="CK_MD_RTM_DISABLE"
LSE_ENABLE="CK_MD_LSE_DISABLE"
--
2.30.0

16
ck-0.6.0-sw.patch Executable file
View File

@ -0,0 +1,16 @@
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"

View File

@ -0,0 +1,31 @@
From 679ff9ab9246f8b7463b9fc4eac9476eda5276df Mon Sep 17 00:00:00 2001
From: wzx <wuzx1226@qq.com>
Date: Wed, 9 Nov 2022 14:27:40 +0800
Subject: [PATCH] Add sw64 architecture
Signed-off-by: wzx <wuzx1226@qq.com>
---
configure | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/configure b/configure
index 340e05c..6941c13 100755
--- a/configure
+++ b/configure
@@ -407,6 +407,13 @@ if test "x$PLATFORM" = "x"; then
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"|"powerpcspe")
RTM_ENABLE="CK_MD_RTM_DISABLE"
LSE_ENABLE="CK_MD_LSE_DISABLE"
--
2.33.0

28
ck.spec
View File

@ -1,10 +1,12 @@
Name: ck
Version: 0.6.0
Release: 2
Release: 5
Summary: Concurrency programming lib
License: BSD
URL: http://concurrencykit.org/
Source0: http://concurrencykit.org/releases/%{name}-%{version}.tar.gz
Patch1: ck-Add-sw64-architecture.patch
Patch2: Add-loongarch64-support.patch
BuildRequires: gcc autoconf automake
@ -22,10 +24,25 @@ Concurrency primitives, safe memory reclamation mechanisms and non-blocking data
%prep
%setup -q -n %{name}-%{version}/
%ifarch sw_64
%patch1 -p1
%endif
%ifarch loongarch64
%patch2 -p1
%endif
%build
export CFLAGS="${RPM_OPT_FLAGS}"
./configure --libdir=%{_libdir} --includedir=%{_includedir}/%{name} --mandir=%{_mandir} --prefix=%{_prefix}
%ifarch sw_64
cp build/ck.build.aarch64 build/ck.build.sw_64
%endif
%ifarch loongarch64
cp build/ck.build.aarch64 build/ck.build.loongarch64
%endif
%make_build
%install
@ -53,6 +70,15 @@ rm %{buildroot}%{_libdir}/libck.a
%ldconfig_scriptlets
%changelog
* Mon Feb 13 2023 yaoxin <yaoxin30@h-partners.com> - 0.6.0-5
- Add loongarch64 support
* Wed Nov 23 2022 wuzx<wuzx1226@qq.com> - 0.6.0-4
- Add sw64 architecture
* Wed Oct 19 2022 wuzx<wuzx1226@qq.com> - 0.6.0-3
- add sw64 patch
* Tue Sep 07 2021 lingsheng <lingsheng@huawei.com> - 0.6.0-2
- Set CFLAGS to build debug related rpm