summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Watt <JPEWhacker@gmail.com>2019-07-18 10:23:54 -0500
committerJoshua Watt <JPEWhacker@gmail.com>2019-07-18 10:25:23 -0500
commit3fa43aa92f1a1c90304f6f4f49270915d1392cce (patch)
treef7f68c3c1aec14a6c55df7cad4ce15cbb9829529
parent1d466f68a08d2251da6c46cd788bf33cc5096f4a (diff)
bzip2: Remove bbappend2.8_M2
The patch being applied by meta-mingw has been upstreamed as of 1.0.8, so there is no need to have a bbappend anymore. Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
-rw-r--r--recipes-extended/bzip2/bzip2/0001-Fix-include-path-separator.patch33
-rw-r--r--recipes-extended/bzip2/bzip2_1.0.7.bbappend4
2 files changed, 0 insertions, 37 deletions
diff --git a/recipes-extended/bzip2/bzip2/0001-Fix-include-path-separator.patch b/recipes-extended/bzip2/bzip2/0001-Fix-include-path-separator.patch
deleted file mode 100644
index 4c43b7a..0000000
--- a/recipes-extended/bzip2/bzip2/0001-Fix-include-path-separator.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 84c8769b52c63cce8a8a413e5fcbad1a65681d46 Mon Sep 17 00:00:00 2001
-From: Joshua Watt <JPEW.hacker@gmail.com>
-Date: Tue, 2 Jul 2019 13:06:30 -0500
-Subject: [PATCH] Fix include path separator
-
-Changes the include path separator for Windows builds to use "/" instead
-of "\". Windows has no problems with using a forward slash as a path
-separator, but using a backslash causes problems when attempting to
-cross compile for other platforms (for example, when trying to cross
-compile for MinGW from Linux).
-
-Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
-Upstream-Status: Submitted [https://sourceware.org/ml/bzip2-devel/2019-q3/msg00004.html]
----
- bzip2.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/bzip2.c b/bzip2.c
-index e362c65..be3b3be 100644
---- a/bzip2.c
-+++ b/bzip2.c
-@@ -128,7 +128,7 @@
- #if BZ_LCCWIN32
- # include <io.h>
- # include <fcntl.h>
--# include <sys\stat.h>
-+# include <sys/stat.h>
-
- # define NORETURN /**/
- # define PATH_SEP '\\'
---
-2.21.0
-
diff --git a/recipes-extended/bzip2/bzip2_1.0.7.bbappend b/recipes-extended/bzip2/bzip2_1.0.7.bbappend
deleted file mode 100644
index 3cc4b01..0000000
--- a/recipes-extended/bzip2/bzip2_1.0.7.bbappend
+++ /dev/null
@@ -1,4 +0,0 @@
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-SRC_URI_append_mingw32 = " file://0001-Fix-include-path-separator.patch"