forked from pool/perl-DBD-ODBC
339d808ce8
version update to 1.61 OBS-URL: https://build.opensuse.org/request/show/769298 OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl-DBD-ODBC?expand=0&rev=50
110 lines
4.1 KiB
Diff
110 lines
4.1 KiB
Diff
Index: Makefile.PL
|
|
===================================================================
|
|
--- Makefile.PL.orig
|
|
+++ Makefile.PL
|
|
@@ -213,6 +213,7 @@ EOT
|
|
}
|
|
print "Overriding ODBC Directory with command line option: $opt_o\n"
|
|
if $opt_o ;
|
|
+my $lib=$ENV{LIB};
|
|
if ($opt_g) {
|
|
print "Setting debug options!\n";
|
|
if ($OSNAME eq 'MSWin32') {
|
|
@@ -355,7 +356,7 @@ EOT
|
|
#$tmp_odbchome =~ s/\\/\//g;
|
|
#$odbchome = $tmp_odbchome if (-e "$tmp_odbchome/odbc.ini")
|
|
chomp($odbchome = `cygpath \$WINDIR`);
|
|
- } elsif (-f '/opt/sapdb/interfaces/odbc/lib/libsqlod.a') {
|
|
+ } elsif (-f '/opt/sapdb/interfaces/odbc/lib/libsqlod.a' || -f '/opt/sapdb/interfaces/odbc/lib/lib64/libsqlod.a') {
|
|
$odbchome = '/opt/sapdb/interfaces/odbc/';
|
|
}
|
|
}
|
|
@@ -453,7 +454,7 @@ EOT
|
|
$opts{INC} .= " -I/usr/include/w32api" if $OSNAME eq 'cygwin';
|
|
|
|
# TO_DO all this needs to move until later
|
|
-# my $lib_d1 = "$odbchome/lib";
|
|
+# my $lib_d1 = "$odbchome/$lib";
|
|
# my $lib_d2 = "$odbchome/dlls";
|
|
# my $libs = "odbc";
|
|
# $opts{LIBS} = " -L$lib_d1 -R$lib_d1 -L$lib_d2 -R$lib_d2 -l$libs";
|
|
@@ -496,32 +497,32 @@ EOT
|
|
-e "$odbchome/odbc32.dll"));
|
|
|
|
$myodbc = 'empress'
|
|
- if !$myodbc && glob "$odbchome/lib/libempodbc.*";
|
|
+ if !$myodbc && glob "$odbchome/$lib/libempodbc.*";
|
|
|
|
$myodbc = 'intersolve'
|
|
if !$myodbc && -f "$odbchome/include/qeodbc.h";
|
|
|
|
$myodbc = 'sapdb'
|
|
- if !$myodbc && -f "$odbchome/lib/libsqlod.$arext";
|
|
+ if !$myodbc && -f "$odbchome/$lib/libsqlod.$arext";
|
|
|
|
$myodbc = 'adabas'
|
|
if (!$myodbc &&
|
|
$ENV{DBROOT} &&
|
|
($odbchome eq $ENV{DBROOT}) &&
|
|
- -f "$odbchome/lib/odbclib.$arext");
|
|
+ -f "$odbchome/$lib/odbclib.$arext");
|
|
|
|
$myodbc = 'udbc'
|
|
- if !$myodbc && -f "$odbchome/lib/libudbc.$arext";
|
|
+ if !$myodbc && -f "$odbchome/$lib/libudbc.$arext";
|
|
|
|
$myodbc = 'solid'
|
|
- if !$myodbc && -f "$odbchome/lib/libsolcli.$dlext";
|
|
+ if !$myodbc && -f "$odbchome/$lib/libsolcli.$dlext";
|
|
|
|
# JL 2002-12-16: This test is accurate on Unix (Solaris 7) with IBM
|
|
# Informix ClientSDK 2.80.UC1, which includes IBM Informix CLI
|
|
# v3.81.000, an ODBC 3.x driver.
|
|
# NB: The correct value for $ODBCHOME is $INFORMIXDIR.
|
|
$myodbc = 'informix'
|
|
- if !$myodbc && -f "$odbchome/lib/cli/libifcli.$dlext";
|
|
+ if !$myodbc && -f "$odbchome/$lib/cli/libifcli.$dlext";
|
|
|
|
if (!$myodbc) {
|
|
local($LIST_SEPARATOR) = ", ";
|
|
@@ -549,7 +550,7 @@ EOT
|
|
|
|
if ($myodbc eq 'Microsoft ODBC') {
|
|
print "\nBuilding for Microsoft under Cygwin\n";
|
|
- $opts{LIBS} = "-L/usr/lib/w32api -lodbc32";
|
|
+ $opts{LIBS} = "-L/usr/$lib/w32api -lodbc32";
|
|
print {$sqlhfh} "#include <windows.h>\n";
|
|
print {$sqlhfh} "#include <sql.h>\n";
|
|
print {$sqlhfh} "#include <sqltypes.h>\n";
|
|
@@ -588,7 +589,7 @@ EOT
|
|
$opts{LIBS} = q{};
|
|
$opts{dynamic_lib} = { OTHERLDFLAGS => "$ilibpath" };
|
|
}
|
|
- warn "Warning: LD_LIBRARY_PATH doesn't include $odbchome/lib\n"
|
|
+ warn "Warning: LD_LIBRARY_PATH doesn't include $odbchome/$lib\n"
|
|
if (!defined($ENV{LD_LIBRARY_PATH})) ||
|
|
($ENV{LD_LIBRARY_PATH} =~ /\Q$odbclibdir/);
|
|
}
|
|
@@ -729,7 +730,11 @@ EOT
|
|
print {$sqlhfh} qq{#define DBD_ODBC_NO_DATASOURCES\n};
|
|
|
|
$opts{INC} .= " -I$odbchome/incl";
|
|
- $opts{LDFROM} = "\$(OBJECT) $odbchome/lib/libsqlod.a";
|
|
+ if (-f "$odbchome/$lib/libsqlod.a" ) {
|
|
+ $opts{LDFROM} = "\$(OBJECT) $odbchome/$lib/libsqlod.a";
|
|
+ } else {
|
|
+ $opts{LDFROM} = "\$(OBJECT) $odbchome/$lib/lib64/libsqlod.a";
|
|
+ }
|
|
}
|
|
elsif ($myodbc eq 'adabas') {
|
|
print {$sqlhfh} "#define FAR \n#define EXPORT \n#define CALLBACK \n";
|
|
@@ -788,7 +793,7 @@ if ($OSNAME eq 'darwin') {
|
|
# SQLGetPrivateProfileString is in libiodbcinst.a
|
|
my $osver = `uname -r`;
|
|
if ($osver && ($osver =~ /^8/)) {
|
|
- $opts{LIBS} .= ' -L/usr/lib -liodbcinst';
|
|
+ $opts{LIBS} .= ' -L/usr/$lib -liodbcinst';
|
|
}
|
|
}
|
|
|