From d3bd25345fbf54a1bc56aeb746c317540446bf54 Mon Sep 17 00:00:00 2001 From: hongwei-qin Date: Fri, 4 Mar 2022 10:57:38 -0500 Subject: [PATCH] Init for Anolis OS 23 --- lzo-2.08-configure.patch | 24 ------------------------ lzo-2.08-rhbz1309225.patch | 14 -------------- lzo.spec | 2 -- 3 files changed, 40 deletions(-) delete mode 100644 lzo-2.08-configure.patch delete mode 100644 lzo-2.08-rhbz1309225.patch diff --git a/lzo-2.08-configure.patch b/lzo-2.08-configure.patch deleted file mode 100644 index 78f2282..0000000 --- a/lzo-2.08-configure.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naur lzo-2.08/configure lzo-2.08.configure/configure ---- lzo-2.08/configure 2014-06-29 15:08:49.000000000 +0530 -+++ lzo-2.08.configure/configure 2014-06-30 10:38:08.344604418 +0530 -@@ -13875,7 +13875,7 @@ - asm_msg_amd64=no - asm_msg_i386=no - --case "$host_cpu-$ac_cv_sizeof_void_p" in -+case "$target_cpu-$ac_cv_sizeof_void_p" in - amd64-8 | x86_64-8) asm_arch="amd64"; asm_dir="asm/amd64/src_gas/elf64"; asm_mode="amd64_src_gas_elf64" ;; - i?86-4) asm_arch="i386"; asm_dir="asm/i386/src_gas"; asm_mode="i386_src_gas" ;; - *) enable_asm=no ;; -diff -Naur lzo-2.08/configure.ac lzo-2.08.configure/configure.ac ---- lzo-2.08/configure.ac 2014-06-29 15:08:49.000000000 +0530 -+++ lzo-2.08.configure/configure.ac 2014-06-30 10:38:38.706603340 +0530 -@@ -123,7 +123,7 @@ - asm_msg_amd64=no - asm_msg_i386=no - --case "$host_cpu-$ac_cv_sizeof_void_p" in -+case "$target_cpu-$ac_cv_sizeof_void_p" in - amd64-8 | x86_64-8) asm_arch="amd64"; asm_dir="asm/amd64/src_gas/elf64"; asm_mode="amd64_src_gas_elf64" ;; - i?86-4) asm_arch="i386"; asm_dir="asm/i386/src_gas"; asm_mode="i386_src_gas" ;; - *) enable_asm=no ;; diff --git a/lzo-2.08-rhbz1309225.patch b/lzo-2.08-rhbz1309225.patch deleted file mode 100644 index a4b9de8..0000000 --- a/lzo-2.08-rhbz1309225.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up lzo-2.08/include/lzo/lzodefs.h.rhbz1309225 lzo-2.08/include/lzo/lzodefs.h ---- lzo-2.08/include/lzo/lzodefs.h.rhbz1309225 2016-02-19 13:38:02.604220910 +0100 -+++ lzo-2.08/include/lzo/lzodefs.h 2016-02-19 13:37:30.619073085 +0100 -@@ -1686,6 +1686,10 @@ extern "C" { - # define __lzo_byte_struct_ma(s,n) struct s { unsigned char a[n]; } __lzo_may_alias __attribute__((__packed__)); - #endif - #endif -+#if (LZO_CC_GNUC >= 0x060000ul) && defined(__lzo_byte_struct_ma) -+# undef __lzo_byte_struct -+# define __lzo_byte_struct(s,n) __lzo_byte_struct_ma(s,n) -+#endif - #if defined(__lzo_byte_struct) && !defined(__lzo_byte_struct_ma) - # define __lzo_byte_struct_ma(s,n) __lzo_byte_struct(s,n) - #endif diff --git a/lzo.spec b/lzo.spec index 3a7dc27..804b603 100644 --- a/lzo.spec +++ b/lzo.spec @@ -8,8 +8,6 @@ License: GPLv2+ 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 BuildRequires: make BuildRequires: gcc -- Gitee