Skip to content

Commit 5122724

Browse files
thesamesamdjzort
authored andcommitted
Makefile.PL: help ora_libdir find ORACLE_HOME on Gentoo
On Gentoo, for better or worse, we install oracle-instantclient on 64-bit systems to /usr/lib64/oracle/client/ with: * /usr/lib64/oracle/client/lib for 32-bit libraries (multilib) * /usr/lib64/oracle/client/lib64 for native 64-bit libraries Adapt the logic to handle lib64 if it exists and we're using a 64-bit Perl. (And fix some whitespace while at it.)
1 parent 9dc2ca0 commit 5122724

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

Makefile.PL

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1115,14 +1115,15 @@ sub perl_is_64bit {
11151115
return defined $Config{use64bitall} ;
11161116
}
11171117
sub ora_libdir {
1118-
my $libdir = 'lib' ;
1118+
my $libdir = 'lib';
11191119
if ( $client_version >= 9 ) {
11201120
$libdir = 'lib32' if ! perl_is_64bit() and -d "$OH/lib32";
1121+
$libdir = 'lib64' if perl_is_64bit() and -d "$OH/lib64";
1122+
# Solaris OIC 12+ from pkg
11211123
$libdir = 'lib/64' if perl_is_64bit() and -d "$OH/lib/64";
1122-
# Solaris OIC 12+ from pkg
11231124
}
11241125
else {
1125-
$libdir = 'lib64' if perl_is_64bit() and -d "$OH/lib64";
1126+
$libdir = 'lib64' if perl_is_64bit() and -d "$OH/lib64";
11261127
}
11271128

11281129
return $libdir;

0 commit comments

Comments
 (0)