summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2017-06-26 16:14:24 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-06-28 20:55:09 +0100
commitabc7131777e8ea8e6aacc5118bbb5c24883c0ead (patch)
tree1474b29d5a59577b337e4d1f7ee42d9158080f47 /meta
parent9c001dc9eb3f5e334276beee5b92b51e9633f12b (diff)
downloadpoky-abc7131777e8ea8e6aacc5118bbb5c24883c0ead.tar.gz
lz4: Add patch to fix re-builds
Configure fails when rebuilding lz4 as LIBDIR is used in two different places for two different things and we override it with a environment variable. (From OE-Core rev: c594cacc88b4239f2be2ee97ea127ae27186dbcd) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/lz4/files/0001-tests-Makefile-don-t-use-LIBDIR-as-variable.patch82
-rw-r--r--meta/recipes-support/lz4/lz4_1.7.4.bb1
2 files changed, 83 insertions, 0 deletions
diff --git a/meta/recipes-support/lz4/files/0001-tests-Makefile-don-t-use-LIBDIR-as-variable.patch b/meta/recipes-support/lz4/files/0001-tests-Makefile-don-t-use-LIBDIR-as-variable.patch
new file mode 100644
index 0000000000..00494e8019
--- /dev/null
+++ b/meta/recipes-support/lz4/files/0001-tests-Makefile-don-t-use-LIBDIR-as-variable.patch
@@ -0,0 +1,82 @@
1From d4768d9e29b805096a86aa13c0d30ee8215af4df Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Mon, 26 Jun 2017 12:07:09 +0300
4Subject: [PATCH] tests/Makefile: don't use LIBDIR as variable
5
6LIBDIR may be overriden with a environment variable: In this case make
7clean breaks. Use another variable name.
8
9Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
10Upstream-Status: Backport
11---
12 tests/Makefile | 26 +++++++++++++-------------
13 1 file changed, 13 insertions(+), 13 deletions(-)
14
15diff --git a/tests/Makefile b/tests/Makefile
16index 97fa782..51dd038 100644
17--- a/tests/Makefile
18+++ b/tests/Makefile
19@@ -32,7 +32,7 @@ DESTDIR ?=
20 PREFIX ?= /usr/local
21 BINDIR := $(PREFIX)/bin
22 MANDIR := $(PREFIX)/share/man/man1
23-LIBDIR := ../lib
24+LZ4DIR := ../lib
25 PRGDIR := ../programs
26 VOID := /dev/null
27 TESTDIR := versionsTest
28@@ -43,7 +43,7 @@ CFLAGS += -g -Wall -Wextra -Wundef -Wcast-qual -Wcast-align -Wshadow -Wswitch-e
29 -Wdeclaration-after-statement -Wstrict-prototypes \
30 -Wpointer-arith -Wstrict-aliasing=1
31 CFLAGS += $(MOREFLAGS)
32-CPPFLAGS:= -I$(LIBDIR) -I$(PRGDIR) -DXXH_NAMESPACE=LZ4_
33+CPPFLAGS:= -I$(LZ4DIR) -I$(PRGDIR) -DXXH_NAMESPACE=LZ4_
34 FLAGS = $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)
35
36
37@@ -79,31 +79,31 @@ lz4c32: # create a 32-bits version for 32/64 interop tests
38 $(MAKE) -C $(PRGDIR) clean $@ CFLAGS="-m32 $(CFLAGS)"
39 cp $(LZ4) $(LZ4)c32
40
41-fullbench : $(LIBDIR)/lz4.o $(LIBDIR)/lz4hc.o $(LIBDIR)/lz4frame.o $(LIBDIR)/xxhash.o fullbench.c
42+fullbench : $(LZ4DIR)/lz4.o $(LZ4DIR)/lz4hc.o $(LZ4DIR)/lz4frame.o $(LZ4DIR)/xxhash.o fullbench.c
43 $(CC) $(FLAGS) $^ -o $@$(EXT)
44
45-fullbench-lib: fullbench.c $(LIBDIR)/xxhash.c
46- $(MAKE) -C $(LIBDIR) liblz4.a
47- $(CC) $(FLAGS) $^ -o $@$(EXT) $(LIBDIR)/liblz4.a
48+fullbench-lib: fullbench.c $(LZ4DIR)/xxhash.c
49+ $(MAKE) -C $(LZ4DIR) liblz4.a
50+ $(CC) $(FLAGS) $^ -o $@$(EXT) $(LZ4DIR)/liblz4.a
51
52-fullbench-dll: fullbench.c $(LIBDIR)/xxhash.c
53- $(MAKE) -C $(LIBDIR) liblz4
54- $(CC) $(FLAGS) $^ -o $@$(EXT) -DLZ4_DLL_IMPORT=1 $(LIBDIR)/dll/liblz4.dll
55+fullbench-dll: fullbench.c $(LZ4DIR)/xxhash.c
56+ $(MAKE) -C $(LZ4DIR) liblz4
57+ $(CC) $(FLAGS) $^ -o $@$(EXT) -DLZ4_DLL_IMPORT=1 $(LZ4DIR)/dll/liblz4.dll
58
59-fuzzer : $(LIBDIR)/lz4.o $(LIBDIR)/lz4hc.o $(LIBDIR)/xxhash.o fuzzer.c
60+fuzzer : $(LZ4DIR)/lz4.o $(LZ4DIR)/lz4hc.o $(LZ4DIR)/xxhash.o fuzzer.c
61 $(CC) $(FLAGS) $^ -o $@$(EXT)
62
63-frametest: $(LIBDIR)/lz4frame.o $(LIBDIR)/lz4.o $(LIBDIR)/lz4hc.o $(LIBDIR)/xxhash.o frametest.c
64+frametest: $(LZ4DIR)/lz4frame.o $(LZ4DIR)/lz4.o $(LZ4DIR)/lz4hc.o $(LZ4DIR)/xxhash.o frametest.c
65 $(CC) $(FLAGS) $^ -o $@$(EXT)
66
67-fasttest: $(LIBDIR)/lz4.o fasttest.c
68+fasttest: $(LZ4DIR)/lz4.o fasttest.c
69 $(CC) $(FLAGS) $^ -o $@$(EXT)
70
71 datagen : $(PRGDIR)/datagen.c datagencli.c
72 $(CC) $(FLAGS) -I$(PRGDIR) $^ -o $@$(EXT)
73
74 clean:
75- @$(MAKE) -C $(LIBDIR) $@ > $(VOID)
76+ @$(MAKE) -C $(LZ4DIR) $@ > $(VOID)
77 @$(MAKE) -C $(PRGDIR) $@ > $(VOID)
78 @$(RM) core *.o *.test tmp* \
79 fullbench-dll$(EXT) fullbench-lib$(EXT) \
80--
812.1.4
82
diff --git a/meta/recipes-support/lz4/lz4_1.7.4.bb b/meta/recipes-support/lz4/lz4_1.7.4.bb
index 5ddffd54b9..1e98c1bd4d 100644
--- a/meta/recipes-support/lz4/lz4_1.7.4.bb
+++ b/meta/recipes-support/lz4/lz4_1.7.4.bb
@@ -11,6 +11,7 @@ PE = "1"
11SRCREV = "7bb64ff2b69a9f8367de9ab483cdadf42b4c1b65" 11SRCREV = "7bb64ff2b69a9f8367de9ab483cdadf42b4c1b65"
12 12
13SRC_URI = "git://github.com/lz4/lz4.git \ 13SRC_URI = "git://github.com/lz4/lz4.git \
14 file://0001-tests-Makefile-don-t-use-LIBDIR-as-variable.patch \
14 file://run-ptest \ 15 file://run-ptest \
15" 16"
16 17