Skip to content

Commit

Permalink
Update make patch apply to supported platforms
Browse files Browse the repository at this point in the history
Signed-off-by: Jaymala Sinha <jsinha@chef.io>
  • Loading branch information
Jaymala Sinha committed Aug 22, 2019
1 parent bc92134 commit cca7d82
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions config/software/make.rb
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,16 @@

# 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
# sed -i is not supported so exclude the patch for FreeBSD, Solaris and AIX
unless freebsd? || solaris_11? || aix?
if mac_os_x?
# OS X ships with BSD sed, where the suffix is mandatory so added sed -i ''
command "sed -i '' '211,217 d; 219,229 d; 232 d' glob/glob.c", env: env
else
# 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
end
end

command "./configure" \
" --disable-nls" \
Expand Down

0 comments on commit cca7d82

Please sign in to comment.