Ticket #797: libparrot.interim.patch

File libparrot.interim.patch, 2.4 KB (added by jkeenan, 5 years ago)

patch so far for Linux only

  • config/inter/libparrot.pm

     
    9191    $conf->data->set( 
    9292        parrot_is_shared => $parrot_is_shared, 
    9393 
    94         libparrot => $parrot_is_shared 
    95         ? '$(LIBPARROT_SHARED)' 
    96         : '$(LIBPARROT_STATIC)', 
     94        libparrot_for_makefile_only => $parrot_is_shared 
     95            ? '$(LIBPARROT_SHARED)' 
     96            : '$(LIBPARROT_STATIC)', 
    9797    ); 
    9898 
    9999    # Set -rpath (or equivalent) for executables to find the 
  • config/init/hints/linux.pm

     
    1313    my $ccflags   = $conf->option_or_data('ccflags'); 
    1414    my $cc        = $conf->option_or_data('cc'); 
    1515    my $linkflags = $conf->option_or_data('linkflags'); 
     16    my $share_ext = $conf->option_or_data('share_ext'); 
     17    my $version   = $conf->option_or_data('VERSION'); 
    1618    my $verbose; 
    1719 
    1820    $verbose = $conf->options->get('verbose'); 
     
    142144 
    143145        has_dynamic_linking    => 1, 
    144146        parrot_is_shared       => 1, 
    145         libparrot_shared       => 'libparrot$(SHARE_EXT).$(SOVERSION)', 
    146         libparrot_shared_alias => 'libparrot$(SHARE_EXT)', 
    147         libparrot_soname       => '-Wl,-soname=libparrot$(SHARE_EXT).$(SOVERSION)', 
     147        libparrot_shared       => "libparrot$share_ext.$version", 
     148        libparrot_shared_alias => "libparrot$share_ext", 
     149        libparrot_soname       => "-Wl,-soname=libparrot$share_ext.$version", 
    148150    ); 
    149151 
    150152     if ( ( split( m/-/, $conf->data->get_p5('archname'), 2 ) )[0] eq 'ia64' ) { 
  • config/gen/makefiles/root.in

     
    509509#ELSE:LIBPARROT_SHARED  := @blib_dir@/@libparrot_shared@ 
    510510 
    511511# This line controls whether a static or shared library is built 
    512 LIBPARROT           := @libparrot@ 
     512# by Parrot's make.  It is not useful otherwise (e.g., in 
     513# lib/Parrot/Config/Generated.pm or config_lib.pasm). 
     514LIBPARROT           := @libparrot_for_makefile_only@ 
    513515 
    514516#IF(has_icu):ICU_SHARED  := @icu_shared@ 
    515517ALL_PARROT_LIBS     := @libparrot_linkflags@ $(ICU_SHARED) $(C_LIBS)