bunch of fixes/changes to make packages build#1006

henderkes wants to merge 21 commits intomaincrazywhalecc/static-php-cli:mainfrom

henderkes-patch-1crazywhalecc/static-php-cli:henderkes-patch-1Copy head branch name to clipboard