diff --git a/1000-ippcp.patch b/1000-ippcp.patch new file mode 100644 index 0000000000000000000000000000000000000000..c019a70a9be1cdfcba236526a3ea4390cea57fab --- /dev/null +++ b/1000-ippcp.patch @@ -0,0 +1,26 @@ +From 8306657090f37bd23971bd39059aacb09a291c30 Mon Sep 17 00:00:00 2001 +From: "Huang, Xiaojun" +Date: Tue, 27 Jun 2023 22:14:28 +0800 +Subject: [PATCH] ippcp patch + +Signed-off-by: Huang, Xiaojun +--- + sources/cmake/linux/GNU8.2.0.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sources/cmake/linux/GNU8.2.0.cmake b/sources/cmake/linux/GNU8.2.0.cmake +index 69cec78..10c50bc 100644 +--- a/sources/cmake/linux/GNU8.2.0.cmake ++++ b/sources/cmake/linux/GNU8.2.0.cmake +@@ -97,7 +97,7 @@ if(${ARCH} MATCHES "ia32") + endif(${ARCH} MATCHES "ia32") + + # Optimization level = 3, no-debug definition (turns off asserts), warnings=errors +-set (CMAKE_C_FLAGS_RELEASE " -O3 -DNDEBUG -Werror") ++set (CMAKE_C_FLAGS_RELEASE " -O3 -DNDEBUG -Wno-stringop-overflow -Werror") + + set(w7_opt "${w7_opt} -march=pentium4 -msse2") + set(s8_opt "${s8_opt} -march=core2 -mssse3") +-- +2.39.1 + diff --git a/intel-ipp-crypto-mb.spec b/intel-ipp-crypto-mb.spec index 1a825764d7cd09f3f70db43a584ea9deca5fd701..243449af59d29ce97e852c39812eab46bec26130 100644 --- a/intel-ipp-crypto-mb.spec +++ b/intel-ipp-crypto-mb.spec @@ -1,4 +1,4 @@ -%define anolis_release 1 +%define anolis_release 2 %define debug_package %{nil} %global github_source_archive_name ippcp_2021.7 @@ -12,9 +12,12 @@ ExclusiveArch: x86_64 URL: https://github.com/intel/ipp-crypto Source0: https://github.com/intel/ipp-crypto/archive/refs/tags/%{github_source_archive_name}.tar.gz +Patch1000: 1000-ippcp.patch + BuildRequires: cmake BuildRequires: gcc BuildRequires: gcc-c++ +BuildRequires: nasm BuildRequires: openssl-devel >= 1.1.0 %description @@ -22,10 +25,11 @@ A software crypto library optimized for Intel architecture for packet processing applications. It contains universal and OpenSSL compatible APIs for cryptography operations. +ExclusiveArch: x86_64 + %package devel Summary: Intel(R) IPP Cryptography multi-buffer library (Development Files) Requires: %{name} = %{version}-%{release} -ExclusiveArch: x86_64 %description devel A software crypto library optimized for Intel architecture for packet @@ -49,48 +53,40 @@ The %{name}-doc package contains documentation files for %{name}. %prep %autosetup -n ipp-crypto-%{github_source_archive_name} -p1 -sed -i 's/"lib\"/"lib64"/g' sources/ippcp/crypto_mb/src/CMakeLists.txt %build -pushd sources/ippcp/crypto_mb -%cmake \ - -DARCH=intel64 \ - -DMERGED_BLD:BOOL=off +%global set_build_flags %{nil} +%cmake -DARCH=intel64 \ + -DCMAKE_BUILD_TYPE=Release \ + -DNONPIC_LIB:BOOL=off \ + -DMERGED_BLD:BOOL=on \ + -DCMAKE_INSTALL_PREFIX=%{_prefix} %cmake_build -popd %install -pushd sources/ippcp/crypto_mb %cmake_install - -install -p -s -m 0755 %{__cmake_builddir}/bin/libcrypto_mb.so.11.5 %{buildroot}/%{_libdir} -popd +mkdir -p %{buildroot}/%{_libdir} +mv %{buildroot}/usr/lib/intel64/*.so* %{buildroot}/%{_libdir}/ +mv %{buildroot}/usr/lib/intel64/*.a %{buildroot}/%{_libdir}/ +rm -rf %{buildroot}/usr/lib/intel64 %files %license LICENSE +%{_libdir}/libippcp.so.* %{_libdir}/libcrypto_mb.so.* %files devel -%dir %{_includedir}/crypto_mb -%{_includedir}/crypto_mb/cpu_features.h -%{_includedir}/crypto_mb/defs.h -%{_includedir}/crypto_mb/ec_nistp256.h -%{_includedir}/crypto_mb/ec_nistp384.h -%{_includedir}/crypto_mb/ec_nistp521.h -%{_includedir}/crypto_mb/ec_sm2.h -%{_includedir}/crypto_mb/ed25519.h -%{_includedir}/crypto_mb/exp.h -%{_includedir}/crypto_mb/rsa.h -%{_includedir}/crypto_mb/sm3.h -%{_includedir}/crypto_mb/sm4.h -%{_includedir}/crypto_mb/status.h -%{_includedir}/crypto_mb/version.h -%{_includedir}/crypto_mb/x25519.h -%{_includedir}/crypto_mb/sm4_ccm.h -%{_includedir}/crypto_mb/sm4_gcm.h +%{_libdir}/libippcp.so %{_libdir}/libcrypto_mb.so +%{_prefix}/lib/pkgconfig/*.pc +%{_prefix}/tools/intel64/staticlib/ +%{_prefix}/tools/custom_library_tool_python/ +%{_includedir}/*.h +%{_includedir}/crypto_mb/*.h +%{_prefix}/lib/cmake/ippcp/ %files static +%{_libdir}/libippcp.a %{_libdir}/libcrypto_mb.a %files doc @@ -99,6 +95,9 @@ popd %doc sources/ippcp/crypto_mb/Readme.md %changelog +* Tue Jun 27 2023 xiaojun Huang - 1.0.6-2 +- Add other ippcp libs and headers + * Mon Feb 27 2023 happy_orange - 1.0.6-1 - Update to 1.0.6