!34 [sync] PR-32: fix rpath error

From: @openeuler-sync-bot 
Reviewed-by: @wizardWithSword, @xqm227 
Signed-off-by: @xqm227

0001-Don-t-redefine-gettid-if-glibc-provides-it.patch

@@ -0,0 +1,38 @@
+From 04f80ac2c822543f130c30942560e4a3300f8481 Mon Sep 17 00:00:00 2001
+From: lingsheng <lingsheng@huawei.com>
+Date: Tue, 28 Jul 2020 09:41:05 +0800
+Subject: [PATCH] Don't redefine gettid if glibc provides it
+
+glibc 2.30+ include a definition for gettid() so that users don't have
+to manually define gettid() with syscall().
+Old code don't check this, this will redefine gettid() on the latest
+versions of glibc, causing build fail.
+
+Signed-off-by: lingsheng <lingsheng@huawei.com>
+---
+ KAE/utils/engine_utils.h | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/KAE/utils/engine_utils.h b/KAE/utils/engine_utils.h
+index 160e449..12a587e 100644
+--- a/KAE/utils/engine_utils.h
++++ b/KAE/utils/engine_utils.h
+@@ -28,7 +28,15 @@
+ #include <sys/types.h>
+ #include <sys/syscall.h>
+ 
++#if __GLIBC_PREREQ(2, 30)
++#ifndef _GNU_SOURCE
++#define _GNU_SOURCE
++#endif
++#include <unistd.h>
++#else
+ #define gettid() syscall(SYS_gettid)
++#endif
++
+ #define PRINTPID \
+     US_DEBUG("pid=%d, ptid=%lu, tid=%d", getpid(), pthread_self(), gettid())
+ 
+-- 
+2.23.0
+

0002-fix-pthread_yield.patch

@@ -0,0 +1,25 @@
+From f0c7130d9186dbb62367c0eb6c4d2ae6f78ef577 Mon Sep 17 00:00:00 2001
+From: caodongxia <315816521@qq.com>
+Date: Thu, 12 Aug 2021 11:49:36 +0800
+Subject: [PATCH] pthread_yield is deprecated, use sched_yield instead
+
+---
+ KAE/utils/engine_utils.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/KAE/utils/engine_utils.h b/KAE/utils/engine_utils.h
+index 12a587e..f0b69b2 100644
+--- a/KAE/utils/engine_utils.h
++++ b/KAE/utils/engine_utils.h
+@@ -129,7 +129,7 @@ static inline void kae_memcpy(void *src, const void *dst, int len)
+ 
+ static inline void kae_pthread_yield()
+ {
+-    (void)pthread_yield(); //lint !e1055
++    (void)sched_yield(); //lint !e1055
+ }
+ 
+ int kae_create_thread(pthread_t *thread_id, const pthread_attr_t *attr,
+-- 
+2.27.0
+

kae.spec

@@ -3,7 +3,7 @@
 Name:          libkae
 Summary:       Huawei Kunpeng Accelerator Engine
 Version:       1.2.10
-Release:       2
+Release:       7
 License:       Apache-2.0
 Source:        %{name}-%{version}.tar.gz
 Vendor:        Huawei Corporation
@@ -13,14 +13,18 @@ BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 Prefix:        /usr/local/lib/engines-1.1
 Conflicts:     %{name} < %{version}-%{release}
 Provides:      %{name} = %{version}-%{release}
-BuildRequires: libwd >= %{version} openssl-devel sed
+BuildRequires: libwd >= %{version} openssl-devel sed chrpath
 Requires:      openssl
+ExclusiveArch: aarch64
+
+Patch0001:     0001-Don-t-redefine-gettid-if-glibc-provides-it.patch
+Patch0002:     0002-fix-pthread_yield.patch
 
 %description
 This package contains the Huawei Kunpeng Accelerator Engine
 
 %prep
-%setup -c -n %{name}-%{version}
+%autosetup -c -n %{name}-%{version} -p1
 
 %build
 cd KAE
@@ -30,6 +34,7 @@ make
 
 %install
 mkdir -p ${RPM_BUILD_ROOT}/usr/local/lib/engines-1.1
+chrpath -d  KAE/libkae.so.%{version}
 install -b -m755 KAE/libkae.so.%{version} ${RPM_BUILD_ROOT}/usr/local/lib/engines-1.1
 
 %clean
@@ -64,6 +69,21 @@ fi
 /sbin/ldconfig
 
 %changelog
+* Wed Dec 13 2023 liuyang <liuyang645@huawei.com> 1.2.10-7
+- fix rpath error
+
+* Mon Apr 17 2023 li-miaomiao_zhr <mmlidc@isoftstone.com> 1.2.10-6
+- solve libkae build problem in openEuler:22.03:LTS:Next
+
+* Thu Aug 12 2021 caodongxia <caodongxia@huawei.com> 1.2.10-5
+- Fix pthread_yield is deprecated
+
+* Tue Jul 28 2020 lingsheng <lingsheng@huawei.com> 1.2.10-4
+- Check glibc version to avoid redefine gettid()
+
+* Sun Mar 15 2020 zhangtao <zhangtao221@huawei.com> 1.2.10-3
+- Specify aarch64 compilation
+
 * Tue Mar 03 2020 catastrowings <jianghuhao1994@163.com> 1.2.10-2
 - openEuler init