summaryrefslogtreecommitdiff
path: root/package/perl/patches
diff options
context:
space:
mode:
Diffstat (limited to 'package/perl/patches')
-rw-r--r--package/perl/patches/patch-Makefile_SH15
1 files changed, 12 insertions, 3 deletions
diff --git a/package/perl/patches/patch-Makefile_SH b/package/perl/patches/patch-Makefile_SH
index cb947405f..9784baab2 100644
--- a/package/perl/patches/patch-Makefile_SH
+++ b/package/perl/patches/patch-Makefile_SH
@@ -1,5 +1,14 @@
--- perl-5.18.1.orig/Makefile.SH 2013-08-12 04:44:47.000000000 +0200
-+++ perl-5.18.1/Makefile.SH 2013-12-31 14:09:47.000000000 +0100
++++ perl-5.18.1/Makefile.SH 2014-02-18 16:20:59.000000000 +0100
+@@ -319,7 +319,7 @@ MINIPERL = \$(LDLIBPTH) \$(RUN) ./minipe
+
+ # Macros to invoke a copy of our fully operational perl during the build.
+ PERL_EXE = perl\$(EXE_EXT)
+-RUN_PERL = \$(LDLIBPTH) \$(RUN) ./perl\$(EXE_EXT)
++RUN_PERL = \$(LDLIBPTH) \$(RUN) @@STAGING_HOST_DIR@@/perl-host\$(EXE_EXT)
+
+ # Macros to run our tests
+ RUN_TESTS = \$(LDLIBPTH) ./runtests
@@ -665,9 +665,10 @@ bitcount.h: generate_uudmap$(HOST_EXE_EX
$(RUN) ./generate_uudmap$(HOST_EXE_EXT) $(generated_headers)
@@ -8,7 +17,7 @@
generate_uudmap$(HOST_EXE_EXT): generate_uudmap$(OBJ_EXT)
- $(CC) -o generate_uudmap$(EXE_EXT) $(LDFLAGS) generate_uudmap$(OBJ_EXT) $(libs)
-+ $(CC_FOR_BUILD) -o generate_uudmap$(EXE_EXT) generate_uudmap$(OBJ_EXT) $(libs)
++ $(CC_FOR_BUILD) -o generate_uudmap$(EXE_EXT) generate_uudmap$(OBJ_EXT)
miniperlmain$(OBJ_EXT): miniperlmain.c patchlevel.h
$(CCCMD) $(PLDLFLAGS) $*.c
@@ -25,7 +34,7 @@
# them, which picks up Devel::PPPort's documentation.
pod/perltoc.pod: $(perltoc_pod_prereqs) $(PERL_EXE) $(ext) pod/buildtoc
- $(RUN_PERL) -f -Ilib pod/buildtoc -q
-+ #$(RUN_PERL) -f -Ilib pod/buildtoc -q
++ $(RUN_PERL) -f @@LIB@@ pod/buildtoc -q
pod/perlapi.pod: pod/perlintern.pod