diff --git a/0001-lzo-add-sw.patch b/0001-lzo-add-sw.patch new file mode 100644 index 0000000000000000000000000000000000000000..faf376e0be93d2bf838ee6960cd6e87b8eb3e8c1 --- /dev/null +++ b/0001-lzo-add-sw.patch @@ -0,0 +1,96 @@ +From 6e91cc58eeb09d19d3b2850a4984a8e5fe07c79c Mon Sep 17 00:00:00 2001 +From: wxiat +Date: Mon, 26 Jun 2023 16:37:16 +0800 +Subject: [PATCH] add sw + +Signed-off-by: wxiat +--- + include/lzo/lzodefs.h | 9 ++++++--- + minilzo/minilzo.c | 9 ++++++--- + 2 files changed, 12 insertions(+), 6 deletions(-) + +diff --git a/include/lzo/lzodefs.h b/include/lzo/lzodefs.h +index b44021d..13a782c 100644 +--- a/include/lzo/lzodefs.h ++++ b/include/lzo/lzodefs.h +@@ -773,6 +773,9 @@ + #elif defined(__aarch64__) + # define LZO_ARCH_ARM64 1 + # define LZO_INFO_ARCH "arm64" ++#elif defined(__sw_64__) || defined(__sw_64) || defined(_M_SW_64) ++# define LZO_ARCH_SW_64 1 ++# define LZO_INFO_ARCH "sw_64" + #elif defined(__alpha__) || defined(__alpha) || defined(_M_ALPHA) + # define LZO_ARCH_ALPHA 1 + # define LZO_INFO_ARCH "alpha" +@@ -2154,7 +2157,7 @@ LZO_COMPILE_TIME_ASSERT_HEADER(LZO_SIZEOF_LONG == sizeof(long)) + # undef LZO_SIZEOF_LONG_LONG + #endif + #if !defined(LZO_WORDSIZE) +-#if (LZO_ARCH_ALPHA) ++#if (LZO_ARCH_ALPHA) || (LZO_ARCH_SW_64) + # define LZO_WORDSIZE 8 + #elif (LZO_ARCH_AMD64) + # define LZO_WORDSIZE 8 +@@ -2300,7 +2303,7 @@ LZO_COMPILE_TIME_ASSERT_HEADER(LZO_SIZEOF_PTRDIFF_T == sizeof(ptrdiff_t)) + # define LZO_ABI_BIG_ENDIAN 1 + #elif (LZO_ARCH_IA64) && (LZO_OS_POSIX_LINUX || LZO_OS_WIN64) + # define LZO_ABI_LITTLE_ENDIAN 1 +-#elif (LZO_ARCH_ALPHA || LZO_ARCH_AMD64 || LZO_ARCH_BLACKFIN || LZO_ARCH_CRIS || LZO_ARCH_I086 || LZO_ARCH_I386 || LZO_ARCH_MSP430) ++#elif (LZO_ARCH_ALPHA || LZO_ARCH_SW_64 || LZO_ARCH_AMD64 || LZO_ARCH_BLACKFIN || LZO_ARCH_CRIS || LZO_ARCH_I086 || LZO_ARCH_I386 || LZO_ARCH_MSP430) + # define LZO_ABI_LITTLE_ENDIAN 1 + #elif (LZO_ARCH_AVR32 || LZO_ARCH_M68K || LZO_ARCH_S390 || LZO_ARCH_SPU) + # define LZO_ABI_BIG_ENDIAN 1 +@@ -2443,7 +2446,7 @@ LZO_COMPILE_TIME_ASSERT_HEADER(LZO_SIZEOF_PTRDIFF_T == sizeof(ptrdiff_t)) + # define __LZO_ASM_CLOBBER_LIST_EMPTY /*empty*/ + #endif + #endif +-#if (LZO_ARCH_ALPHA) ++#if (LZO_ARCH_ALPHA) || (LZO_ARCH_SW_64) + # define LZO_OPT_AVOID_UINT_INDEX 1 + #elif (LZO_ARCH_AMD64) + # define LZO_OPT_AVOID_INT_INDEX 1 +diff --git a/minilzo/minilzo.c b/minilzo/minilzo.c +index ab2be5f..07cd79f 100644 +--- a/minilzo/minilzo.c ++++ b/minilzo/minilzo.c +@@ -793,6 +793,9 @@ + #elif defined(__aarch64__) + # define LZO_ARCH_ARM64 1 + # define LZO_INFO_ARCH "arm64" ++#elif defined(__sw_64__) || defined(__sw_64) || defined(_M_SW_64) ++# define LZO_ARCH_SW_64 1 ++# define LZO_INFO_ARCH "sw_64" + #elif defined(__alpha__) || defined(__alpha) || defined(_M_ALPHA) + # define LZO_ARCH_ALPHA 1 + # define LZO_INFO_ARCH "alpha" +@@ -2170,7 +2173,7 @@ LZO_COMPILE_TIME_ASSERT_HEADER(LZO_SIZEOF_LONG == sizeof(long)) + # undef LZO_SIZEOF_LONG_LONG + #endif + #if !defined(LZO_WORDSIZE) +-#if (LZO_ARCH_ALPHA) ++#if (LZO_ARCH_ALPHA) || (LZO_ARCH_SW_64) + # define LZO_WORDSIZE 8 + #elif (LZO_ARCH_AMD64) + # define LZO_WORDSIZE 8 +@@ -2316,7 +2319,7 @@ LZO_COMPILE_TIME_ASSERT_HEADER(LZO_SIZEOF_PTRDIFF_T == sizeof(ptrdiff_t)) + # define LZO_ABI_BIG_ENDIAN 1 + #elif (LZO_ARCH_IA64) && (LZO_OS_POSIX_LINUX || LZO_OS_WIN64) + # define LZO_ABI_LITTLE_ENDIAN 1 +-#elif (LZO_ARCH_ALPHA || LZO_ARCH_AMD64 || LZO_ARCH_BLACKFIN || LZO_ARCH_CRIS || LZO_ARCH_I086 || LZO_ARCH_I386 || LZO_ARCH_MSP430) ++#elif (LZO_ARCH_ALPHA || LZO_ARCH_SW_64 || LZO_ARCH_AMD64 || LZO_ARCH_BLACKFIN || LZO_ARCH_CRIS || LZO_ARCH_I086 || LZO_ARCH_I386 || LZO_ARCH_MSP430) + # define LZO_ABI_LITTLE_ENDIAN 1 + #elif (LZO_ARCH_AVR32 || LZO_ARCH_M68K || LZO_ARCH_S390 || LZO_ARCH_SPU) + # define LZO_ABI_BIG_ENDIAN 1 +@@ -2459,7 +2462,7 @@ LZO_COMPILE_TIME_ASSERT_HEADER(LZO_SIZEOF_PTRDIFF_T == sizeof(ptrdiff_t)) + # define __LZO_ASM_CLOBBER_LIST_EMPTY /*empty*/ + #endif + #endif +-#if (LZO_ARCH_ALPHA) ++#if (LZO_ARCH_ALPHA) || (LZO_ARCH_SW_64) + # define LZO_OPT_AVOID_UINT_INDEX 1 + #elif (LZO_ARCH_AMD64) + # define LZO_OPT_AVOID_INT_INDEX 1 +-- +2.31.1 + diff --git a/lzo.spec b/lzo.spec index cf412b7d21e726d6b4209b2151e816e45ac953dc..bfe11db20864f2850e43ede40db3853339b6fda8 100644 --- a/lzo.spec +++ b/lzo.spec @@ -1,6 +1,8 @@ +%define anolis_release .0.1 + Name: lzo Version: 2.08 -Release: 14%{?dist} +Release: 14%{anolis_release}%{?dist} Summary: Data compression library with very fast (de)compression Group: System Environment/Libraries License: GPLv2+ @@ -8,6 +10,7 @@ URL: http://www.oberhumer.com/opensource/lzo/ Source0: http://www.oberhumer.com/opensource/lzo/download/%{name}-%{version}.tar.gz Patch0: lzo-2.08-configure.patch Patch1: lzo-2.08-rhbz1309225.patch +Patch2: 0001-lzo-add-sw.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: zlib-devel @@ -45,6 +48,7 @@ This package contains development files needed for lzo. %setup -q %patch0 -p1 -z .configure %patch1 -p1 -z .rhbz1309225 +%patch2 -p1 # mark asm files as NOT needing execstack for i in asm/i386/src_gas/*.S; do echo '.section .note.GNU-stack,"",@progbits' >> $i @@ -109,6 +113,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jun 26 2023 wxiat - 2.08-14.0.1 +- add sw patch + * Tue Oct 9 2018 Jaroslav Škarvada - 2.08-14 - Added build notes to AS generated objects Resolves: rhbz#1630594