Update to lz4-r121
This commit is contained in:
parent
180584db63
commit
648f2e6a85
1
.gitignore
vendored
1
.gitignore
vendored
@ -6,3 +6,4 @@
|
||||
/lz4-r117.tar.gz
|
||||
/lz4-r118.tar.gz
|
||||
/lz4-r119.tar.gz
|
||||
/lz4-r121.tar.gz
|
||||
|
||||
33
0001-Makefile-fix-DESTDIR.patch
Normal file
33
0001-Makefile-fix-DESTDIR.patch
Normal file
@ -0,0 +1,33 @@
|
||||
From 2aabe3fd4cc36924db3b5e7b06d6adc7f9302bb7 Mon Sep 17 00:00:00 2001
|
||||
From: Igor Gnatenko <i.gnatenko.brain@gmail.com>
|
||||
Date: Fri, 8 Aug 2014 10:23:00 +0200
|
||||
Subject: [PATCH] Makefile: fix DESTDIR
|
||||
|
||||
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
|
||||
---
|
||||
Makefile | 10 +++++-----
|
||||
1 file changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index b2b64e7..36e75c5 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -38,11 +38,11 @@ LIBVER_MINOR=`sed -n '/define LZ4_VERSION_MINOR/s/.*[[:blank:]]\([0-9][0-9]*\).*
|
||||
LIBVER_PATCH=`sed -n '/define LZ4_VERSION_RELEASE/s/.*[[:blank:]]\([0-9][0-9]*\).*/\1/p' < lz4.h`
|
||||
LIBVER=$(LIBVER_MAJOR).$(LIBVER_MINOR).$(LIBVER_PATCH)
|
||||
|
||||
-DESTDIR=
|
||||
-PREFIX = /usr
|
||||
-CC := $(CC)
|
||||
-CFLAGS?= -O3
|
||||
-CFLAGS+= -I. -std=c99 -Wall -Wextra -Wundef -Wshadow -Wstrict-prototypes -DLZ4_VERSION=\"$(RELEASE)\"
|
||||
+DESTDIR?=
|
||||
+PREFIX ?= /usr
|
||||
+CC := $(CC)
|
||||
+CFLAGS ?= -O3
|
||||
+CFLAGS += -I. -std=c99 -Wall -Wextra -Wundef -Wshadow -Wstrict-prototypes -DLZ4_VERSION=\"$(RELEASE)\"
|
||||
|
||||
LIBDIR?= $(PREFIX)/lib
|
||||
INCLUDEDIR=$(PREFIX)/include
|
||||
--
|
||||
2.0.4
|
||||
28
lz4.spec
28
lz4.spec
@ -1,14 +1,16 @@
|
||||
%global _hardened_build 1
|
||||
|
||||
Name: lz4
|
||||
Version: r119
|
||||
Release: 1%{?dist}
|
||||
Version: r121
|
||||
Release: 2%{?dist}
|
||||
Summary: Extremely fast compression algorithm
|
||||
|
||||
Group: Applications/System
|
||||
License: GPLv2+ and BSD
|
||||
URL: https://code.google.com/p/lz4/
|
||||
Source0: https://github.com/Cyan4973/lz4/archive/%{version}/%{name}-%{version}.tar.gz
|
||||
# https://github.com/Cyan4973/lz4/pull/18
|
||||
Patch0: 0001-Makefile-fix-DESTDIR.patch
|
||||
|
||||
%if 0%{?rhel}
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
|
||||
@ -32,18 +34,19 @@ applications using liblz4 library.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
|
||||
%patch0 -p1
|
||||
echo '#!/bin/sh' > ./configure
|
||||
chmod +x ./configure
|
||||
|
||||
%build
|
||||
export CFLAGS="$RPM_OPT_FLAGS"
|
||||
%configure
|
||||
make %{?_smp_mflags}
|
||||
|
||||
|
||||
%install
|
||||
make install PREFIX=$RPM_BUILD_ROOT%{_prefix} \
|
||||
LIBDIR=$RPM_BUILD_ROOT%{_libdir} INSTALL="install -p"
|
||||
chmod -x $RPM_BUILD_ROOT%{_includedir}/*.h
|
||||
rm $RPM_BUILD_ROOT%{_libdir}/liblz4.a
|
||||
%make_install LIBDIR=%{_libdir} INSTALL="install -p"
|
||||
chmod -x %{buildroot}%{_includedir}/*.h
|
||||
rm %{buildroot}%{_libdir}/liblz4.a
|
||||
|
||||
|
||||
%post -p /sbin/ldconfig
|
||||
@ -63,8 +66,17 @@ rm $RPM_BUILD_ROOT%{_libdir}/liblz4.a
|
||||
%doc LICENSE
|
||||
%{_includedir}/*.h
|
||||
%{_libdir}/liblz4.so
|
||||
%{_libdir}/pkgconfig/liblz4.pc
|
||||
|
||||
%changelog
|
||||
* Fri Aug 08 2014 Igor Gnatenko <i.gnatenko.brain@gmail.com> - r121-2
|
||||
- fix destdir
|
||||
|
||||
* Fri Aug 08 2014 pjp <pjp@fedoraproject.org> - r121-1
|
||||
- new release
|
||||
- Added a pkg-config file.
|
||||
- Fixed a LZ4 streaming crash bug.
|
||||
|
||||
* Thu Jul 03 2014 pjp <pjp@fedoraproject.org> - r119-1
|
||||
- new release
|
||||
- Fixed a high Address allocation issue in 32-bits mode.
|
||||
|
||||
Loading…
Reference in New Issue
Block a user