[packages,*] Update for Xcode 4