Ticket #733: pdd30install_stage4.diff

ext/SQLite3/Makefile.in

@@ -1 @@
-# Copyright (C) 2001-2008, The Perl Foundation.
+# Copyright (C) 2001-2009, The Perl Foundation.
 
 TARGET_NAME = sqlite3s
 
@@ -37 +37 @@
 LINKFLAGS        = @linkflags@ @link_debug@ @ld_debug@
 LD               = @ld@
 LDFLAGS          = @ldflags@ @ld_debug@
-#CONDITIONED_LINE(darwin):export MACOSX_DEPLOYMENT_TARGET := @osx_version@
+#IF(darwin):export MACOSX_DEPLOYMENT_TARGET := @osx_version@
 O                = @o@
 EXE              = @exe@
 SHARE_EXT        = @share_ext@
@@ -45 +45 @@
 A                = @a@
 LD_SHARE_FLAGS   = @ld_share_flags@
 LD_LOAD_FLAGS    = @ld_load_flags@
-GEN_MAKEFILES = Makefile 
 DYNEXT_DIR          = runtime/parrot/dynext
-LIBNCI_TEST_SO      = $(DYNEXT_DIR)/libnci_test$(LOAD_EXT)
-LIBGLUTCB_SO        = $(DYNEXT_DIR)/libglutcb$(LOAD_EXT)
 
 @make_set_make@
 MAKE = @make_c@
@@ -74 +71 @@
 test:
         $(RM_F) test.db t/test.db
         PERL6LIB=../../languages/perl6 $(PERL6) t/test.p6
-        
 
 $(SHARED_LIB) : $(C_FILES)
         $(MKPATH) @blib_dir@
         $(CC) $(CC_INC) $(LD_SHARE_FLAGS) $(LDFLAGS) @ld_out@$@ \
-#CONDITIONED_LINE(cygchkdll):           -Wl,--out-implib=blib/lib/libparrot.dll.a \
+#IF(cygwin):            -Wl,--out-implib=lib$(TARGET_NAME).dll.a \
+#IF(win32 and cc==gcc):         -Wl,--out-implib=lib$(TARGET_NAME).lib \
                 $(C_FILES) $(C_LIBS) $(ICU_SHARED)
-#CONDITIONED_LINE(win32):       if exist $@.manifest mt.exe -nologo -manifest $@.manifest -outputresource:$@;2
+#IF(win32):     if exist $@.manifest mt.exe -nologo -manifest $@.manifest -outputresource:$@;2
 
 
 clean : 
         $(RM_F) $(SHARED_LIB) @blib_dir@ $(O_FILES) Makefile
+#IF(cygwin):            $(RM_F) lib$(TARGET_NAME).dll.a
+#IF(win32 and cc==gcc):         $(RM_F) lib$(TARGET_NAME).lib

MANIFEST

@@ -3747 +3747 @@
 t/tools/pmc2cutils/README                                   []
 tools/build/addopstags.pl                                   []
 tools/build/c2str.pl                                        []
-tools/build/cygchkdll.sh                                    []
 tools/build/fixup_gen_file.pl                               []
 tools/build/headerizer.pl                                   []
 tools/build/jit2c.pl                                        []

t/pmc/eval.t

@@ -317 +317 @@
 OUTPUT
 
 TODO: {
-    local $TODO = "cannot 'rm' an open file on windows" if $^O eq 'MSWin32';
+    local $TODO = "cannot 'rm' an open file on windows. TT#121" if $^O =~ /(MSWin32|cygwin)/;
 pir_output_is( <<"CODE", <<'OUTPUT', "eval.get_string - same file" );
 .sub main :main
 

config/init/defaults.pm

@@ -200 +200 @@
         make_set_make => $Config{make_set_make},
         make_and      => '&&',
 
-        # for cygwin
-        cygchkdll => '',
-
         # make_c: Command to emulate GNU make's C<-C directory> option:  chdir
         # to C<directory> before executing $(MAKE)
         make_c => '$(PERL) -e \'chdir shift @ARGV; system q{$(MAKE)}, @ARGV; exit $$? >> 8;\'',

config/gen/makefiles/root.in

@@ -764 +764 @@
         $(PARROT) -o $@ runtime/parrot/library/parrotlib.pir
 
 runtime/parrot/include/config.fpmc : myconfig config_lib.pasm $(MINIPARROT)
-        @cygchkdll@
         @echo Invoking Parrot to generate runtime/parrot/include/config.fpmc --cross your fingers
         $(MINIPARROT) config_lib.pasm > $@