bzip2: Update to 1.0.7
PATCH 1/1 bzip2: Update to 1.0.7
Updates bzip2 to version 1.0.7 to match master in oe-core. The patch to change the path separator was properly upstreamed and hopefully will no longer be necessary going forward.
--- .../0001-Fix-include-path-separator.patch | 33 +++++++++++++++++++ recipes-extended/bzip2/bzip2/fix.patch | 13 -------- recipes-extended/bzip2/bzip2_1.0.6.bbappend | 4 --- recipes-extended/bzip2/bzip2_1.0.7.bbappend | 4 +++ 4 files changed, 37 insertions(+), 17 deletions(-) create mode 100644 recipes-extended/bzip2/bzip2/0001-Fix-include-path-separator.patch delete mode 100644 recipes-extended/bzip2/bzip2/fix.patch delete mode 100644 recipes-extended/bzip2/bzip2_1.0.6.bbappend create mode 100644 recipes-extended/bzip2/bzip2_1.0.7.bbappend
recipes-extended/bzip2/bzip2/0001-Fix-include-path-separator.patch new file +33 -0
@@ -0,0 +1,33 @@ +From 84c8769b52c63cce8a8a413e5fcbad1a65681d46 Mon Sep 17 00:00:00 2001 +From: Joshua Watt <[email protected]> +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 <[email protected]> +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 +
recipes-extended/bzip2/bzip2/fix.patch deleted +0 -13
@@ -1,13 +0,0 @@ -Index: bzip2-1.0.6/bzip2.c -=================================================================== ---- bzip2-1.0.6.orig/bzip2.c 2010-09-10 23:04:53.000000000 +0000 -+++ bzip2-1.0.6/bzip2.c 2013-08-13 10:30:15.596120522 +0000 -@@ -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 '\\'
recipes-extended/bzip2/bzip2_1.0.6.bbappend deleted +0 -4
@@ -1,4 +0,0 @@ - -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -SRC_URI_append_mingw32 = " file://fix.patch"
recipes-extended/bzip2/bzip2_1.0.7.bbappend new file +4 -0
@@ -0,0 +1,4 @@ + +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +SRC_URI_append_mingw32 = " file://0001-Fix-include-path-separator.patch"
Signature · 1 line
2.21.0
Quoted 8 lines · Joshua Watt
Updates bzip2 to version 1.0.7 to match master in oe-core. The patch to change the path separator was properly upstreamed and hopefully will no longer be necessary going forward.
...
+---a/bzip2.c
++++b/bzip2.c
+@@ -128,7 +128,7 @@
+ #ifBZ_LCCWIN32
Quoted 5 lines
+ # include <io.h> + # include <fcntl.h> +-# include <sys\stat.h> ++# include <sys/stat.h>...
Why is this a bbappend at all?
This should have been part of the package in oe-core from the beginning, and could still be added there right now.
cu
Adrian
Signature · 4 lines
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon SeedQuoted 15 lines · Adrian Bunk
Quoted 8 lines · Joshua Watt
Updates bzip2 to version 1.0.7 to match master in oe-core. The patch to change the path separator was properly upstreamed and hopefully will no longer be necessary going forward.
...
+---a/bzip2.c
++++b/bzip2.c
+@@ -128,7 +128,7 @@
+ #ifBZ_LCCWIN32Quoted 5 lines
+ # include <io.h> + # include <fcntl.h> +-# include <sys\stat.h> ++# include <sys/stat.h>...
Quoted 5 lines
Why is this a bbappend at all?
This should have been part of the package in oe-core from the beginning, and could still be added there right now.
Yes, that would be better. Unfortunately this was merged quickly to prevent breaking master with the upgrade in OE core. We can move the patch to OE core still, but it will require some more coordination to prevent breaking again.
On the other hand, I did upstream the patch, so hopefully the next release of bzip2 will also allow us to delete the bbappend from meta-mingw
Quoted 11 lines
cu
Adrian--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed