cvsuser     01/10/17 04:45:24

  Modified:    .        Configure.pl Makefile.in
  Log:
  Fixes to make Parrot compile without the temporary build hack
  
  Courtesy of: Jason Gloudon <[EMAIL PROTECTED]>
  
  Revision  Changes    Path
  1.29      +4 -4      parrot/Configure.pl
  
  Index: Configure.pl
  ===================================================================
  RCS file: /home/perlcvs/parrot/Configure.pl,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -w -r1.28 -r1.29
  --- Configure.pl      2001/10/14 10:00:23     1.28
  +++ Configure.pl      2001/10/17 11:45:23     1.29
  @@ -19,7 +19,7 @@
   );
   
   if($opt_version) {
  -     print '$Id: Configure.pl,v 1.28 2001/10/14 10:00:23 simon Exp $' . "\n";
  +     print '$Id: Configure.pl,v 1.29 2001/10/17 11:45:23 simon Exp $' . "\n";
        exit;
   }
   
  @@ -188,9 +188,6 @@
   # and the types file
   buildfile("Types_pm", "Parrot");
   
  -# Temporary hack
  -system("make include/parrot/vtable.h");
  -
   # and now we figure out how big our things are
   print <<"END";
   
  @@ -201,6 +198,8 @@
   {
        my %newc;
   
  +       open NEEDED, ">include/parrot/vtable.h";
  +       close NEEDED;
        buildfile("testparrotsizes_c");
        compiletestc("testparrotsizes");
        %newc=eval(runtestc()) or die "Can't run the test program: $!";
  @@ -210,6 +209,7 @@
        @c{qw(stacklow intlow numlow strlow pmclow)} = lowbitmask(@c{qw(stackchunk 
iregchunk nregchunk sregchunk pregchunk)});
   
        unlink('testparrotsizes.c', "test_siz$c{exe}", "test$c{o}");
  +       unlink("include/parrot/vtable.h");
   }
   
   # rewrite the config file with the updated info
  
  
  
  1.28      +1 -1      parrot/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/perlcvs/parrot/Makefile.in,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -w -r1.27 -r1.28
  --- Makefile.in       2001/10/16 19:43:13     1.27
  +++ Makefile.in       2001/10/17 11:45:24     1.28
  @@ -103,7 +103,7 @@
        $(RM_F) $(TEST_PROG) $(PDISASM) $(PDUMP)
        cd docs; make clean
   
  -test:        .test_dummy
  +test: $(TEST_PROG) assemble.pl .test_dummy
   
   .test_dummy:
        $(PERL) t/harness
  
  
  


Reply via email to