From 2d3b3f1fe30f791b9eef48496b342b777b352e6d Mon Sep 17 00:00:00 2001
From: Quantu <673216+Quantu@users.noreply.github.com>
Date: Fri, 8 May 2020 12:05:34 -0400
Subject: [PATCH 1/2] Fix bzip2 version patching logic

makefile_take_env_vars.patch should only be applied if bzip2 version is 1.0.6. Patch fails to apply on 1.0.8.

Obvious fix.
---
 config/software/bzip2.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/software/bzip2.rb b/config/software/bzip2.rb
index 97be5827f..37b23f41e 100644
--- a/config/software/bzip2.rb
+++ b/config/software/bzip2.rb
@@ -48,7 +48,7 @@
   args = "PREFIX='#{install_dir}/embedded' VERSION='#{version}'"
   args << " CFLAGS='-qpic=small -qpic=large -O2 -g -D_ALL_SOURCE -D_LARGE_FILES'" if aix?
 
-  patch source: "makefile_take_env_vars.patch", plevel: 1, env: env
+  patch source: "makefile_take_env_vars.patch", plevel: 1, env: env if version == "1.0.6"
   patch source: "soname_install_dir-#{version}.patch", env: env if mac_os_x?
   patch source: "aix_makefile-#{version}.patch", env: env if aix?
 

From 3e836344bb7aeca6ee635f7fc999540adee8cbec Mon Sep 17 00:00:00 2001
From: Quantu <673216+Quantu@users.noreply.github.com>
Date: Tue, 19 May 2020 10:49:38 -0400
Subject: [PATCH 2/2] Fix context in bzip2 makefile_take_env_vars.patch,
 re-enable patching for bzip-1.0.8

Obvious fix.
---
 config/patches/bzip2/makefile_take_env_vars.patch | 5 ++++-
 config/software/bzip2.rb                          | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/config/patches/bzip2/makefile_take_env_vars.patch b/config/patches/bzip2/makefile_take_env_vars.patch
index 8674e1c1d..e15ca4f3d 100644
--- a/config/patches/bzip2/makefile_take_env_vars.patch
+++ b/config/patches/bzip2/makefile_take_env_vars.patch
@@ -1,6 +1,9 @@
 --- bzip2-1.0.6/Makefile-orig   2010-09-10 17:46:02.000000000 -0500
 +++ bzip2-1.0.6/Makefile        2013-11-21 13:55:11.000000000 -0600
-@@ -18,10 +18,10 @@
+@@ -15,13 +15,13 @@
+ SHELL=/bin/sh
+
+ # To assist in cross-compiling
 -CC=gcc
 +CC?=gcc
  AR=ar
diff --git a/config/software/bzip2.rb b/config/software/bzip2.rb
index 37b23f41e..97be5827f 100644
--- a/config/software/bzip2.rb
+++ b/config/software/bzip2.rb
@@ -48,7 +48,7 @@
   args = "PREFIX='#{install_dir}/embedded' VERSION='#{version}'"
   args << " CFLAGS='-qpic=small -qpic=large -O2 -g -D_ALL_SOURCE -D_LARGE_FILES'" if aix?
 
-  patch source: "makefile_take_env_vars.patch", plevel: 1, env: env if version == "1.0.6"
+  patch source: "makefile_take_env_vars.patch", plevel: 1, env: env
   patch source: "soname_install_dir-#{version}.patch", env: env if mac_os_x?
   patch source: "aix_makefile-#{version}.patch", env: env if aix?