diff options
-rw-r--r-- | meta/recipes-devtools/file/file_5.40.bb (renamed from meta/recipes-devtools/file/file_5.39.bb) | 5 | ||||
-rw-r--r-- | meta/recipes-devtools/file/files/0001-src-compress.c-correct-header-define-for-xz-lzma.patch | 27 |
2 files changed, 2 insertions, 30 deletions
diff --git a/meta/recipes-devtools/file/file_5.39.bb b/meta/recipes-devtools/file/file_5.40.bb index abaa8149a3..ec79839bd2 100644 --- a/meta/recipes-devtools/file/file_5.39.bb +++ b/meta/recipes-devtools/file/file_5.40.bb | |||
@@ -11,10 +11,9 @@ LIC_FILES_CHKSUM = "file://COPYING;beginline=2;md5=0251eaec1188b20d9a72c502ecfdd | |||
11 | DEPENDS = "file-replacement-native" | 11 | DEPENDS = "file-replacement-native" |
12 | DEPENDS_class-native = "bzip2-replacement-native" | 12 | DEPENDS_class-native = "bzip2-replacement-native" |
13 | 13 | ||
14 | SRC_URI = "git://github.com/file/file.git \ | 14 | SRC_URI = "git://github.com/file/file.git" |
15 | file://0001-src-compress.c-correct-header-define-for-xz-lzma.patch" | ||
16 | 15 | ||
17 | SRCREV = "87731415de945660b00f02207d8e9d986ef9b82e" | 16 | SRCREV = "f49fda6f52a9477d817dbd9c06afab02daf025f8" |
18 | S = "${WORKDIR}/git" | 17 | S = "${WORKDIR}/git" |
19 | 18 | ||
20 | inherit autotools update-alternatives | 19 | inherit autotools update-alternatives |
diff --git a/meta/recipes-devtools/file/files/0001-src-compress.c-correct-header-define-for-xz-lzma.patch b/meta/recipes-devtools/file/files/0001-src-compress.c-correct-header-define-for-xz-lzma.patch deleted file mode 100644 index f8ba2f6153..0000000000 --- a/meta/recipes-devtools/file/files/0001-src-compress.c-correct-header-define-for-xz-lzma.patch +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | From ffb6ebdb42590cb9f7d3f5177b7b820a9edc4c81 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Sun, 18 Oct 2020 23:40:42 +0200 | ||
4 | Subject: [PATCH] src/compress.c: correct header define for xz/lzma | ||
5 | |||
6 | Upstream-Status: Submitted [https://github.com/file/file/pull/98] | ||
7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
8 | --- | ||
9 | src/compress.c | 2 +- | ||
10 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
11 | |||
12 | diff --git a/src/compress.c b/src/compress.c | ||
13 | index 67f21583..9670b72c 100644 | ||
14 | --- a/src/compress.c | ||
15 | +++ b/src/compress.c | ||
16 | @@ -71,7 +71,7 @@ typedef void (*sig_t)(int); | ||
17 | #include <bzlib.h> | ||
18 | #endif | ||
19 | |||
20 | -#if defined(HAVE_XZLIB_H) && defined(XZLIBSUPPORT) | ||
21 | +#if defined(HAVE_LZMA_H) && defined(XZLIBSUPPORT) | ||
22 | #define BUILTIN_XZLIB | ||
23 | #include <lzma.h> | ||
24 | #endif | ||
25 | -- | ||
26 | 2.28.0 | ||
27 | |||