Skip to content

Commit 0609246

Browse files
authored
Add support for oci8 and pdo_oci extensions no longer bundled with PHP (#894)
1 parent 040be88 commit 0609246

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

install-php-extensions

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2002,11 +2002,11 @@ installOracleInstantClient() {
20022002
mv "$installOracleInstantClient_src" "$ORACLE_INSTANTCLIENT_LIBPATH"
20032003
echo 'done.'
20042004
fi
2005-
if ! test -e "$ORACLE_INSTANTCLIENT_LIBPATH/sdk"; then
2005+
if ! test -e "$ORACLE_INSTANTCLIENT_LIBPATH/sdk" && ! test -L "$ORACLE_INSTANTCLIENT_LIBPATH/sdk"; then
20062006
printf 'Downloading Oracle Instant SDK v%s... ' "$installOracleInstantClient_version"
20072007
installOracleInstantClient_src="$(getPackageSource $installOracleInstantClient_sdk)"
20082008
ln -sf "$installOracleInstantClient_src/sdk" "$ORACLE_INSTANTCLIENT_LIBPATH/sdk"
2009-
UNNEEDED_PACKAGE_LINKS="$UNNEEDED_PACKAGE_LINKS '$ORACLE_INSTANTCLIENT_LIBPATH/sdk'"
2009+
UNNEEDED_PACKAGE_LINKS="$UNNEEDED_PACKAGE_LINKS $ORACLE_INSTANTCLIENT_LIBPATH/sdk"
20102010
echo 'done.'
20112011
fi
20122012
case "$DISTRO" in
@@ -3207,6 +3207,14 @@ installRemoteModule() {
32073207
fi
32083208
fi
32093209
;;
3210+
oci8 | pdo_oci)
3211+
installOracleInstantClient
3212+
if test "$installRemoteModule_module" = oci8; then
3213+
addConfigureOption with-oci8 "instantclient,$ORACLE_INSTANTCLIENT_LIBPATH"
3214+
elif test "$installRemoteModule_module" = pdo_oci; then
3215+
addConfigureOption with-pdo-oci "instantclient,$ORACLE_INSTANTCLIENT_LIBPATH"
3216+
fi
3217+
;;
32103218
opencensus)
32113219
if test -z "$installRemoteModule_version"; then
32123220
installRemoteModule_version=alpha

0 commit comments

Comments
 (0)