From: Jakub Bogusz Date: Thu, 16 Mar 2023 21:23:34 +0000 (+0100) Subject: - updated to 1.1.1 (new soname) X-Git-Tag: auto/th/QATzip-1.1.1-1 X-Git-Url: https://git.pld-linux.org/?a=commitdiff_plain;h=refs%2Ftags%2Fauto%2Fth%2FQATzip-1.1.1-1;hp=ef90717ebf70f9c0834a99aa9210cb4ae460a5f6;p=packages%2FQATzip.git - updated to 1.1.1 (new soname) --- diff --git a/QATzip-flags.patch b/QATzip-flags.patch index 1a7defb..9151d6c 100644 --- a/QATzip-flags.patch +++ b/QATzip-flags.patch @@ -1,28 +1,34 @@ ---- QATzip-1.0.8/configure.ac.orig 2022-08-26 23:27:15.506327523 +0200 -+++ QATzip-1.0.8/configure.ac 2022-08-27 08:20:19.899719857 +0200 -@@ -214,7 +214,7 @@ AS_IF([test "x${CFLAGS}" = "x"], - -fno-delete-null-pointer-checks -fwrapv' - ], - [ -- CFLAGS+=' -Wall -Werror -std=gnu99 -pedantic \ -+ CFLAGS="$CFLAGS"' -Wall -Werror -std=gnu99 -pedantic \ - -fstack-protector -fPIE -fPIC -fno-strict-overflow \ - -fno-delete-null-pointer-checks -fwrapv' - ] -@@ -225,10 +225,10 @@ AC_MSG_RESULT([yes]) +--- QATzip-1.1.1/configure.ac.orig 2022-08-26 23:27:15.506327523 +0200 ++++ QATzip-1.1.1/configure.ac 2022-08-27 08:20:19.899719857 +0200 +@@ -143,7 +143,7 @@ AS_IF([test ! -z "${ICP_ROOT}"], + -I${ICP_ROOT}/quickassist/include/dc/ \ + -I${ICP_ROOT}/quickassist/utilities/libusdm_drv/ \ + -I${ICP_ROOT}/quickassist/lookaside/access_layer/include/ " +- LDFLAGS+=" -Wl,-rpath,${ICP_ROOT}/build/ -L${ICP_ROOT}/build/ " ++ LDFLAGS="$LDFLAGS -Wl,-rpath,${ICP_ROOT}/build/ -L${ICP_ROOT}/build/ " + ] + ) + AC_SUBST(ICP_INCLUDE_CFLAGS) +@@ -211,15 +211,15 @@ AS_IF([test ! -z "${ICP_ROOT}"], + + #check for compile flags + AC_MSG_CHECKING([cflags]) +-CFLAGS+=' -Wall -Werror -std=gnu99 -pedantic \ ++CFLAGS="$CFLAGS "' -Wall -Werror -std=gnu99 -pedantic \ + -fstack-protector-strong -fPIE -fPIC \ + -fno-delete-null-pointer-checks -fwrapv' +-AS_IF([test "x${CC}" = "xgcc"], [CFLAGS+=' -fno-strict-overflow'], []) ++AS_IF([test "x${CC}" = "xgcc"], [CFLAGS="$CFLAGS -fno-strict-overflow"], []) + AC_MSG_RESULT([yes]) + + #check for compile flags AC_MSG_CHECKING([ldflags]) - AS_IF([test "x${LDFLAGS}" = "x"], - [ -- LDFLAGS=' -fstack-protector -fPIC -pie -z relro -z now -Wl,-z,noexecstack' -+ LDFLAGS=' -fPIC -pie -z relro -z now -Wl,-z,noexecstack' - ], - [ -- LDFLAGS+=' -fstack-protector -fPIC -pie -z relro -z now -Wl,-z,noexecstack' -+ LDFLAGS="$LDFLAGS -fPIC -pie -z relro -z now -Wl,-z,noexecstack" - ] - ) +-LDFLAGS+=' -fstack-protector-strong -fPIC -pie -z relro -z now -Wl,-z,noexecstack' ++LDFLAGS="$LDFLAGS -fstack-protector-strong -fPIC -pie -z relro -z now -Wl,-z,noexecstack" AC_MSG_RESULT([yes]) -@@ -238,11 +238,10 @@ AC_ARG_ENABLE(debug, + + #Enable debug mode +@@ -227,12 +227,10 @@ AC_ARG_ENABLE(debug, AS_HELP_STRING([--enable-debug], [Enable debug mode]), [ debug=true @@ -31,11 +37,12 @@ ] , [ debug=false -- CFLAGS+=' -O2 -D_FORTIFY_SOURCE=2' +- CFLAGS+=' -O2' +- AS_IF([test "x${CC}" = "xgcc"], [CFLAGS+=' -D_FORTIFY_SOURCE=2'], []) ] ) AM_CONDITIONAL([QATZIP_DEBUG_AC], [test x$debug = xtrue]) -@@ -252,7 +251,7 @@ AC_ARG_ENABLE(symbol, +@@ -242,7 +240,7 @@ AC_ARG_ENABLE(symbol, AS_HELP_STRING([--enable-symbol], [Enable qatzip symbol]), [ symbol=true @@ -44,3 +51,12 @@ ], [ symbol=false +@@ -255,7 +253,7 @@ AC_ARG_ENABLE(pthread_barrier, + AS_HELP_STRING([--enable-pthread-barrier], [Enable pthread_barrier]), + [ + pthread_barrier=true +- CFLAGS+=' -DENABLE_THREAD_BARRIER' ++ CFLAGS="$CFLAGS -DENABLE_THREAD_BARRIER" + ], + [ + pthread_barrier=false diff --git a/QATzip.spec b/QATzip.spec index 6b3f1d7..6e7060f 100644 --- a/QATzip.spec +++ b/QATzip.spec @@ -1,4 +1,3 @@ -# NOTE: 1.0.9 requires qatlib 22.7.0, so is not available for 32-bit ABI # # Conditional build: %bcond_without static_libs # static library @@ -6,22 +5,22 @@ Summary: Intel QuickAssist Technology (QAT) QATzip library Summary(pl.UTF-8): Biblioteka QATzip wykorzystująca Intel QuickAssist Technology (QAT) Name: QATzip -Version: 1.0.8 +Version: 1.1.1 Release: 1 License: BSD Group: Libraries #Source0Download: https://github.com/intel/QATzip/releases Source0: https://github.com/intel/QATzip/archive/v%{version}/%{name}-%{version}.tar.gz -# Source0-md5: b6d4f2b002174e064a2c27718c2a5cf5 +# Source0-md5: 460777e7cef77ced9d49101572f42782 Patch0: %{name}-types.patch Patch1: %{name}-flags.patch URL: https://github.com/intel/QATzip BuildRequires: autoconf >= 2.69 BuildRequires: automake >= 1:1.11 BuildRequires: libtool >= 2:2.4 +BuildRequires: lz4-devel BuildRequires: pkgconfig -BuildRequires: qatlib-devel -BuildRequires: sed >= 4.0 +BuildRequires: qatlib-devel >= 22.7 BuildRequires: zlib-devel >= 1.2.7 Requires: zlib >= 1.2.7 # x86_64-specific hardware, allow userspace libs for all ABIs @@ -55,7 +54,8 @@ Summary: Header files for QATzip library Summary(pl.UTF-8): Pliki nagłówkowe biblioteki QATzip Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: qatlib-devel +Requires: lz4-devel +Requires: qatlib-devel >= 22.7 Requires: zlib-devel >= 1.2.7 %description devel @@ -81,16 +81,10 @@ Statyczna biblioteka QATzip. %patch0 -p1 %patch1 -p1 -# so that -I/usr/include/qat is not required when using QATzip -%{__sed} -i -e 's,cpa_dc\.h,qat/cpa_dc.h,' include/qatzip.h - -%{__sed} -i -e 's,\$(find /usr -name cpa.h | xargs dirname),%{_includedir}/qat,' configure.ac - %build %{__libtoolize} %{__aclocal} -I m4 %{__autoconf} -%{__autoheader} %{__automake} %configure \ --disable-silent-rules \ @@ -104,6 +98,9 @@ rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT +# obsoleted by pkg-config +%{__rm} $RPM_BUILD_ROOT%{_libdir}/libqatzip.la + %clean rm -rf $RPM_BUILD_ROOT @@ -115,14 +112,14 @@ rm -rf $RPM_BUILD_ROOT %doc LICENSE README.md SECURITY.md %attr(755,root,root) %{_bindir}/qzip %attr(755,root,root) %{_libdir}/libqatzip.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libqatzip.so.2 +%attr(755,root,root) %ghost %{_libdir}/libqatzip.so.3 %{_mandir}/man1/qzip.1* %files devel %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libqatzip.so -%{_libdir}/libqatzip.la %{_includedir}/qatzip.h +%{_pkgconfigdir}/qatzip.pc %if %{without static} %files static