diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2015-11-06 17:26:34 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2015-11-07 09:44:24 +0100 |
| commit | bd68de8c75d2cc3933342a62fd5150efddeca728 (patch) | |
| tree | 6066b59ed72eb23362c4594e317195ae1952d60d /patches/lz4-r131 | |
| parent | 0c2c9c8b44ef80a7e0531fb5246e6240ef6c1bf1 (diff) | |
| download | ptxdist-bd68de8c75d2cc3933342a62fd5150efddeca728.tar.gz ptxdist-bd68de8c75d2cc3933342a62fd5150efddeca728.tar.xz | |
lz4: version bump r127 -> r131
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches/lz4-r131')
| -rw-r--r-- | patches/lz4-r131/0001-lib-Makefile-don-t-rebuild-lib-during-install.patch | 48 | ||||
| -rw-r--r-- | patches/lz4-r131/0002-build-lz4c-by-default.patch | 24 | ||||
| -rw-r--r-- | patches/lz4-r131/series | 5 |
3 files changed, 77 insertions, 0 deletions
diff --git a/patches/lz4-r131/0001-lib-Makefile-don-t-rebuild-lib-during-install.patch b/patches/lz4-r131/0001-lib-Makefile-don-t-rebuild-lib-during-install.patch new file mode 100644 index 000000000..466c46c30 --- /dev/null +++ b/patches/lz4-r131/0001-lib-Makefile-don-t-rebuild-lib-during-install.patch @@ -0,0 +1,48 @@ +From: Michael Olbrich <m.olbrich@pengutronix.de> +Date: Sat, 28 Feb 2015 11:07:19 +0100 +Subject: [PATCH] lib/Makefile: don't rebuild lib during install + +Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> +--- + lib/Makefile | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/lib/Makefile b/lib/Makefile +index 02ddd3b5f285..feaaa13525d8 100644 +--- a/lib/Makefile ++++ b/lib/Makefile +@@ -60,19 +60,19 @@ else + SHARED_EXT_VER = $(SHARED_EXT).$(LIBVER) + endif + +-default: liblz4 ++default: liblz4.$(SHARED_EXT) + +-all: liblz4 ++all: liblz4.$(SHARED_EXT) + +-liblz4: lz4.c lz4hc.c lz4frame.c xxhash.c ++liblz4.$(SHARED_EXT): lz4.c lz4hc.c lz4frame.c xxhash.c + @echo compiling static library + @$(CC) $(CPPFLAGS) $(CFLAGS) -c $^ + @$(AR) rcs liblz4.a lz4.o lz4hc.o lz4frame.o xxhash.o + @echo compiling dynamic library $(LIBVER) +- @$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -shared $^ -fPIC $(SONAME_FLAGS) -o $@.$(SHARED_EXT_VER) ++ @$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -shared $^ -fPIC $(SONAME_FLAGS) -o $(basename $@).$(SHARED_EXT_VER) + @echo creating versioned links +- @ln -sf $@.$(SHARED_EXT_VER) $@.$(SHARED_EXT_MAJOR) +- @ln -sf $@.$(SHARED_EXT_VER) $@.$(SHARED_EXT) ++ @ln -sf $(basename $@).$(SHARED_EXT_VER) $(basename $@).$(SHARED_EXT_MAJOR) ++ @ln -sf $(basename $@).$(SHARED_EXT_VER) $(basename $@).$(SHARED_EXT) + + clean: + @rm -f core *.o *.a *.$(SHARED_EXT) *.$(SHARED_EXT).* liblz4.pc +@@ -91,7 +91,7 @@ liblz4.pc: liblz4.pc.in Makefile + -e 's|@VERSION@|$(VERSION)|' \ + $< >$@ + +-install: liblz4 liblz4.pc ++install: liblz4.$(SHARED_EXT) liblz4.pc + @install -d -m 755 $(DESTDIR)$(LIBDIR)/pkgconfig/ $(DESTDIR)$(INCLUDEDIR)/ + @install -m 755 liblz4.$(SHARED_EXT_VER) $(DESTDIR)$(LIBDIR)/liblz4.$(SHARED_EXT_VER) + @cp -a liblz4.$(SHARED_EXT_MAJOR) $(DESTDIR)$(LIBDIR) diff --git a/patches/lz4-r131/0002-build-lz4c-by-default.patch b/patches/lz4-r131/0002-build-lz4c-by-default.patch new file mode 100644 index 000000000..bf8cfe365 --- /dev/null +++ b/patches/lz4-r131/0002-build-lz4c-by-default.patch @@ -0,0 +1,24 @@ +From: Michael Olbrich <m.olbrich@pengutronix.de> +Date: Fri, 6 Nov 2015 17:33:05 +0100 +Subject: [PATCH] build lz4c by default + +otherwise it wil be build during 'make install' + +Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> +--- + programs/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/programs/Makefile b/programs/Makefile +index f422902e0271..1e71f2e42a0f 100644 +--- a/programs/Makefile ++++ b/programs/Makefile +@@ -64,7 +64,7 @@ TEST_TARGETS := test-native + FUZZER_TIME := -T9mn + + +-default: lz4 ++default: lz4 lz4c + + m32: lz4c32 fullbench32 fuzzer32 frametest32 + diff --git a/patches/lz4-r131/series b/patches/lz4-r131/series new file mode 100644 index 000000000..969952db9 --- /dev/null +++ b/patches/lz4-r131/series @@ -0,0 +1,5 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-lib-Makefile-don-t-rebuild-lib-during-install.patch +0002-build-lz4c-by-default.patch +# b3c4066d184224140067867c994e02db - git-ptx-patches magic |