From 6f0089b0298b23e2ef826b024967334fbe9d42d1 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Dec 16 2016 08:04:11 +0000 Subject: fix concurrency FTBFS Signed-off-by: Igor Gnatenko --- diff --git a/0001-fix-make-concurrency-build-277.patch b/0001-fix-make-concurrency-build-277.patch new file mode 100644 index 0000000..197ed1a --- /dev/null +++ b/0001-fix-make-concurrency-build-277.patch @@ -0,0 +1,40 @@ +From d26ee3fa74dc1c3ddcd7c490b098287d2a400629 Mon Sep 17 00:00:00 2001 +From: Yann Collet +Date: Thu, 15 Dec 2016 22:13:36 +0100 +Subject: [PATCH] fix `make` concurrency build (#277) + +(cherry picked from commit 913b98fd6fe814ee4c719a90a0642497c9d3d0dc) +--- + Makefile | 4 +++- + NEWS | 1 + + 2 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 48e6752..c77f697 100644 +--- a/Makefile ++++ b/Makefile +@@ -52,7 +52,9 @@ endif + + .PHONY: default all lib lz4 clean test versionsTest examples + +-default: lib lz4-release ++default: ++ @$(MAKE) -C $(LZ4DIR) ++ @$(MAKE) -C $(PRGDIR) + + all: + @$(MAKE) -C $(LZ4DIR) $@ +diff --git a/NEWS b/NEWS +index f6874ce..d41c91f 100644 +--- a/NEWS ++++ b/NEWS +@@ -1,5 +1,6 @@ + v1.7.4.2 + fix : Makefile : release build compatible with PIE and customized compilation directives provided through environment variables (#274, reported by Antoine Martin) ++build : Makefile : fix concurrency lib+exe build (#277) + + v1.7.4 + Improved : much better speed in -mx32 mode +-- +2.11.0 + diff --git a/lz4.spec b/lz4.spec index 7cf2606..8bb5719 100644 --- a/lz4.spec +++ b/lz4.spec @@ -6,6 +6,8 @@ Summary: Extremely fast compression algorithm License: GPLv2+ and BSD URL: https://lz4.github.io/lz4/ Source0: https://github.com/Cyan4973/lz4/archive/v%{version}/%{name}-%{version}.tar.gz +# https://github.com/lz4/lz4/issues/277 +Patch0001: 0001-fix-make-concurrency-build-277.patch %description LZ4 is an extremely fast loss-less compression algorithm, providing compression