Skip to content
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

Add support for oci8 and pdo_oci extensions no longer bundled with PHP #894

Merged
merged 2 commits into from
Mar 18, 2024
Merged

Add support for oci8 and pdo_oci extensions no longer bundled with PHP #894

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a366052
Add support for oci8 and pdo_oci extensions no longer bundled with PHP
mlocati Mar 1, 2024
39b9ca2
Fix removing link to Oracle SDK
mlocati Mar 18, 2024
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
12 changes: 10 additions & 2 deletions install-php-extensions
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2002,11 +2002,11 @@ installOracleInstantClient() {
mv "$installOracleInstantClient_src" "$ORACLE_INSTANTCLIENT_LIBPATH"
echo 'done.'
fi
if ! test -e "$ORACLE_INSTANTCLIENT_LIBPATH/sdk"; then
if ! test -e "$ORACLE_INSTANTCLIENT_LIBPATH/sdk" && ! test -L "$ORACLE_INSTANTCLIENT_LIBPATH/sdk"; then
printf 'Downloading Oracle Instant SDK v%s... ' "$installOracleInstantClient_version"
installOracleInstantClient_src="$(getPackageSource $installOracleInstantClient_sdk)"
ln -sf "$installOracleInstantClient_src/sdk" "$ORACLE_INSTANTCLIENT_LIBPATH/sdk"
UNNEEDED_PACKAGE_LINKS="$UNNEEDED_PACKAGE_LINKS '$ORACLE_INSTANTCLIENT_LIBPATH/sdk'"
UNNEEDED_PACKAGE_LINKS="$UNNEEDED_PACKAGE_LINKS $ORACLE_INSTANTCLIENT_LIBPATH/sdk"
echo 'done.'
fi
case "$DISTRO" in
Expand Down Expand Up @@ -3207,6 +3207,14 @@ installRemoteModule() {
fi
fi
;;
oci8 | pdo_oci)
installOracleInstantClient
if test "$installRemoteModule_module" = oci8; then
addConfigureOption with-oci8 "instantclient,$ORACLE_INSTANTCLIENT_LIBPATH"
elif test "$installRemoteModule_module" = pdo_oci; then
addConfigureOption with-pdo-oci "instantclient,$ORACLE_INSTANTCLIENT_LIBPATH"
fi
;;
opencensus)
if test -z "$installRemoteModule_version"; then
installRemoteModule_version=alpha
Expand Down
Loading