cvs commit: mod_parrot mod_parrot.diff

cvsuser     02/05/16 20:19:45

  Added:       .        mod_parrot.diff
  Log:
  patch to parrot sources needed to make apache.pmc compile
  
  Revision  Changes    Path
  1.1                  mod_parrot/mod_parrot.diff
  
  Index: mod_parrot.diff
  ===================================================================
  Index: Makefile.in
  ===================================================================
  RCS file: /cvs/public/parrot/Makefile.in,v
  retrieving revision 1.149
  diff -u -r1.149 Makefile.in
  --- Makefile.in	15 May 2002 01:45:03 -0000	1.149
  +++ Makefile.in	17 May 2002 03:18:07 -0000
  @@ -74,7 +74,8 @@
   CLASS_O_FILES = classes/default$(O) classes/array$(O) \
   classes/perlint$(O) classes/perlstring$(O) classes/perlnum$(O) \
   classes/perlarray$(O) classes/perlundef$(O) \
  -classes/perlhash$(O) classes/parrotpointer$(O) classes/intqueue$(O)
  +classes/perlhash$(O) classes/parrotpointer$(O) classes/intqueue$(O) \
  +classes/apache$(O)
   
   ENCODING_O_FILES = encodings/singlebyte$(O) encodings/utf8$(O) \
   				   encodings/utf16$(O) \
  @@ -188,6 +189,8 @@
   	mkdir -p blib/lib
   
   shared : blib_lib blib/lib/libparrot$(SO) blib/lib/libcore_prederef$(SO) $(TEST_PROG_SO)
  +
  +shared-only : blib_lib blib/lib/libparrot$(SO) blib/lib/libcore_prederef$(SO)
   
   blib/lib/libparrot$(SO).${VERSION} : blib_lib $(O_FILES)
   	$(LD) $(LD_SHARED) -Wl,-soname,libparrot$(SO).${MAJOR} $(LDFLAGS) $(LD_OUT)blib/lib/libparrot$(SO).${VERSION} $(O_FILES)
  Index: global_setup.c
  ===================================================================
  RCS file: /cvs/public/parrot/global_setup.c,v
  retrieving revision 1.25
  diff -u -r1.25 global_setup.c
  --- global_setup.c	5 Mar 2002 04:21:30 -0000	1.25
  +++ global_setup.c	17 May 2002 03:18:07 -0000
  @@ -29,6 +29,7 @@
       Parrot_PerlHash_class_init(enum_class_PerlHash);
       Parrot_ParrotPointer_class_init(enum_class_ParrotPointer);
       Parrot_IntQueue_class_init(enum_class_IntQueue);
  +    Parrot_Apache_class_init(enum_class_Apache);
   
       /* Now register the names of the PMCs */
       /*
  Index: classes/Makefile.in
  ===================================================================
  RCS file: /cvs/public/parrot/classes/Makefile.in,v
  retrieving revision 1.19
  diff -u -r1.19 Makefile.in
  --- classes/Makefile.in	29 Jan 2002 04:26:21 -0000	1.19
  +++ classes/Makefile.in	17 May 2002 03:18:07 -0000
  @@ -7,14 +7,15 @@
   
   
   O_FILES = default$(O) array$(O) perlint$(O) perlstring$(O) perlnum$(O) \
  -perlarray$(O) perlhash$(O) perlundef$(O) parrotpointer$(O) intqueue$(O)
  +perlarray$(O) perlhash$(O) perlundef$(O) parrotpointer$(O) intqueue$(O) \
  +apache$(O)
   
   #DO NOT ADD C COMPILER FLAGS HERE
   #Add them in Configure.pl--look for the
   #comment 'ADD C COMPILER FLAGS HERE'
  -CFLAGS = ${ccflags} ${cc_warn} ${cc_debug} -I../include
  +CFLAGS = ${ccflags} ${cc_warn} ${cc_debug} -I../include -I/home/kevin/apache/include -I/home/kevin/cvs/mod_parrot
   
  -C_LIBS = ${libs}
  +C_LIBS = ${libs} /home/kevin/cvs/mod_parrot/mod_parrot.so
   
   CC = ${cc}
   PERL = ${perl}
  @@ -25,6 +26,11 @@
   	$(CC) $(CFLAGS) ${cc_exe_out}$@ -c $<
   
   all : $(O_FILES)
  +
  +apache.c apache.h: apache.pmc
  +	$(PMC2C) apache.pmc
  +
  +apache$(O): $(H_FILES)
   
   array.c array.h: array.pmc 
   	$(PMC2C) array.pmc
  Index: include/parrot/pmc.h
  ===================================================================
  RCS file: /cvs/public/parrot/include/parrot/pmc.h,v
  retrieving revision 1.29
  diff -u -r1.29 pmc.h
  --- include/parrot/pmc.h	15 May 2002 01:45:09 -0000	1.29
  +++ include/parrot/pmc.h	17 May 2002 03:18:09 -0000
  @@ -14,6 +14,7 @@
   #define PARROT_PMC_H_GUARD
   
   enum {
  +    enum_class_Apache,
       enum_class_Array,
       enum_class_PerlUndef,
       enum_class_PerlInt,