Skip to content

Fix PDO pgsql for macOS with Homebrew and disable PCRE JIT for M1 #116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Fix PDO pgsql for macOS with Homebrew and disable PCRE JIT for M1 #116

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e08e333
feat(build): introduce failing test
ahawkins Oct 11, 2021
b91f5c9
feat(build): prefer a single job
ahawkins Oct 11, 2021
3f1a00b
feat(bin): prefer [email protected]
ahawkins Oct 11, 2021
9bace81
Fix PostgreSQL in MacOS
Dec 6, 2021
97ccc19
Merge remote-tracking branch 'ahawkins/feature/[email protected]'
hlubek Dec 21, 2021
1403eb7
Disable PCRE JIT for M1
hlubek Dec 21, 2021
fb592ea
Re-format shell script
hlubek Jan 4, 2022
c0b7a99
Merge branch 'asdf-community:master' into master
hlubek Apr 4, 2022
a3bdc81
Merge branch 'master' into master
hlubek Sep 28, 2022
7d35b73
Fix setting and detection of without-pcre-jit
hlubek Sep 28, 2022
c0b937f
Fix issue with missing capstone/capstone.h by setting --disable-opcac…
hlubek Nov 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions bin/install
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,9 @@ construct_configure_options() {
--with-zlib \
--without-snmp"

local operating_system=$(uname -a)
local arch=$(uname -m)

if [ "$PHP_CONFIGURE_OPTIONS" = "" ]; then
local configure_options="$(os_based_configure_options) $global_config"
else
Expand All @@ -168,8 +171,6 @@ construct_configure_options() {
if [ "${PHP_WITHOUT_PDO_PGSQL:-no}" != "no" ]; then
configure_options="$configure_options"
else
local operating_system=$(uname -a)

if [[ $operating_system =~ "Darwin" ]]; then
exit_if_homebrew_not_installed

Expand All @@ -185,12 +186,16 @@ construct_configure_options() {
fi
fi

if [ "${PHP_WITHOUT_PCRE_JIT:-no}" != "no" ]; then
configure_options="$configure_options"
else
# Disable PCRE JIT either if PHP_WITHOUT_PCRE_JIT is set or an Arm-based Mac is detected
if [[ "${PHP_WITHOUT_PCRE_JIT:-no}" != "no" || ($operating_system =~ "Darwin" && $arch == "arm64")]]; then
configure_options="$configure_options --without-pcre-jit"
fi

# Disable Opcache JIT to prevent errors with capstone
if [[($operating_system =~ "Darwin" && $arch == "arm64")]]; then
configure_options="$configure_options --disable-opcache-jit"
fi

echo "$configure_options"
}

Expand Down Expand Up @@ -241,7 +246,7 @@ os_based_configure_options() {
local sodium_path=$(homebrew_package_path libsodium)

if [ -n "$gmp_path" ]; then
configure_options="--with-gmp=$gmp_path"
configure_options="$configure_options --with-gmp=$gmp_path"
else
echo "gmp not found, not including in installation"
fi
Expand Down