Ticket #698: tt698-simplify-2.patch

File tt698-simplify-2.patch, 8.3 KB (added by doughera, 6 years ago)
  • config/gen/makefiles/parrot_embed_pl.in

    diff -r -u parrot-current/config/gen/makefiles/parrot_embed_pl.in parrot-andy/config/gen/makefiles/parrot_embed_pl.in
    old new  
    1919$config{PARROT}          = '..@slash@..@slash@parrot@exe@'; 
    2020$config{C_LIBS}          = '@libs@'; 
    2121$config{INCLUDE}         = "$config{PARROTDIR}/include"; 
    22 #UNLESS(win32):$config{ALL_PARROT_LIBS} = "@libparrot_ldflags@ $config{C_LIBS} @linkflags@"; 
     22#UNLESS(win32):$config{ALL_PARROT_LIBS} = "@libparrot_linkflags@ $config{C_LIBS} @linkflags@"; 
    2323$config{ABS_PARROTDIR}   = Cwd::realpath( 
    2424                               File::Spec->rel2abs( $config{PARROTDIR} ) ); 
    2525$config{LDDLFLAGS}       = $Config{lddlflags}; 
     
    3636    'PREREQ_PM'    => { 'ExtUtils::CBuilder' => 0 }, 
    3737#IF(win32):    'LIBS'         => [ $config{C_LIBS} ], 
    3838#ELSE:    'LIBS'         => [ $config{ALL_PARROT_LIBS} ], 
    39 #IF(win32):    'OBJECT'       => q|@libparrot_ldflags@ Embed@o@|, 
     39#IF(win32):    'OBJECT'       => q|@libparrot_linkflags@ Embed@o@|, 
    4040    'INC'          => "-I$config{INCLUDE}", 
    4141    'PM'           => { map { $_ => "blib/$_" } <lib/Parrot/*pm> }, 
    4242    'clean'        => { FILES => '*.xs t/greet.pbc' }, 
  • config/gen/makefiles/pirc.in

    diff -r -u parrot-current/config/gen/makefiles/pirc.in parrot-andy/config/gen/makefiles/pirc.in
    old new  
    6868pirc$(EXE): $(OBJS) 
    6969        $(LINK) @ld_out@$@ \ 
    7070            $(OBJS) \ 
    71             @rpath_blib@ @libparrot_ldflags@ $(C_LIBS) $(LINKFLAGS) $(LINK_DYNAMIC) 
     71            @rpath_blib@ @libparrot_linkflags@ $(C_LIBS) $(LINKFLAGS) $(LINK_DYNAMIC) 
    7272 
    7373src/pirparser$(O): src/pirparser.c src/pirparser.h 
    7474src/pirlexer$(O): src/pirlexer.c src/pirlexer.h 
  • config/gen/makefiles/root.in

    diff -r -u parrot-current/config/gen/makefiles/root.in parrot-andy/config/gen/makefiles/root.in
    old new  
    510510LIBPARROT           := @libparrot@ 
    511511 
    512512#IF(has_icu):ICU_SHARED  := @icu_shared@ 
    513 ALL_PARROT_LIBS     := @libparrot_ldflags@ $(ICU_SHARED) $(C_LIBS) 
     513ALL_PARROT_LIBS     := @libparrot_linkflags@ $(ICU_SHARED) $(C_LIBS) 
    514514 
    515515# dynamic extensions 
    516516DYNEXT_DIR          := runtime/parrot/dynext 
  • config/init/hints/cygwin.pm

    diff -r -u parrot-current/config/init/hints/cygwin.pm parrot-andy/config/init/hints/cygwin.pm
    old new  
    5252        blib_dir            => '.', 
    5353        libparrot_ldflags   => '-L' . $build_dir . ' -lparrot', 
    5454        inst_libparrot_ldflags => '-L' . $bindir . ' -lparrot', 
     55        libparrot_linkflags   => '-L' . $build_dir . ' -lparrot', 
     56        inst_libparrot_linkflags => '-L' . $bindir . ' -lparrot', 
    5557    ); 
    5658 
    5759    # inet_aton needs to be defined on Cygwin. 
  • config/init/hints/mswin32.pm

    diff -r -u parrot-current/config/init/hints/mswin32.pm parrot-andy/config/init/hints/mswin32.pm
    old new  
    109109 
    110110        # If we are building shared, need to include dynamic libparrot.lib, otherwise 
    111111        # the static libparrot.lib. 
     112        # Unclear if it's needed both for ld and link. 
    112113        $conf->data->set( libparrot_ldflags   => "\"$build_dir\\libparrot.lib\"" ); 
     114        $conf->data->set( libparrot_linkflags   => "\"$build_dir\\libparrot.lib\"" ); 
    113115 
    114116        # 'link' needs to be link.exe, not cl.exe. 
    115117        # This makes 'link' and 'ld' the same. 
     
    247249            ld_share_flags      => '-shared ', 
    248250            libparrot_ldflags   => "\"$build_dir\\libparrot.dll\"", 
    249251            inst_libparrot_ldflags => "\"$bindir\\libparrot.dll\"", 
     252            libparrot_linkflags   => "\"$build_dir\\libparrot.dll\"", 
     253            inst_libparrot_linkflags => "\"$bindir\\libparrot.dll\"", 
    250254            ncilib_link_extra   => 'src/libnci_test.def', 
    251255            sym_export          => '__declspec(dllexport)', 
    252256            sym_import          => '__declspec(dllimport)', 
  • config/inter/libparrot.pm

    diff -r -u parrot-current/config/inter/libparrot.pm parrot-andy/config/inter/libparrot.pm
    old new  
    118118        : '' 
    119119    ); 
    120120 
     121    # When building shared libraries and dynamically loadable 
     122    # modules with 'ld', do we need to include -lparrot?  If so 
     123    # this variable contains the necessary flags.  (This is normally 
     124    # empty, but may be overridden by various hints files for 
     125    # specific platforms.) 
     126 
     127    # This version works in the build directory. 
    121128    unless ( defined( $conf->data->get('libparrot_ldflags') ) ) { 
    122         $conf->data->set(libparrot_ldflags => 
     129        $conf->data->set(libparrot_ldflags => ''); 
     130    } 
     131 
     132    # This version refers to the installed library. 
     133    unless ( defined( $conf->data->get('inst_libparrot_ldflags') ) ) { 
     134        $conf->data->set(inst_libparrot_ldflags => ''); 
     135    } 
     136 
     137    # When linking an executable to -lparrot, this variable 
     138    # contains the necessary flags to find and use -lparrot. 
     139 
     140    # This version uses the -lparrot in the build directory. 
     141    unless ( defined( $conf->data->get('libparrot_linkflags') ) ) { 
     142        $conf->data->set(libparrot_linkflags => 
    123143        '-L' 
    124144        . $conf->data->get('build_dir') 
    125145        . $conf->data->get('slash') 
     
    128148        ); 
    129149    } 
    130150 
    131     unless ( defined( $conf->data->get('inst_libparrot_ldflags') ) ) { 
    132         $conf->data->set(inst_libparrot_ldflags => 
     151    # This version uses the installed -lparrot. 
     152    unless ( defined( $conf->data->get('inst_libparrot_linkflags') ) ) { 
     153        $conf->data->set(inst_libparrot_linkflags => 
    133154        '-L' 
    134155        . $conf->data->get('libdir') 
    135156        . ' -lparrot' 
  • lib/Parrot/Test.pm

    diff -r -u parrot-current/lib/Parrot/Test.pm parrot-andy/lib/Parrot/Test.pm
    old new  
    966966                          ? "" 
    967967                          : "-L$PConfig{blib_dir} ")) 
    968968                        . ($^O =~ m/MSWin32/ 
    969                           ? $PConfig{libparrot_ldflags} 
     969                          ? $PConfig{libparrot_linkflags} 
    970970                          : "-lparrot") 
    971971                      : File::Spec->join( 
    972972                          @PConfig{qw/build_dir blib_dir libparrot_static/}, 
  • tools/dev/mk_language_shell.pl

    diff -r -u parrot-current/tools/dev/mk_language_shell.pl parrot-andy/tools/dev/mk_language_shell.pl
    old new  
    318318CFLAGS        := @ccflags@ @cc_shared@ @cc_debug@ @ccwarn@ @cc_hasjit@ @cg_flag@ @gc_flag@ 
    319319CC_OUT        := @cc_o_out@ 
    320320LD_OUT        := @ld_out@ 
    321 #IF(parrot_is_shared):LIBPARROT     := @inst_libparrot_ldflags@ 
    322 #ELSE:LIBPARROT     := 
     321LIBPARROT     := @inst_libparrot_ldflags@ 
    323322 
    324323OPS2C           := $(PERL) $(LIB_DIR)/tools/build/ops2c.pl 
    325324 
     
    411410CFLAGS        := @ccflags@ @cc_shared@ @cc_debug@ @ccwarn@ @cc_hasjit@ @cg_flag@ @gc_flag@ 
    412411CC_OUT        := @cc_o_out@ 
    413412LD_OUT        := @ld_out@ 
    414 #IF(parrot_is_shared):LIBPARROT     := @inst_libparrot_ldflags@ 
    415 #ELSE:LIBPARROT     := 
     413LIBPARROT     := @inst_libparrot_ldflags@ 
    416414 
    417415PMC2C_INCLUDES  := --include $(SRC_DIR) --include $(SRC_DIR)/pmc 
    418416PMC2C           := $(PERL) $(LIB_DIR)/tools/build/pmc2c.pl 
  • tools/dev/pbc_to_exe.pir

    diff -r -u parrot-current/tools/dev/pbc_to_exe.pir parrot-andy/tools/dev/pbc_to_exe.pir
    old new  
    284284    link_dynamic = $P0['link_dynamic'] 
    285285    linkflags    = $P0['linkflags'] 
    286286    ld_out       = $P0['ld_out'] 
    287     libparrot    = $P0['libparrot_ldflags'] 
     287    libparrot    = $P0['libparrot_linkflags'] 
    288288    libs         = $P0['libs'] 
    289289    o            = $P0['o'] 
    290290    rpath        = $P0['rpath_blib']