Update r551672
Use a patch file instead doing it in configure stage.
PR: 249412
Submitted by: sunpoet (myself) Tested by: leres