From b2c7ded7fca73febb6950fee2a97135dca5583bc Mon Sep 17 00:00:00 2001 From: Philippe Teuwen Date: Sun, 7 Jun 2020 12:53:24 +0200 Subject: [PATCH] Adapt get_lz4.sh --- common/get_lz4.sh | 16 +++++++++++++++- common/lz4/lz4.c | 1 + 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/common/get_lz4.sh b/common/get_lz4.sh index ef4de2c7b..0daa62a80 100755 --- a/common/get_lz4.sh +++ b/common/get_lz4.sh @@ -2,4 +2,18 @@ version=1.9.2 mkdir -p lz4 wget https://github.com/lz4/lz4/archive/v$version.zip unzip -o -j v$version "lz4-$version/LICENSE" "lz4-$version/lib/lz4.h" "lz4-$version/lib/lz4.c" "lz4-$version/lib/lz4hc.h" "lz4-$version/lib/lz4hc.c" -d lz4 -rm v$version.zip \ No newline at end of file +rm v$version.zip +patch -p0 << EOF +diff -Naur lz4/lz4.c lz4/lz4.c +--- lz4/lz4.c 2019-08-15 13:59:59.000000000 +0200 ++++ lz4/lz4.c 2020-06-07 12:50:11.788924953 +0200 +@@ -1650,7 +1650,7 @@ + * Note that it is important for performance that this function really get inlined, + * in order to remove useless branches during compilation optimization. + */ +-LZ4_FORCE_INLINE int ++int + LZ4_decompress_generic( + const char* const src, + char* const dst, +EOF diff --git a/common/lz4/lz4.c b/common/lz4/lz4.c index 375287c8a..7c7ec93bd 100644 --- a/common/lz4/lz4.c +++ b/common/lz4/lz4.c @@ -182,6 +182,7 @@ #include /* memset, memcpy */ #define MEM_INIT(p,v,s) memset((p),(v),(s)) + /*-************************************ * Common Constants **************************************/