Permalink
Browse files

Merge pull request #17 from hoelzro/master

Make building RPMS and other Linux packages easier
  • Loading branch information...
2 parents 0feb3a0 + b2e6559 commit 173db4634aca5c2077ff09167cc257f365fbe210 @pmichaud pmichaud committed Dec 29, 2012
Showing with 17 additions and 11 deletions.
  1. +4 −2 tools/build/Makefile.in
  2. +13 −9 tools/build/module-install.pl
View
@@ -79,7 +79,7 @@ modules-install: rakudo-install
@echo "== Installing modules"
$(PERL) tools/build/module-install.pl $(DESTDIR)$(PERL6_INSTALL) $(DESTDIR)$(PERL6_LANG_DIR)/lib $(MODULES)
@echo "== Installing binaries"
- $(PERL) tools/build/bin-install.pl $(DESTDIR)$(PERL6_INSTALL) $(DESTDIR)$(PARROT_BIN_DIR) modules/ufo/bin/ufo modules/panda/bin/panda modules/doc/bin/p6doc
+ $(PERL) tools/build/bin-install.pl $(PERL6_INSTALL) $(DESTDIR)$(PARROT_BIN_DIR) modules/ufo/bin/ufo modules/panda/bin/panda modules/doc/bin/p6doc
modules-test:
$(PERL) tools/build/modules-test.pl $(CURDIR) $(DESTDIR)$(PERL6_INSTALL) modules/MODULES.txt
@@ -88,8 +88,10 @@ perl6-debug: $(RD_EXE)
$(RD_EXE): modules-install
$(NQP_EXE) --vmlibs=perl6_group,perl6_ops --target=pir \
+ --dynext=$(DESTDIR)$(PARROT_LIB_DIR)/dynext/ \
+ --module-path=$(DESTDIR)$(PARROT_LIB_DIR)/languages/nqp/lib \
--output=$(RD_PIR) $(RD_DIR)/bin/perl6-debug.nqp
- $(PARROT_EXE) -o $(RD_PBC) $(RD_PIR)
+ $(PARROT_EXE) --dynext $(DESTDIR)$(PARROT_LIB_DIR)/dynext/ -o $(RD_PBC) $(RD_PIR)
$(PBC_TO_EXE) $(RD_PBC)
$(CHMOD) 755 $(RD_EXE)
@@ -69,15 +69,19 @@ sub path_to_module_name {
$_;
}
-print "== Precompiling modules\n";
-chdir 'rakudo';
-foreach my $pm (@pmfiles) {
- my $out = $pm;
- $out =~ s/\.pm6?$/.pir/;
- my @cmd = ($perl6bin, '--target=pir', "--output=$out", $pm);
- print join(' ', @cmd), "\n";
- system(@cmd);
-}
+do {
+ local $ENV{'PERL6LIB'} = $perl6lib;
+
+ print "== Precompiling modules\n";
+ chdir 'rakudo';
+ foreach my $pm (@pmfiles) {
+ my $out = $pm;
+ $out =~ s/\.pm6?$/.pir/;
+ my @cmd = ($perl6bin, '--target=pir', "--output=$out", $pm);
+ print join(' ', @cmd), "\n";
+ system(@cmd);
+ }
+};
# According to "Introduction to Algorithms" by Cormen et al., topological

0 comments on commit 173db46

Please sign in to comment.