Skip to content

Commit

Permalink
Revert "Merge pull request #1071 from mattray/make_4_2_1"
Browse files Browse the repository at this point in the history
This reverts commit 5fa3595, reversing
changes made to ed46161.

The sed command in question does not work on all supported systems, and
the conditions for when this command should be run are unclear. This
fix was introduced for an issue in glib-2.27, but the effect of this
patch on other versions of glibc is unknown. Also, we want to use the
`patch` DSL when modifying source files.

Signed-off-by: Tom Duffield <[email protected]>
  • Loading branch information
tduffield committed Aug 23, 2019
1 parent bc92134 commit 1abcc09
Showing 1 changed file with 0 additions and 5 deletions.
5 changes: 0 additions & 5 deletions config/software/make.rb
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,6 @@
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
Expand Down

0 comments on commit 1abcc09

Please sign in to comment.