I will periodically post the results of my research into the issues raised in this RT.
1. I began by moving the ppc-related files from auto::cpu to gen::cpu, i.e., earlier in the configuration process. I then ran Configure.pl on both trunk and branch. I then did a diff on the contents of lib/Parrot/Configure/Generated.pm, which records the results of configuration. That diff is attached in diff.trunk.cpu.generated.txt. There were no significant differences between trunk and the cpu branch. 2. I then did a recursive diff between trunk and the cpu branch in the post-Configure.pl, pre-make state. The results are found in the attached file diff.trunk.cpu.txt. AFAICT, there were no significant differences between trunk and branch. (Note: I had done an 'svn up' on trunk in the interim, and two new files entered trunk: U lib/Parrot/Distribution.pm A compilers/pirc/new/pasm.y A compilers/pirc/new/pasm.l U t/codingstd/linelength.t I don't think these additions made any difference in the following results.) 3. I tried to 'make' and 'make test' in the branch, but I ran into what I think is an unrelated problem building Parrot on Darwin. This has been reported in RT 47349. Once this is resolved, I will try to build in the cpu branch on Darwin. kid51
54c54 < 'build_dir' => '/Users/jimk/work/parrot', --- > 'build_dir' => '/Users/jimk/work/cpu', 70c70 < 'configdate' => 'Sun Nov 11 15:10:57 2007 GMT', --- > 'configdate' => 'Sun Nov 11 15:11:57 2007 GMT', 224c224 < 'ldflags' => ' -L/usr/local/lib -L/Users/jimk/work/parrot/blib/lib -flat_namespace ', --- > 'ldflags' => ' -L/usr/local/lib -L/Users/jimk/work/cpu/blib/lib > -flat_namespace ', 399c399 < 'TEMP_generated' => 'config/auto/cpu/ppc/test_gcc_cmpset.in', --- > 'TEMP_generated' => 'config/gen/cpu/ppc/test_gcc_cmpset.in',
Only in /Users/jimk/work/parrot: .DS_Store Binary files /Users/jimk/work/parrot/.configure_trace.sto and /Users/jimk/work/cpu/.configure_trace.sto differ diff -w -r -x .svn -x .html /Users/jimk/work/parrot/MANIFEST /Users/jimk/work/cpu/MANIFEST 2c2 < # $Id$ --- > # $Id: MANIFEST 22802 2007-11-11 14:42:53Z jkeenan $ 4c4 < # generated by tools/dev/mk_manifest_and_skip.pl Sun Nov 11 14:08:40 2007 UT --- > # generated by tools/dev/mk_manifest_and_skip.pl Sun Nov 11 14:31:18 2007 UT 183,184d182 < config/auto/cpu/ppc/auto.pm [] < config/auto/cpu/ppc/test_gcc_cmpset.in [] 257a256,257 > config/gen/cpu/ppc/auto.pm [] > config/gen/cpu/ppc/test_gcc_cmpset.in [] Only in /Users/jimk/work/parrot: MANIFEST.2.mine Only in /Users/jimk/work/parrot: MANIFEST.mine Only in /Users/jimk/work/parrot: MANIFEST.r22775 Only in /Users/jimk/work/parrot: MANIFEST.r22776 Only in /Users/jimk/work/parrot: MANIFEST.r22788 Only in /Users/jimk/work/parrot: MANIFEST.r22795 diff -w -r -x .svn -x .html /Users/jimk/work/parrot/Makefile /Users/jimk/work/cpu/Makefile 5c5 < # $Id: root.in 22797 2007-11-11 13:55:30Z bernhard $ --- > # $Id: root.in 22801 2007-11-11 14:25:15Z jkeenan $ 106c106 < LDFLAGS = -L/usr/local/lib -L/Users/jimk/work/parrot/blib/lib -flat_namespace --- > LDFLAGS = -L/usr/local/lib -L/Users/jimk/work/cpu/blib/lib > -flat_namespace diff -w -r -x .svn -x .html /Users/jimk/work/parrot/compilers/bcg/Makefile /Users/jimk/work/cpu/compilers/bcg/Makefile 6,7c6,7 < PARROT = /Users/jimk/work/parrot/parrot < LIBPARROT = /Users/jimk/work/parrot/blib/lib/libparrot.a --- > PARROT = /Users/jimk/work/cpu/parrot > LIBPARROT = /Users/jimk/work/cpu/blib/lib/libparrot.a 11c11 < CC_INC = -I./include -I/Users/jimk/work/parrot/include --- > CC_INC = -I./include -I/Users/jimk/work/cpu/include 19c19 < LDFLAGS = -L/usr/local/lib -L/Users/jimk/work/parrot/blib/lib -flat_namespace -L/Users/jimk/work/parrot/blib/lib/ -lparrot --- > LDFLAGS = -L/usr/local/lib -L/Users/jimk/work/cpu/blib/lib -flat_namespace > -L/Users/jimk/work/cpu/blib/lib/ -lparrot 22c22 < BUILD_PMC = $(PERL) /Users/jimk/work/parrot/tools/build/dynpmc.pl --- > BUILD_PMC = $(PERL) /Users/jimk/work/cpu/tools/build/dynpmc.pl 24c24 < DEST_PMC_DIR = /Users/jimk/work/parrot/runtime/parrot/dynext --- > DEST_PMC_DIR = /Users/jimk/work/cpu/runtime/parrot/dynext 26c26 < LIB_BCG = /Users/jimk/work/parrot/blib/lib/libbcg$(SHARE_EXT) --- > LIB_BCG = /Users/jimk/work/cpu/blib/lib/libbcg$(SHARE_EXT) 74c74 < $(CP) /Users/jimk/work/parrot/blib/lib/libbcg$(SHARE_EXT) /Users/jimk/work/parrot --- > $(CP) /Users/jimk/work/cpu/blib/lib/libbcg$(SHARE_EXT) > /Users/jimk/work/cpu Only in /Users/jimk/work/parrot/compilers/imcc: imcc.l.flag diff -w -r -x .svn -x .html /Users/jimk/work/parrot/compilers/past-pm/Makefile /Users/jimk/work/cpu/compilers/past-pm/Makefile 16c16 < BUILD = $(PERL) /Users/jimk/work/parrot/tools/build/dynpmc.pl --- > BUILD = $(PERL) /Users/jimk/work/cpu/tools/build/dynpmc.pl 19c19 < PARROT_DYNEXT = /Users/jimk/work/parrot/runtime/parrot/dynext --- > PARROT_DYNEXT = /Users/jimk/work/cpu/runtime/parrot/dynext diff -w -r -x .svn -x .html /Users/jimk/work/parrot/compilers/pct/Makefile /Users/jimk/work/cpu/compilers/pct/Makefile 16c16 < BUILD = $(PERL) /Users/jimk/work/parrot/tools/build/dynpmc.pl --- > BUILD = $(PERL) /Users/jimk/work/cpu/tools/build/dynpmc.pl 19c19 < PARROT_DYNEXT = /Users/jimk/work/parrot/runtime/parrot/dynext --- > PARROT_DYNEXT = /Users/jimk/work/cpu/runtime/parrot/dynext diff -w -r -x .svn -x .html /Users/jimk/work/parrot/compilers/pirc/Makefile /Users/jimk/work/cpu/compilers/pirc/Makefile 14c14 < BUILD = $(PERL) /Users/jimk/work/parrot/tools/build/dynpmc.pl --- > BUILD = $(PERL) /Users/jimk/work/cpu/tools/build/dynpmc.pl 26c26 < LDFLAGS = -L/usr/local/lib -L/Users/jimk/work/parrot/blib/lib -flat_namespace --- > LDFLAGS = -L/usr/local/lib -L/Users/jimk/work/cpu/blib/lib > -flat_namespace diff -w -r -x .svn -x .html /Users/jimk/work/parrot/compilers/pirc/macro/macro.l /Users/jimk/work/cpu/compilers/pirc/macro/macro.l 4c4 < * $Id: macro.l 22794 2007-11-11 12:58:02Z kjs $ --- > * $Id: macro.l 22801 2007-11-11 14:25:15Z jkeenan $ diff -w -r -x .svn -x .html /Users/jimk/work/parrot/compilers/pirc/macro/macro.y /Users/jimk/work/cpu/compilers/pirc/macro/macro.y 4c4 < * $Id: macro.y 22795 2007-11-11 13:33:11Z kjs $ --- > * $Id: macro.y 22801 2007-11-11 14:25:15Z jkeenan $ diff -w -r -x .svn -x .html /Users/jimk/work/parrot/compilers/pirc/macro/macrolexer.c /Users/jimk/work/cpu/compilers/pirc/macro/macrolexer.c 915c915 < * $Id: macrolexer.c 22794 2007-11-11 12:58:02Z kjs $ --- > * $Id: macrolexer.c 22801 2007-11-11 14:25:15Z jkeenan $ diff -w -r -x .svn -x .html /Users/jimk/work/parrot/compilers/pirc/macro/macroparser.c /Users/jimk/work/cpu/compilers/pirc/macro/macroparser.c 135c135 < * $Id: macroparser.c 22795 2007-11-11 13:33:11Z kjs $ --- > * $Id: macroparser.c 22801 2007-11-11 14:25:15Z jkeenan $ Only in /Users/jimk/work/parrot/compilers/pirc/new: pasm.l Only in /Users/jimk/work/parrot/compilers/pirc/new: pasm.y diff -w -r -x .svn -x .html /Users/jimk/work/parrot/compilers/pirc/new/pir.y /Users/jimk/work/cpu/compilers/pirc/new/pir.y 4c4 < * $Id: pir.y 22798 2007-11-11 14:15:20Z kjs $ --- > * $Id: pir.y 22801 2007-11-11 14:25:15Z jkeenan $ diff -w -r -x .svn -x .html /Users/jimk/work/parrot/compilers/pirc/new/pirparser.c /Users/jimk/work/cpu/compilers/pirc/new/pirparser.c 279c279 < * $Id: pirparser.c 22798 2007-11-11 14:15:20Z kjs $ --- > * $Id: pirparser.c 22801 2007-11-11 14:25:15Z jkeenan $ Only in /Users/jimk/work/parrot/config/auto/cpu: ppc diff -w -r -x .svn -x .html /Users/jimk/work/parrot/config/auto/cpu.pm /Users/jimk/work/cpu/config/auto/cpu.pm 2c2 < # $Id: cpu.pm 22195 2007-10-18 01:51:52Z jkeenan $ --- > # $Id: cpu.pm 22801 2007-11-11 14:25:15Z jkeenan $ 46a47,50 > # config/auto/cpu/i386/auto.pm > # config/auto/cpu/ppc/auto.pm > # config/auto/cpu/sun4/auto.pm > # config/auto/cpu/x86_64/auto.pm diff -w -r -x .svn -x .html /Users/jimk/work/parrot/config/auto/pmc.pm /Users/jimk/work/cpu/config/auto/pmc.pm 2c2 < # $Id: pmc.pm 22797 2007-11-11 13:55:30Z bernhard $ --- > # $Id: pmc.pm 22801 2007-11-11 14:25:15Z jkeenan $ diff -w -r -x .svn -x .html /Users/jimk/work/parrot/config/auto/va_ptr.pm /Users/jimk/work/cpu/config/auto/va_ptr.pm 27,28c27 < $data{description} = < q{Test the type of va_ptr (this test is likely to segfault)}; --- > $data{description} = q{Test the type of va_ptr (this test is likely to > segfault)}; Only in /Users/jimk/work/cpu/config/gen/cpu: ppc diff -w -r -x .svn -x .html /Users/jimk/work/parrot/config/gen/cpu.pm /Users/jimk/work/cpu/config/gen/cpu.pm 2c2 < # $Id: cpu.pm 22195 2007-10-18 01:51:52Z jkeenan $ --- > # $Id: cpu.pm 22801 2007-11-11 14:25:15Z jkeenan $ 44a45,46 > # config/gen/cpu/i386/auto.pm > # config/gen/cpu/ppc/auto.pm diff -w -r -x .svn -x .html /Users/jimk/work/parrot/config/gen/makefiles/root.in /Users/jimk/work/cpu/config/gen/makefiles/root.in 2c2 < # $Id: root.in 22797 2007-11-11 13:55:30Z bernhard $ --- > # $Id: root.in 22801 2007-11-11 14:25:15Z jkeenan $ diff -w -r -x .svn -x .html /Users/jimk/work/parrot/config/gen/parrot_include.pm /Users/jimk/work/cpu/config/gen/parrot_include.pm 2c2 < # $Id: parrot_include.pm 22796 2007-11-11 13:54:11Z bernhard $ --- > # $Id: parrot_include.pm 22801 2007-11-11 14:25:15Z jkeenan $ diff -w -r -x .svn -x .html /Users/jimk/work/parrot/config_lib.pasm /Users/jimk/work/cpu/config_lib.pasm 30c30 < set P0["build_dir"], "/Users/jimk/work/parrot" --- > set P0["build_dir"], "/Users/jimk/work/cpu" 46c46 < set P0["configdate"], "Sun Nov 11 15:10:57 2007 GMT" --- > set P0["configdate"], "Sun Nov 11 15:11:57 2007 GMT" 215c215 < set P0["ldflags"], " -L/usr/local/lib -L/Users/jimk/work/parrot/blib/lib -flat_namespace " --- > set P0["ldflags"], " -L/usr/local/lib -L/Users/jimk/work/cpu/blib/lib > -flat_namespace " 301c301 < set S1, "/Users/jimk/work/parrot" --- > set S1, "/Users/jimk/work/cpu" diff -w -r -x .svn -x .html /Users/jimk/work/parrot/include/parrot/config.h /Users/jimk/work/cpu/include/parrot/config.h 25c25 < #define PARROT_CONFIG_DATE "Sun Nov 11 15:10:57 2007 GMT" --- > #define PARROT_CONFIG_DATE "Sun Nov 11 15:11:57 2007 GMT" diff -w -r -x .svn -x .html /Users/jimk/work/parrot/languages/APL/Makefile /Users/jimk/work/cpu/languages/APL/Makefile 10c10 < BUILD = $(PERL) /Users/jimk/work/parrot/tools/build/dynpmc.pl --- > BUILD = $(PERL) /Users/jimk/work/cpu/tools/build/dynpmc.pl 16c16 < GROUP_DIR = /Users/jimk/work/parrot/runtime/parrot/dynext --- > GROUP_DIR = /Users/jimk/work/cpu/runtime/parrot/dynext diff -w -r -x .svn -x .html /Users/jimk/work/parrot/languages/LANGUAGES_STATUS.pod /Users/jimk/work/cpu/languages/LANGUAGES_STATUS.pod 1c1 < # $Id: LANGUAGES_STATUS.pod 22793 2007-11-11 12:53:48Z bernhard $ --- > # $Id: LANGUAGES_STATUS.pod 22801 2007-11-11 14:25:15Z jkeenan $ diff -w -r -x .svn -x .html /Users/jimk/work/parrot/languages/PIR/Makefile /Users/jimk/work/cpu/languages/PIR/Makefile 15c15 < PGE_LIBRARY = /Users/jimk/work/parrot/runtime/parrot/library/PGE --- > PGE_LIBRARY = /Users/jimk/work/cpu/runtime/parrot/library/PGE diff -w -r -x .svn -x .html /Users/jimk/work/parrot/languages/WMLScript/Makefile /Users/jimk/work/cpu/languages/WMLScript/Makefile 11,12c11,12 < PMCBUILD = $(PERL) /Users/jimk/work/parrot/tools/build/dynpmc.pl < OPSBUILD = $(PERL) /Users/jimk/work/parrot/tools/build/dynoplibs.pl --- > PMCBUILD = $(PERL) /Users/jimk/work/cpu/tools/build/dynpmc.pl > OPSBUILD = $(PERL) /Users/jimk/work/cpu/tools/build/dynoplibs.pl 18c18 < PARROT_DYNEXT = /Users/jimk/work/parrot/runtime/parrot/dynext --- > PARROT_DYNEXT = /Users/jimk/work/cpu/runtime/parrot/dynext diff -w -r -x .svn -x .html /Users/jimk/work/parrot/languages/abc/Makefile /Users/jimk/work/cpu/languages/abc/Makefile 11,13c11,13 < BUILD_DIR= /Users/jimk/work/parrot < RECONFIGURE= $(PERL) /Users/jimk/work/parrot/tools/dev/reconfigure.pl < BUILD = $(PERL) /Users/jimk/work/parrot/tools/build/dynpmc.pl --- > BUILD_DIR= /Users/jimk/work/cpu > RECONFIGURE= $(PERL) /Users/jimk/work/cpu/tools/dev/reconfigure.pl > BUILD = $(PERL) /Users/jimk/work/cpu/tools/build/dynpmc.pl 21c21 < PARROT_DYNEXT = /Users/jimk/work/parrot/runtime/parrot/dynext --- > PARROT_DYNEXT = /Users/jimk/work/cpu/runtime/parrot/dynext diff -w -r -x .svn -x .html /Users/jimk/work/parrot/languages/amber/Makefile /Users/jimk/work/cpu/languages/amber/Makefile 6,7c6,7 < BUILDPMC = $(PERL) /Users/jimk/work/parrot/tools/build/dynpmc.pl < DESTDIR = /Users/jimk/work/parrot/runtime/parrot/dynext --- > BUILDPMC = $(PERL) /Users/jimk/work/cpu/tools/build/dynpmc.pl > DESTDIR = /Users/jimk/work/cpu/runtime/parrot/dynext diff -w -r -x .svn -x .html /Users/jimk/work/parrot/languages/c99/Makefile /Users/jimk/work/cpu/languages/c99/Makefile 12c12 < BUILD = $(PERL) /Users/jimk/work/parrot/tools/build/dynpmc.pl --- > BUILD = $(PERL) /Users/jimk/work/cpu/tools/build/dynpmc.pl 20c20 < PARROT_DYNEXT = /Users/jimk/work/parrot/runtime/parrot/dynext --- > PARROT_DYNEXT = /Users/jimk/work/cpu/runtime/parrot/dynext diff -w -r -x .svn -x .html /Users/jimk/work/parrot/languages/cardinal/Makefile /Users/jimk/work/cpu/languages/cardinal/Makefile 13c13 < BUILD = $(PERL) /Users/jimk/work/parrot/tools/build/dynpmc.pl --- > BUILD = $(PERL) /Users/jimk/work/cpu/tools/build/dynpmc.pl 21c21 < PARROT_DYNEXT = /Users/jimk/work/parrot/runtime/parrot/dynext --- > PARROT_DYNEXT = /Users/jimk/work/cpu/runtime/parrot/dynext diff -w -r -x .svn -x .html /Users/jimk/work/parrot/languages/ecmascript/Makefile /Users/jimk/work/cpu/languages/ecmascript/Makefile 12c12 < BUILD = $(PERL) /Users/jimk/work/parrot/tools/build/dynpmc.pl --- > BUILD = $(PERL) /Users/jimk/work/cpu/tools/build/dynpmc.pl 20c20 < PARROT_DYNEXT = /Users/jimk/work/parrot/runtime/parrot/dynext --- > PARROT_DYNEXT = /Users/jimk/work/cpu/runtime/parrot/dynext diff -w -r -x .svn -x .html /Users/jimk/work/parrot/languages/lua/Makefile /Users/jimk/work/cpu/languages/lua/Makefile 14c14 < PMCBUILD = $(PERL) /Users/jimk/work/parrot/tools/build/dynpmc.pl --- > PMCBUILD = $(PERL) /Users/jimk/work/cpu/tools/build/dynpmc.pl 19c19 < PARROT_DYNEXT = /Users/jimk/work/parrot/runtime/parrot/dynext --- > PARROT_DYNEXT = /Users/jimk/work/cpu/runtime/parrot/dynext diff -w -r -x .svn -x .html /Users/jimk/work/parrot/languages/nqp/Makefile /Users/jimk/work/cpu/languages/nqp/Makefile 11,13c11,13 < BUILD_DIR= /Users/jimk/work/parrot < BUILD = $(PERL) /Users/jimk/work/parrot/tools/build/dynpmc.pl < RECONFIGURE= $(PERL) /Users/jimk/work/parrot/tools/dev/reconfigure.pl --- > BUILD_DIR= /Users/jimk/work/cpu > BUILD = $(PERL) /Users/jimk/work/cpu/tools/build/dynpmc.pl > RECONFIGURE= $(PERL) /Users/jimk/work/cpu/tools/dev/reconfigure.pl 20,21c20,21 < PARROT_DYNEXT = /Users/jimk/work/parrot/runtime/parrot/dynext < PGE_LIBRARY = /Users/jimk/work/parrot/runtime/parrot/library/PGE --- > PARROT_DYNEXT = /Users/jimk/work/cpu/runtime/parrot/dynext > PGE_LIBRARY = /Users/jimk/work/cpu/runtime/parrot/library/PGE diff -w -r -x .svn -x .html /Users/jimk/work/parrot/languages/perl5/Makefile /Users/jimk/work/cpu/languages/perl5/Makefile 8,9c8,9 < PMCBUILD = $(PERL) /Users/jimk/work/parrot/tools/build/dynpmc.pl < DESTDIR = /Users/jimk/work/parrot/runtime/parrot/dynext --- > PMCBUILD = $(PERL) /Users/jimk/work/cpu/tools/build/dynpmc.pl > DESTDIR = /Users/jimk/work/cpu/runtime/parrot/dynext 44c44 < @$(PERL) ../../tools/dev/cc_flags.pl ../../CFLAGS $(CC) "" $(CFLAGS) -I/Users/jimk/work/parrot/include -o $@ -c $< --- > @$(PERL) ../../tools/dev/cc_flags.pl ../../CFLAGS $(CC) "" $(CFLAGS) > -I/Users/jimk/work/cpu/include -o $@ -c $< diff -w -r -x .svn -x .html /Users/jimk/work/parrot/languages/perl6/Makefile /Users/jimk/work/cpu/languages/perl6/Makefile 11c11 < BUILD_DIR = /Users/jimk/work/parrot --- > BUILD_DIR = /Users/jimk/work/cpu diff -w -r -x .svn -x .html /Users/jimk/work/parrot/languages/pugs/Makefile /Users/jimk/work/cpu/languages/pugs/Makefile 10,11c10,11 < BUILD = $(PERL) /Users/jimk/work/parrot/tools/build/dynpmc.pl < DESTDIR = /Users/jimk/work/parrot/runtime/parrot/dynext --- > BUILD = $(PERL) /Users/jimk/work/cpu/tools/build/dynpmc.pl > DESTDIR = /Users/jimk/work/cpu/runtime/parrot/dynext diff -w -r -x .svn -x .html /Users/jimk/work/parrot/languages/pynie/Makefile /Users/jimk/work/cpu/languages/pynie/Makefile 11c11 < BUILD = $(PERL) /Users/jimk/work/parrot/tools/build/dynpmc.pl --- > BUILD = $(PERL) /Users/jimk/work/cpu/tools/build/dynpmc.pl 19,20c19,20 < PARROT_DYNEXT = /Users/jimk/work/parrot/runtime/parrot/dynext < PGE_LIBRARY = /Users/jimk/work/parrot/runtime/parrot/library/PGE --- > PARROT_DYNEXT = /Users/jimk/work/cpu/runtime/parrot/dynext > PGE_LIBRARY = /Users/jimk/work/cpu/runtime/parrot/library/PGE diff -w -r -x .svn -x .html /Users/jimk/work/parrot/languages/regex/Makefile /Users/jimk/work/cpu/languages/regex/Makefile 16c16 < BUILD_DIR = /Users/jimk/work/parrot --- > BUILD_DIR = /Users/jimk/work/cpu 18c18 < BUILD_DYNPMC = $(PERL) /Users/jimk/work/parrot/tools/build/dynpmc.pl --- > BUILD_DYNPMC = $(PERL) /Users/jimk/work/cpu/tools/build/dynpmc.pl diff -w -r -x .svn -x .html /Users/jimk/work/parrot/languages/scheme/README /Users/jimk/work/cpu/languages/scheme/README 1c1 < # $Id: README 22793 2007-11-11 12:53:48Z bernhard $ --- > # $Id: README 22801 2007-11-11 14:25:15Z jkeenan $ diff -w -r -x .svn -x .html /Users/jimk/work/parrot/languages/tcl/Makefile /Users/jimk/work/cpu/languages/tcl/Makefile 10,12c10,12 < PMCBUILD = $(PERL) /Users/jimk/work/parrot/tools/build/dynpmc.pl < OPSBUILD = $(PERL) /Users/jimk/work/parrot/tools/build/dynoplibs.pl < DESTDIR = /Users/jimk/work/parrot/runtime/parrot/dynext --- > PMCBUILD = $(PERL) /Users/jimk/work/cpu/tools/build/dynpmc.pl > OPSBUILD = $(PERL) /Users/jimk/work/cpu/tools/build/dynoplibs.pl > DESTDIR = /Users/jimk/work/cpu/runtime/parrot/dynext 120c120 < @$(PERL) ../../tools/dev/cc_flags.pl ../../CFLAGS $(CC) "" $(CFLAGS) -I/Users/jimk/work/parrot/include -o $@ -c $< --- > @$(PERL) ../../tools/dev/cc_flags.pl ../../CFLAGS $(CC) "" $(CFLAGS) > -I/Users/jimk/work/cpu/include -o $@ -c $< Only in /Users/jimk/work/parrot/lib: DumbLink.pm diff -w -r -x .svn -x .html /Users/jimk/work/parrot/lib/Parrot/Config/Generated.pm /Users/jimk/work/cpu/lib/Parrot/Config/Generated.pm 54c54 < 'build_dir' => '/Users/jimk/work/parrot', --- > 'build_dir' => '/Users/jimk/work/cpu', 70c70 < 'configdate' => 'Sun Nov 11 15:10:57 2007 GMT', --- > 'configdate' => 'Sun Nov 11 15:11:57 2007 GMT', 224c224 < 'ldflags' => ' -L/usr/local/lib -L/Users/jimk/work/parrot/blib/lib -flat_namespace ', --- > 'ldflags' => ' -L/usr/local/lib -L/Users/jimk/work/cpu/blib/lib > -flat_namespace ', 399c399 < 'TEMP_generated' => 'config/auto/cpu/ppc/test_gcc_cmpset.in', --- > 'TEMP_generated' => 'config/gen/cpu/ppc/test_gcc_cmpset.in', diff -w -r -x .svn -x .html /Users/jimk/work/parrot/lib/Parrot/Distribution.pm /Users/jimk/work/cpu/lib/Parrot/Distribution.pm 2c2 < # $Id: Distribution.pm 22805 2007-11-11 14:53:38Z kjs $ --- > # $Id: Distribution.pm 22769 2007-11-08 18:52:26Z kjs $ 354,355d353 < compilers/pirc/new/pasm.l < compilers/pirc/new/pasm.y diff -w -r -x .svn -x .html /Users/jimk/work/parrot/lib/Parrot/Pmc2c/ComposedMethod.pm /Users/jimk/work/cpu/lib/Parrot/Pmc2c/ComposedMethod.pm 2c2 < # $Id: ComposedMethod.pm 21450 2007-09-21 09:33:12Z paultcochrane $ --- > # $Id: ComposedMethod.pm 22035 2007-10-12 00:47:01Z chromatic $ diff -w -r -x .svn -x .html /Users/jimk/work/parrot/myconfig /Users/jimk/work/cpu/myconfig 2c2 < configdate='Sun Nov 11 15:10:57 2007 GMT' --- > configdate='Sun Nov 11 15:11:57 2007 GMT' 12c12 < ld='/usr/bin/g++-3.3', ldflags=' -L/usr/local/lib -L/Users/jimk/work/parrot/blib/lib -flat_namespace ', --- > ld='/usr/bin/g++-3.3', ldflags=' -L/usr/local/lib > -L/Users/jimk/work/cpu/blib/lib -flat_namespace ', Only in /Users/jimk/work/parrot/src/atomic: gcc_pcc.c diff -w -r -x .svn -x .html /Users/jimk/work/parrot/src/dynoplibs/Makefile /Users/jimk/work/cpu/src/dynoplibs/Makefile 9c9 < RUNTIME_DIR = /Users/jimk/work/parrot/runtime/parrot/dynext --- > RUNTIME_DIR = /Users/jimk/work/cpu/runtime/parrot/dynext 18c18 < BUILD = $(PERL) /Users/jimk/work/parrot/tools/build/dynoplibs.pl --- > BUILD = $(PERL) /Users/jimk/work/cpu/tools/build/dynoplibs.pl diff -w -r -x .svn -x .html /Users/jimk/work/parrot/src/dynpmc/Makefile /Users/jimk/work/cpu/src/dynpmc/Makefile 9c9 < RUNTIME_DIR = /Users/jimk/work/parrot/runtime/parrot/dynext --- > RUNTIME_DIR = /Users/jimk/work/cpu/runtime/parrot/dynext 24c24 < BUILD = $(PERL) /Users/jimk/work/parrot/tools/build/dynpmc.pl --- > BUILD = $(PERL) /Users/jimk/work/cpu/tools/build/dynpmc.pl Only in /Users/jimk/work/parrot/src: main.o diff -w -r -x .svn -x .html /Users/jimk/work/parrot/t/codingstd/linelength.t /Users/jimk/work/cpu/t/codingstd/linelength.t 3c3 < # $Id: linelength.t 22804 2007-11-11 14:52:21Z kjs $ --- > # $Id: linelength.t 22770 2007-11-08 18:54:29Z kjs $ 139,140d138 < compilers/pirc/new/pasm.l < compilers/pirc/new/pasm.y diff -w -r -x .svn -x .html /Users/jimk/work/parrot/tools/build/dynoplibs.pl /Users/jimk/work/cpu/tools/build/dynoplibs.pl 30c30 < our $LDFLAGS = q[ -L/usr/local/lib -L/Users/jimk/work/parrot/blib/lib -flat_namespace ]; --- > our $LDFLAGS = q[ -L/usr/local/lib -L/Users/jimk/work/cpu/blib/lib > -flat_namespace ]; 46c46 < $LIBPARROT = '/Users/jimk/work/parrot/libparrot.a'; --- > $LIBPARROT = '/Users/jimk/work/cpu/libparrot.a'; 52c52 < q[/Users/jimk/work/parrot/lib] . --- > q[/Users/jimk/work/cpu/lib] . 54c54 < q[/Users/jimk/work/parrot/tools/build/ops2c.pl] . --- > q[/Users/jimk/work/cpu/tools/build/ops2c.pl] . 70,71c70,71 < "-I" . $PATHQUOTE . '/Users/jimk/work/parrot/include' . $PATHQUOTE . " " . < "-I" . $PATHQUOTE . '/Users/jimk/work/parrot/src/pmc' . $PATHQUOTE . " " . --- > "-I" . $PATHQUOTE . '/Users/jimk/work/cpu/include' . $PATHQUOTE . " " > . > "-I" . $PATHQUOTE . '/Users/jimk/work/cpu/src/pmc' . $PATHQUOTE . " " > . diff -w -r -x .svn -x .html /Users/jimk/work/parrot/tools/build/dynpmc.pl /Users/jimk/work/cpu/tools/build/dynpmc.pl 34c34 < our $LDFLAGS = q[ -L/usr/local/lib -L/Users/jimk/work/parrot/blib/lib -flat_namespace ]; --- > our $LDFLAGS = q[ -L/usr/local/lib -L/Users/jimk/work/cpu/blib/lib > -flat_namespace ]; 50c50 < $LIBPARROT = '/Users/jimk/work/parrot/libparrot.a'; --- > $LIBPARROT = '/Users/jimk/work/cpu/libparrot.a'; 55c55 < our $PMC2C = "$PERL $PATHQUOTE" . q[/Users/jimk/work/parrot/tools/build/pmc2c.pl] . $PATHQUOTE; --- > our $PMC2C = "$PERL $PATHQUOTE" . > q[/Users/jimk/work/cpu/tools/build/pmc2c.pl] . $PATHQUOTE; 65,67c65,67 < "-I" . $PATHQUOTE . '/Users/jimk/work/parrot/include' . $PATHQUOTE . " " . < "-I" . $PATHQUOTE . '/Users/jimk/work/parrot/src/pmc' . $PATHQUOTE . " " . < "-I" . $PATHQUOTE . '/Users/jimk/work/parrot/compilers/bcg/include' . $PATHQUOTE . " " . --- > "-I" . $PATHQUOTE . '/Users/jimk/work/cpu/include' . $PATHQUOTE . " " > . > "-I" . $PATHQUOTE . '/Users/jimk/work/cpu/src/pmc' . $PATHQUOTE . " " > . > "-I" . $PATHQUOTE . '/Users/jimk/work/cpu/compilers/bcg/include' . > $PATHQUOTE . " " . 89c89 < $liblist .= qq{ -Wl,-L "/Users/jimk/work/parrot/blib/lib"}; --- > $liblist .= qq{ -Wl,-L "/Users/jimk/work/cpu/blib/lib"}; 92c92 < $liblist .= qq{ /LIBPATH:"/Users/jimk/work/parrot/blib/lib"}; --- > $liblist .= qq{ /LIBPATH:"/Users/jimk/work/cpu/blib/lib"};