SHA256
1
0
forked from pool/lz4

lz4-1.4.0+svn124

OBS-URL: https://build.opensuse.org/package/show/Archiving/lz4?expand=0&rev=16
This commit is contained in:
Jan Engelhardt 2014-11-28 19:13:39 +00:00 committed by Git OBS Bridge
parent 1a1b923331
commit b8440fcd19
7 changed files with 54 additions and 8 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:adccdefe61a11da079bb45ac5ecff4f4c5a429064e4967da9995d999604d6365
size 110804

3
lz4-1.4.0+svn124.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a0d2e1565a52b2c6e87005032f4523da8229ab56c595951e2b263dd7f99d8c6f
size 114636

View File

@ -1,3 +1,8 @@
From: Jan Engelhardt <jengelh@inai.de
Date: 2014-10-01 14:23:22.000000000 +0200
build: stop causing rebuilds on our side
--- ---
programs/fullbench.c | 2 +- programs/fullbench.c | 2 +-
programs/lz4cli.c | 2 +- programs/lz4cli.c | 2 +-

25
lz4-soversion.diff Normal file
View File

@ -0,0 +1,25 @@
From: Jan Engelhardt <jengelh@inai.de>
Date: 2014-11-28 20:01:01.723860722 +0100
lz4 management apparently changed the ABI in r124 (size of
LZ4_streamDecode_t changes) and did not update SO versioning.
---
Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Index: trunk/Makefile
===================================================================
--- trunk.orig/Makefile
+++ trunk/Makefile
@@ -65,9 +65,9 @@ ifeq ($(shell uname), Darwin)
SHARED_EXT_VER = $(LIBVER).$(SHARED_EXT)
SONAME_FLAGS = -install_name $(PREFIX)/lib/liblz4.$(SHARED_EXT_MAJOR) -compatibility_version $(LIBVER_MAJOR) -current_version $(LIBVER)
else
- SONAME_FLAGS = -Wl,-soname=liblz4.$(SHARED_EXT).$(LIBVER_MAJOR)
+ SONAME_FLAGS = -Wl,-soname=liblz4.$(SHARED_EXT).$(LIBVER_MAJOR).$(LIBVER_MINOR)
SHARED_EXT = so
- SHARED_EXT_MAJOR = $(SHARED_EXT).$(LIBVER_MAJOR)
+ SHARED_EXT_MAJOR = $(SHARED_EXT).$(LIBVER_MAJOR).$(LIBVER_MINOR)
SHARED_EXT_VER = $(SHARED_EXT).$(LIBVER)
endif

View File

@ -1,3 +1,9 @@
From: Jan Engelhardt <jengelh@inai.de>
Date: 2014-10-01 14:23:22.000000000 +0200
build: make programs use liblz too instead of linking it statically
Stop wasting my disk space!
--- ---
programs/Makefile | 8 ++++---- programs/Makefile | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-) 1 file changed, 4 insertions(+), 4 deletions(-)
@ -6,9 +12,9 @@ Index: trunk/programs/Makefile
=================================================================== ===================================================================
--- trunk.orig/programs/Makefile --- trunk.orig/programs/Makefile
+++ trunk/programs/Makefile +++ trunk/programs/Makefile
@@ -70,11 +70,11 @@ default: lz4 lz4c @@ -65,11 +65,11 @@ default: lz4 lz4c
all: lz4 lz4c lz4c32 fullbench fullbench32 fuzzer fuzzer32 frametest datagen all: lz4 lz4c lz4c32 fullbench fullbench32 fuzzer fuzzer32 frametest frametest32 datagen
-lz4: $(LZ4DIR)/lz4.c $(LZ4DIR)/lz4hc.c $(LZ4DIR)/xxhash.c bench.c lz4io.c lz4cli.c -lz4: $(LZ4DIR)/lz4.c $(LZ4DIR)/lz4hc.c $(LZ4DIR)/xxhash.c bench.c lz4io.c lz4cli.c
- $(CC) $(FLAGS) -DDISABLE_LZ4C_LEGACY_OPTIONS $^ -o $@$(EXT) - $(CC) $(FLAGS) -DDISABLE_LZ4C_LEGACY_OPTIONS $^ -o $@$(EXT)

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Fri Nov 28 19:02:06 UTC 2014 - jengelh@inai.de
- Update to version 1.4+svn124
* LZ4F_compressBound() may be called with NULL preferencesPtr
* LZ4_loadDict now returns the dictionary size instead of 1
on success
- Add lz4-soversion.diff to address ABI changes
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Oct 1 12:18:15 UTC 2014 - jengelh@inai.de Wed Oct 1 12:18:15 UTC 2014 - jengelh@inai.de

View File

@ -17,8 +17,8 @@
Name: lz4 Name: lz4
%define lname liblz4-1 %define lname liblz4-1_4
Version: 1.3.1+svn123 Version: 1.4.0+svn124
Release: 0 Release: 0
Summary: Hash-based Predictive Lempel-Ziv compressor Summary: Hash-based Predictive Lempel-Ziv compressor
License: GPL-2.0+ and BSD-2-Clause License: GPL-2.0+ and BSD-2-Clause
@ -31,6 +31,7 @@ Url: http://code.google.com/p/lz4/
Source: %name-%version.tar.xz Source: %name-%version.tar.xz
Patch1: lz4-use-shlib.diff Patch1: lz4-use-shlib.diff
Patch2: lz4-killdate.diff Patch2: lz4-killdate.diff
Patch3: lz4-soversion.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: pkg-config BuildRequires: pkg-config
BuildRequires: xz BuildRequires: xz
@ -71,7 +72,7 @@ applications that want to make use of liblz4.
%prep %prep
%setup -qn trunk %setup -qn trunk
%patch -P 1 -P 2 -p1 %patch -P 1 -P 2 -P 3 -p1
%build %build
make %{?_smp_mflags} CFLAGS="%optflags" make %{?_smp_mflags} CFLAGS="%optflags"