diff --git a/0001-Don-t-redefine-gettid-if-glibc-provides-it.patch b/0001-Don-t-redefine-gettid-if-glibc-provides-it.patch new file mode 100644 index 0000000000000000000000000000000000000000..37a85b71dbdb1b93fad54f836a3eb9099414fbc7 --- /dev/null +++ b/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 +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 +--- + 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 + #include + ++#if __GLIBC_PREREQ(2, 30) ++#ifndef _GNU_SOURCE ++#define _GNU_SOURCE ++#endif ++#include ++#else + #define gettid() syscall(SYS_gettid) ++#endif ++ + #define PRINTPID \ + US_DEBUG("pid=%d, ptid=%lu, tid=%d", getpid(), pthread_self(), gettid()) + +-- +2.23.0 + diff --git a/kae.spec b/kae.spec index f8fab040bc40f38b10b9fbd831a082a4e7557a00..a699083d2da98b7551b76688cc87f4881dbbabcc 100644 --- a/kae.spec +++ b/kae.spec @@ -2,8 +2,8 @@ Name: libkae Summary: Huawei Kunpeng Accelerator Engine -Version: 1.2.10 -Release: 3 +Version: 1.3.10 +Release: 7 License: Apache-2.0 Source: %{name}-%{version}.tar.gz Vendor: Huawei Corporation @@ -13,14 +13,17 @@ 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 openssl-devel sed Requires: openssl ExclusiveArch: aarch64 + +Patch0001: 0001-Don-t-redefine-gettid-if-glibc-provides-it.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 @@ -64,6 +67,12 @@ fi /sbin/ldconfig %changelog +* Tue November 19 2020 wuliaokanke 1.3.9-1 +- update libkae to 1.3.9 + +* Tue Jul 28 2020 lingsheng 1.2.10-4 +- Check glibc version to avoid redefine gettid() + * Sun Mar 15 2020 zhangtao 1.2.10-3 - Specify aarch64 compilation diff --git a/libkae-1.2.10.tar.gz b/libkae-1.2.10.tar.gz deleted file mode 100644 index 8260560d26f7ed363fcc6a95c815a0e0ac6e3923..0000000000000000000000000000000000000000 Binary files a/libkae-1.2.10.tar.gz and /dev/null differ diff --git a/libkae-1.3.10.tar.gz b/libkae-1.3.10.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..99252f0dfe70e15bb2263cb869c37baaaea5b742 Binary files /dev/null and b/libkae-1.3.10.tar.gz differ