cvsuser 05/02/17 01:04:38
Modified: config/auto gdbm.pl
config/gen/makefiles dynclasses_pl.in
Log:
[perl #34149] [PATCH][MSWin32] Add gdbm linkage for VC++
Attached patch adds gdbm linkage for Windows (Visual C++), as
libraries are specified as SOMELIB.lib, instead of -lSOMELIB.
Tests fail b/c of the broken dynclasses.
Courtesy of Ron Blaschke <[EMAIL PROTECTED]>
Revision Changes Path
1.3 +5 -1 parrot/config/auto/gdbm.pl
Index: gdbm.pl
===================================================================
RCS file: /cvs/public/parrot/config/auto/gdbm.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gdbm.pl 1 Feb 2005 10:23:14 -0000 1.2
+++ gdbm.pl 17 Feb 2005 09:04:37 -0000 1.3
@@ -1,5 +1,5 @@
# Copyright: 2001-2005 The Perl Foundation. All Rights Reserved.
-# $Id: gdbm.pl,v 1.2 2005/02/01 10:23:14 leo Exp $
+# $Id: gdbm.pl,v 1.3 2005/02/17 09:04:37 leo Exp $
=head1 NAME
@@ -47,7 +47,11 @@
}
cc_gen('config/auto/gdbm/gdbm.in');
+ if ($^O =~ /mswin32/i) {
+ eval { cc_build('', 'gdbm.lib'); };
+ } else {
eval { cc_build('', '-lgdbm'); };
+ }
my $has_gdbm = 0;
if (! $@) {
my $test = cc_run();
1.11 +7 -2 parrot/config/gen/makefiles/dynclasses_pl.in
Index: dynclasses_pl.in
===================================================================
RCS file: /cvs/public/parrot/config/gen/makefiles/dynclasses_pl.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- dynclasses_pl.in 17 Jan 2005 14:02:05 -0000 1.10
+++ dynclasses_pl.in 17 Feb 2005 09:04:38 -0000 1.11
@@ -1,5 +1,5 @@
# Copyright: 2001-2005 The Perl Foundation. All Rights Reserved.
-# $Id: dynclasses_pl.in,v 1.10 2005/01/17 14:02:05 leo Exp $
+# $Id: dynclasses_pl.in,v 1.11 2005/02/17 09:04:38 leo Exp $
=head1 NAME
@@ -65,7 +65,12 @@
sub partial_link_cmd {
my ($target, $libs, $sources) = @_;
- my $liblist = join( ' ', map { "-l$_" } keys %$libs );
+ my $liblist;
+ if ($^O =~ /mswin32/i) {
+ $liblist = join( ' ', map { "$_.lib" } keys %$libs );
+ } else {
+ $liblist = join( ' ', map { "-l$_" } keys %$libs );
+ }
return
"$LD $LDFLAGS $LD_LOAD_FLAGS $liblist $LIBPARROT ".
