Accepting request 56638 from Base:System
Accepted submit request 56638 from user a_jaeger OBS-URL: https://build.opensuse.org/request/show/56638 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/lzo?expand=0&rev=15
This commit is contained in:
Ruediger Oertel
Git OBS Bridge
commit
f8c335688b
@ -1,78 +0,0 @@
|
||||
Index: src/lzo_init.c
|
||||
===================================================================
|
||||
--- src/lzo_init.c.orig 2008-04-30 14:51:49.000000000 +0200
|
||||
+++ src/lzo_init.c 2010-02-11 12:25:02.000000000 +0100
|
||||
@@ -90,8 +90,13 @@ LZO_PUBLIC(int)
|
||||
_lzo_config_check(void)
|
||||
{
|
||||
lzo_bool r = 1;
|
||||
- union { unsigned char c[2*sizeof(lzo_xint)]; lzo_xint l[2]; } u;
|
||||
- lzo_uintptr_t p;
|
||||
+ volatile union {
|
||||
+ unsigned char c[2*sizeof(lzo_xint)];
|
||||
+ lzo_xint l[2];
|
||||
+ unsigned short s[2*sizeof(lzo_xint)/sizeof(unsigned short)];
|
||||
+ lzo_uint32 i[2*sizeof(lzo_xint)/sizeof(lzo_uint32)];
|
||||
+ } u;
|
||||
+ const volatile unsigned char *p;
|
||||
|
||||
#if !defined(LZO_CFG_NO_CONFIG_CHECK)
|
||||
#if defined(LZO_ABI_BIG_ENDIAN)
|
||||
@@ -103,14 +108,14 @@ _lzo_config_check(void)
|
||||
r &= (u.l[0] == 128);
|
||||
#endif
|
||||
#if defined(LZO_UNALIGNED_OK_2)
|
||||
- p = (lzo_uintptr_t) (const lzo_voidp) &u.c[0];
|
||||
+ p = &u.c[0];
|
||||
u.l[0] = u.l[1] = 0;
|
||||
- r &= ((* (const lzo_ushortp) (p+1)) == 0);
|
||||
+ r &= ((* (const volatile unsigned short *) (p+1)) == 0);
|
||||
#endif
|
||||
#if defined(LZO_UNALIGNED_OK_4)
|
||||
- p = (lzo_uintptr_t) (const lzo_voidp) &u.c[0];
|
||||
+ p = &u.c[0];
|
||||
u.l[0] = u.l[1] = 0;
|
||||
- r &= ((* (const lzo_uint32p) (p+1)) == 0);
|
||||
+ r &= ((* (const volatile lzo_uint32 *) (p+1)) == 0);
|
||||
#endif
|
||||
#endif
|
||||
|
||||
Index: minilzo/minilzo.c
|
||||
===================================================================
|
||||
--- minilzo/minilzo.c.orig 2008-04-30 14:51:49.000000000 +0200
|
||||
+++ minilzo/minilzo.c 2010-02-11 12:25:08.000000000 +0100
|
||||
@@ -2444,8 +2444,13 @@ LZO_PUBLIC(int)
|
||||
_lzo_config_check(void)
|
||||
{
|
||||
lzo_bool r = 1;
|
||||
- union { unsigned char c[2*sizeof(lzo_xint)]; lzo_xint l[2]; } u;
|
||||
- lzo_uintptr_t p;
|
||||
+ volatile union {
|
||||
+ unsigned char c[2*sizeof(lzo_xint)];
|
||||
+ lzo_xint l[2];
|
||||
+ unsigned short s[2*sizeof(lzo_xint)/sizeof(unsigned short)];
|
||||
+ lzo_uint32 i[2*sizeof(lzo_xint)/sizeof(lzo_uint32)];
|
||||
+ } u;
|
||||
+ const volatile unsigned char *p;
|
||||
|
||||
#if !defined(LZO_CFG_NO_CONFIG_CHECK)
|
||||
#if defined(LZO_ABI_BIG_ENDIAN)
|
||||
@@ -2457,14 +2462,14 @@ _lzo_config_check(void)
|
||||
r &= (u.l[0] == 128);
|
||||
#endif
|
||||
#if defined(LZO_UNALIGNED_OK_2)
|
||||
- p = (lzo_uintptr_t) (const lzo_voidp) &u.c[0];
|
||||
+ p = &u.c[0];
|
||||
u.l[0] = u.l[1] = 0;
|
||||
- r &= ((* (const lzo_ushortp) (p+1)) == 0);
|
||||
+ r &= ((* (const volatile unsigned short *) (p+1)) == 0);
|
||||
#endif
|
||||
#if defined(LZO_UNALIGNED_OK_4)
|
||||
- p = (lzo_uintptr_t) (const lzo_voidp) &u.c[0];
|
||||
+ p = &u.c[0];
|
||||
u.l[0] = u.l[1] = 0;
|
||||
- r &= ((* (const lzo_uint32p) (p+1)) == 0);
|
||||
+ r &= ((* (const volatile lzo_uint32 *) (p+1)) == 0);
|
||||
#endif
|
||||
#endif
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:75d657681fe57969a5ff629cbed6c7bffa2a54eacc49a68f830aa37de7897fc7
|
||||
size 462060
|
||||
3
lzo-2.04.tar.bz2
Normal file
3
lzo-2.04.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:414bcb5361d50528723e20c154a776b2fa0d9c3a6e33cd6d0a4ef7b645fe5de1
|
||||
size 478581
|
||||
16
lzo.changes
16
lzo.changes
@ -1,3 +1,19 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Dec 22 03:29:01 UTC 2010 - aj@suse.de
|
||||
|
||||
- Fix specfile (remove deleted lzo-2.03-alias.patch).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Nov 12 11:09:42 UTC 2010 - mrueckert@suse.de
|
||||
|
||||
- update to 2.0.4
|
||||
* Fixed a gcc-4.5 aliasing issue in lzo_init().
|
||||
* Updated the configure system.
|
||||
* Assorted cleanups.
|
||||
- dropped lzo-2.03-alias.patch:
|
||||
solved differently upstream
|
||||
- dropped debug_package_requires define
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Oct 30 19:05:43 UTC 2010 - cristian.rodriguez@opensuse.org
|
||||
|
||||
|
||||
5
lzo.spec
5
lzo.spec
@ -20,12 +20,11 @@
|
||||
|
||||
Name: lzo
|
||||
Url: http://www.oberhumer.com/opensource/lzo/
|
||||
Version: 2.03
|
||||
Version: 2.04
|
||||
Release: 12
|
||||
Group: Development/Libraries/C and C++
|
||||
Source: lzo-%{version}.tar.bz2
|
||||
Source2: baselibs.conf
|
||||
Patch1: lzo-2.03-alias.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildRequires: gcc-c++
|
||||
# bug437293
|
||||
@ -50,7 +49,6 @@ Authors:
|
||||
Markus Franz Xaver Johannes Oberhumer <markus@oberhumer.com>
|
||||
|
||||
%define library_package liblzo2-2
|
||||
%define debug_package_requires %{library_package} = %{version}-%{release}
|
||||
|
||||
%package -n liblzo2-2
|
||||
License: GPLv2
|
||||
@ -103,7 +101,6 @@ Authors:
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch1
|
||||
|
||||
%build
|
||||
export CFLAGS="%optflags -fvisibility=hidden"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user