cvsuser 05/02/21 02:54:43
Modified: config/auto gmp.pl
config/gen/makefiles dynclasses_pl.in root.in
config/init data.pl
config/init/hints mswin32.pl
Log:
[perl #34178] [PATCH][MSWin32] Add gpm linkage and minor cleanup
Attached patch
- adds correct linkage for gpm
Some tests fail, though
t\pmc\bigint.t 12 3072 21 12 57.14% 5-10 13-15 18 20-21
- adds C<-nodefaultlib> flag to ldflags
- adds C<$(C_LIBS)> to libnci_test linkage
(necessary b/c of -nodefaultlib)
- adds C<${ld_debug}> to C<$LDFLAGS> in F<dynclasses/build.pl>
- Changed F<config/init/data.pl> to clean up Data::Dumper::VERSION
before comparison, to avoid
Argument "2.121_02" isn't numeric in numeric ge (>=)
Courtesy of Ron Blaschke <[EMAIL PROTECTED]>
Revision Changes Path
1.7 +5 -1 parrot/config/auto/gmp.pl
Index: gmp.pl
===================================================================
RCS file: /cvs/public/parrot/config/auto/gmp.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gmp.pl 14 Feb 2005 11:33:39 -0000 1.6
+++ gmp.pl 21 Feb 2005 10:54:38 -0000 1.7
@@ -1,5 +1,5 @@
# Copyright: 2001-2004 The Perl Foundation. All Rights Reserved.
-# $Id: gmp.pl,v 1.6 2005/02/14 11:33:39 leo Exp $
+# $Id: gmp.pl,v 1.7 2005/02/21 10:54:38 leo Exp $
=head1 NAME
@@ -27,7 +27,11 @@
my $libs = Configure::Data->get('libs');
my $linkflags = Configure::Data->get('linkflags');
my $ccflags = Configure::Data->get('ccflags');
+ if ($^O =~ /mswin32/i) {
+ Configure::Data->add(' ', 'libs', 'gmp.lib');
+ } else {
Configure::Data->add(' ', 'libs', '-lgmp');
+ }
my $archname = $Config{archname};
my ($cpuarch, $osname) = split('-', $archname);
1.12 +2 -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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- dynclasses_pl.in 17 Feb 2005 09:04:38 -0000 1.11
+++ dynclasses_pl.in 21 Feb 2005 10:54:39 -0000 1.12
@@ -1,5 +1,5 @@
# Copyright: 2001-2005 The Perl Foundation. All Rights Reserved.
-# $Id: dynclasses_pl.in,v 1.11 2005/02/17 09:04:38 leo Exp $
+# $Id: dynclasses_pl.in,v 1.12 2005/02/21 10:54:39 leo Exp $
=head1 NAME
@@ -23,7 +23,7 @@
# Config stuff
our $CC = qq[${cc} -c];
our $LD = qq[${ld}];
-our $LDFLAGS = qq[${ldflags}];
+our $LDFLAGS = qq[${ldflags} ${ld_debug}];
our $LD_LOAD_FLAGS = qq[${ld_load_flags}];
our $PERL = q[${perl}];
our $LOAD_EXT = qq[${load_ext}];
1.275 +2 -2 parrot/config/gen/makefiles/root.in
Index: root.in
===================================================================
RCS file: /cvs/public/parrot/config/gen/makefiles/root.in,v
retrieving revision 1.274
retrieving revision 1.275
diff -u -r1.274 -r1.275
--- root.in 19 Feb 2005 12:28:38 -0000 1.274
+++ root.in 21 Feb 2005 10:54:39 -0000 1.275
@@ -1,5 +1,5 @@
# Copyright: 2001-2005 The Perl Foundation. All Rights Reserved.
-# $Id: root.in,v 1.274 2005/02/19 12:28:38 bernhard Exp $
+# $Id: root.in,v 1.275 2005/02/21 10:54:39 leo Exp $
###############################################################################
#
@@ -1375,7 +1375,7 @@
# for use by t/pmc/nci.t
$(LIBNCI_SO): $(SRC_DIR)/nci_test$(O)
$(LD) $(LD_LOAD_FLAGS) ${ncilib_link_extra} $(LDFLAGS) \
- $(LD_OUT)$@ $(SRC_DIR)/nci_test$(O)
+ $(LD_OUT)$@ $(SRC_DIR)/nci_test$(O) $(C_LIBS)
# vim ctags
# this needs exuberant-ctags
1.39 +8 -2 parrot/config/init/data.pl
Index: data.pl
===================================================================
RCS file: /cvs/public/parrot/config/init/data.pl,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- data.pl 9 Jan 2005 14:50:56 -0000 1.38
+++ data.pl 21 Feb 2005 10:54:42 -0000 1.39
@@ -1,7 +1,7 @@
#! perl -w
# Copyright: 2001-2005 The Perl Foundation. All Rights Reserved.
-# $Id: data.pl,v 1.38 2005/01/09 14:50:56 leo Exp $
+# $Id: data.pl,v 1.39 2005/02/21 10:54:42 leo Exp $
=head1 NAME
@@ -241,7 +241,13 @@
# Data::Dumper supports Sortkeys since 2.12
# older versions will work but obviously not sorted
- if (+$Data::Dumper::VERSION >= 2.12) {
+ my $dd_version;
+ if ($Data::Dumper::VERSION =~ /([\d.]+)/) {
+ $dd_version = $1;
+ } else {
+ $dd_version = $Data::Dumper::VERSION;
+ }
+ if ($dd_version >= 2.12) {
*dump=sub {
Data::Dumper->new([\%c], ['*PConfig'])->Sortkeys(1)->Dump();
};
1.25 +2 -2 parrot/config/init/hints/mswin32.pl
Index: mswin32.pl
===================================================================
RCS file: /cvs/public/parrot/config/init/hints/mswin32.pl,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- mswin32.pl 9 Jan 2005 14:50:57 -0000 1.24
+++ mswin32.pl 21 Feb 2005 10:54:43 -0000 1.25
@@ -46,7 +46,7 @@
ld_share_flags => '-dll -def:libparrot.def',
ld_load_flags => '-dll -def:libparrot.def',
ld_out => '-out:',
- ldflags => '-nologo',
+ ldflags => '-nologo -nodefaultlib',
blib_lib_libparrot_a => 'blib/lib/libparrot_s$(A)',
cp => 'copy',
ar_flags => '',
@@ -82,7 +82,7 @@
ld_share_flags => '-dll -def:libparrot.def',
ld_load_flags => '-dll -def:libparrot.def',
ld_out => '-out:',
- ldflags => '-nologo',
+ ldflags => '-nologo -nodefaultlib',
blib_lib_libparrot_a => 'blib/lib/libparrot_s$(A)',
cp => 'copy',
ar => 'xilib',
