| Newsgroups |
perl.cvs.mod_parrot |
| Message-ID |
<[email protected]> |
cvsuser 02/05/17 09:18:21
Modified: . mod_parrot.diff
Log:
Remove the part of the patch which is specific to my build environment
Replaces by a hack in the Makefile
Revision Changes Path
1.2 +10 -13 mod_parrot/mod_parrot.diff
Index: mod_parrot.diff
===================================================================
RCS file: /cvs/public/mod_parrot/mod_parrot.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- mod_parrot.diff 17 May 2002 03:19:45 -0000 1.1
+++ mod_parrot.diff 17 May 2002 16:18:21 -0000 1.2
@@ -2,9 +2,9 @@
===================================================================
RCS file: /cvs/public/parrot/Makefile.in,v
retrieving revision 1.149
-diff -u -r1.149 Makefile.in
+diff -u -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
++++ Makefile.in 17 May 2002 15:11:55 -0000
@@ -74,7 +74,8 @@
CLASS_O_FILES = classes/default$(O) classes/array$(O) \
classes/perlint$(O) classes/perlstring$(O) classes/perlnum$(O) \
@@ -28,9 +28,9 @@
===================================================================
RCS file: /cvs/public/parrot/global_setup.c,v
retrieving revision 1.25
-diff -u -r1.25 global_setup.c
+diff -u -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
++++ global_setup.c 17 May 2002 15:11:55 -0000
@@ -29,6 +29,7 @@
Parrot_PerlHash_class_init(enum_class_PerlHash);
Parrot_ParrotPointer_class_init(enum_class_ParrotPointer);
@@ -45,8 +45,8 @@
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 @@
++++ classes/Makefile.in 17 May 2002 16:08:34 -0000
+@@ -7,12 +7,13 @@
O_FILES = default$(O) array$(O) perlint$(O) perlstring$(O) perlnum$(O) \
@@ -58,13 +58,10 @@
#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
++CFLAGS = ${ccflags} ${cc_warn} ${cc_debug} -I../include
--C_LIBS = ${libs}
-+C_LIBS = ${libs} /home/kevin/cvs/mod_parrot/mod_parrot.so
+ C_LIBS = ${libs}
- CC = ${cc}
- PERL = ${perl}
@@ -25,6 +26,11 @@
$(CC) $(CFLAGS) ${cc_exe_out}$@ -c $<
@@ -81,9 +78,9 @@
===================================================================
RCS file: /cvs/public/parrot/include/parrot/pmc.h,v
retrieving revision 1.29
-diff -u -r1.29 pmc.h
+diff -u -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
++++ include/parrot/pmc.h 17 May 2002 15:11:55 -0000
@@ -14,6 +14,7 @@
#define PARROT_PMC_H_GUARD