Ticket #476: parrot-1.0.0-norpath.diff
File parrot-1.0.0-norpath.diff, 3.7 KB (added by JSchmitt, 13 years ago) |
---|
-
config/gen/makefiles/json.in
old new 9 9 PGE_DIR := ../../compilers/pge 10 10 TGE_DIR := ../../compilers/tge 11 11 12 export LD_LIBRARY_PATH := ../../blib/lib 13 12 14 # the default target 13 15 all: JSON.pbc 14 16 -
config/gen/makefiles/nqp.in
old new 9 9 PARROT_LIBRARY := @build_dir@/runtime/parrot/library 10 10 PGE_LIBRARY := @build_dir@/runtime/parrot/library/PGE 11 11 12 export LD_LIBRARY_PATH := ../../blib/lib 13 12 14 all: nqp.pbc 13 15 14 16 SOURCES := \ -
config/gen/makefiles/pct.in
old new 11 11 PGE_DIR := ../../compilers/pge 12 12 TEST_DIR := ../../t/compilers/pct 13 13 14 export LD_LIBRARY_PATH := ../../blib/lib 15 14 16 # Where to put things 15 17 PARROT_LIBRARY := ../../runtime/parrot/library 16 18 -
config/gen/makefiles/pge.in
old new 9 9 10 10 TOOL_DIR := ../.. 11 11 12 export LD_LIBRARY_PATH := ../../blib/lib 13 12 14 # Where to put things 13 15 PARROT_LIBRARY := ../../runtime/parrot/library 14 16 -
config/gen/makefiles/root.in
old new 534 534 .pbc$(O) : # suffix rule (limited support) 535 535 $(PARROT) -o $@ $< 536 536 537 # This sets up proper internal dynamic linking in case we don't set an rpath 538 export LD_LIBRARY_PATH = $(CUR_DIR)/blib/lib 537 539 538 540 ############################################################################### 539 541 # … … 750 752 751 753 runtime/parrot/include/config.fpmc : myconfig config_lib.pasm $(MINIPARROT) 752 754 @echo Invoking Parrot to generate runtime/parrot/include/config.fpmc --cross your fingers 753 $(MINIPARROT) config_lib.pasm > $@755 LD_LIBRARY_PATH=$(CUR_DIR)/blib/lib $(MINIPARROT) config_lib.pasm > $@ 754 756 755 757 $(PARROT) : $(SRC_DIR)/main$(O) $(GEN_HEADERS) $(LIBPARROT) CFLAGS \ 756 758 lib/Parrot/OpLib/core.pm $(SRC_DIR)/parrot_config$(O) \ -
config/gen/makefiles/tge.in
old new 6 6 RM_F := @rm_f@ 7 7 PARROT := ../../parrot@exe@ 8 8 9 export LD_LIBRARY_PATH := ../../blib/lib 10 9 11 # Where to put things 10 12 PARROT_LIBRARY := ../../runtime/parrot/library 11 13 PERL6GRAMMAR := $(PARROT_LIBRARY)/PGE/Perl6Grammar.pbc -
config/inter/libparrot.pm
old new 34 34 sub runstep { 35 35 my ( $self, $conf ) = @_; 36 36 my $parrot_is_shared = $conf->options->get('parrot_is_shared'); 37 my $site_install = $conf->options->get('disable-rpath'); 37 38 38 39 $parrot_is_shared = integrate( 39 40 $conf->data->get('parrot_is_shared'), … … 98 99 # Set -rpath (or equivalent) for executables to find the 99 100 # shared libparrot in the build directory. 100 101 $conf->data->set( 101 rpath_blib => ( $parrot_is_shared && $conf->data->get('rpath') ) 102 rpath_blib => ( $parrot_is_shared && $conf->data->get('rpath') 103 && !$site_install ) 102 104 ? $conf->data->get('rpath') 103 105 . $conf->data->get('build_dir') 104 106 . $conf->data->get('slash') … … 109 111 # Set -rpath (or equivalent) for the installed executables to find the 110 112 # installed shared libparrot. 111 113 $conf->data->set( 112 rpath_lib => ( $parrot_is_shared && $conf->data->get('rpath') ) 114 rpath_lib => ( $parrot_is_shared && $conf->data->get('rpath') 115 && !$site_install ) 113 116 ? $conf->data->get('rpath') 114 117 . $conf->data->get('libdir') 115 118 : '' -
lib/Parrot/Configure/Options/Conf/Shared.pm
old new 62 62 sbindir 63 63 sharedstatedir 64 64 silent 65 disable-rpath 65 66 sysconfdir 66 67 test 67 68 verbose