From e23c93f4f6d5fa8c64e5d79f9ca0f1cdc496553c Mon Sep 17 00:00:00 2001 From: Matt Ray Date: Wed, 10 Jul 2019 17:46:13 +1000 Subject: [PATCH] Bring in the patch from LFS that Habitat was carrying. This is a straight copy of the Habitat core plan patch to make: https://bldr.habitat.sh/#/pkgs/core/make/4.2.1/20190115013626 Fixes https://github.com/chef/omnibus-software/issues/1070 Signed-off-by: Matt Ray --- config/software/make.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/config/software/make.rb b/config/software/make.rb index cbe23a177..bd7bcf5e2 100644 --- a/config/software/make.rb +++ b/config/software/make.rb @@ -30,6 +30,11 @@ build do env = with_standard_compiler_flags(with_embedded_path) + # Work around an error caused by Glibc 2.27 + # + # Thanks to: http://www.linuxfromscratch.org/lfs/view/8.2/chapter05/make.html + command "sed -i '211,217 d; 219,229 d; 232 d' glob/glob.c", env: env + command "./configure" \ " --disable-nls" \ " --prefix=#{install_dir}/embedded", env: env