Patches for make failure on solaris 9 [sf#2136116] [#929]