cvsuser 04/10/08 02:45:03
Modified: config/gen platform.pl
config/gen/platform/generic stat.c
config/inter progs.pl
Log:
- made generic/stat.c WIN32 compatible
- added support for MINGW/MSYS
Revision Changes Path
1.19 +4 -2 parrot/config/gen/platform.pl
Index: platform.pl
===================================================================
RCS file: /cvs/public/parrot/config/gen/platform.pl,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -w -r1.18 -r1.19
--- platform.pl 7 Oct 2004 15:36:31 -0000 1.18
+++ platform.pl 8 Oct 2004 09:45:01 -0000 1.19
@@ -1,6 +1,6 @@
#! perl -w
# Copyright: 2001-2003 The Perl Foundation. All Rights Reserved.
-# $Id: platform.pl,v 1.18 2004/10/07 15:36:31 jrieks Exp $
+# $Id: platform.pl,v 1.19 2004/10/08 09:45:01 jrieks Exp $
=head1 NAME
@@ -25,9 +25,11 @@
sub runstep {
my ($miniparrot, $verbose) = @_;
my $platform=lc $^O;
- $platform =~ s/^ms//;
$platform="ansi" if defined($miniparrot);
+ $platform="win32" if $platform =~ /^msys/;
+ $platform="win32" if $platform =~ /^mingw/;
+ $platform =~ s/^ms//;
$platform="generic" unless -d "config/gen/platform/$platform";
print " platform='$platform' " if $verbose;
1.3 +16 -0 parrot/config/gen/platform/generic/stat.c
Index: stat.c
===================================================================
RCS file: /cvs/public/parrot/config/gen/platform/generic/stat.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- stat.c 22 Sep 2004 21:59:30 -0000 1.2
+++ stat.c 8 Oct 2004 09:45:03 -0000 1.3
@@ -78,10 +78,18 @@
result = statbuf.st_rdev;
break;
case STAT_PLATFORM_BLOCKSIZE:
+#if defined(WIN32)
+ internal_exception(1, "STAT_PLATFORM_BLOCKSIZE not implemented");
+#else
result = statbuf.st_blksize;
+#endif
break;
case STAT_PLATFORM_BLOCKS:
+#if defined(WIN32)
+ internal_exception(1, "STAT_PLATFORM_BLOCKS not implemented");
+#else
result = statbuf.st_blocks;
+#endif
break;
}
@@ -149,10 +157,18 @@
result = statbuf.st_rdev;
break;
case STAT_PLATFORM_BLOCKSIZE:
+#if defined(WIN32)
+ internal_exception(1, "STAT_PLATFORM_BLOCKSIZE not implemented");
+#else
result = statbuf.st_blksize;
+#endif
break;
case STAT_PLATFORM_BLOCKS:
+#if defined(WIN32)
+ internal_exception(1, "STAT_PLATFORM_BLOCKS not implemented");
+#else
result = statbuf.st_blocks;
+#endif
break;
}
1.19 +2 -1 parrot/config/inter/progs.pl
Index: progs.pl
===================================================================
RCS file: /cvs/public/parrot/config/inter/progs.pl,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -w -r1.18 -r1.19
--- progs.pl 19 Jun 2004 09:11:44 -0000 1.18
+++ progs.pl 8 Oct 2004 09:45:03 -0000 1.19
@@ -1,6 +1,6 @@
#! perl -w
# Copyright: 2001-2003 The Perl Foundation. All Rights Reserved.
-# $Id: progs.pl,v 1.18 2004/06/19 09:11:44 leo Exp $
+# $Id: progs.pl,v 1.19 2004/10/08 09:45:03 jrieks Exp $
=head1 NAME
@@ -35,6 +35,7 @@
libs lex yacc));
$ccflags =~ s/-D((PERL|HAVE)_\w+\s*|USE_PERLIO)//g;
$ccflags =~ s/-fno-strict-aliasing//g;
+ $ccflags =~ s/-fnative-struct//g;
$linkflags =~ s/-libpath:\S+//g;
$ldflags =~ s/-libpath:\S+//g;
my $debug='n';
