patched files as well as related patch for x86_64-Linux

specific to Ubuntu build and installation

updated with x86 patch that also applies to x86_64 builds