blob: e023038f048e95d279844d41fcc99862337d0a75 [file] [log] [blame]
Patrick Williamsc124f4f2015-09-15 14:41:29 -05001From 431275078b0490d2e092442d9582be06bb95b354 Mon Sep 17 00:00:00 2001
2From: Niko Tyni <ntyni@debian.org>
3Date: Sat, 10 May 2014 23:34:14 +0300
4Subject: EU:MM: set location of libperl.a under /usr/lib
5
6The Debian packaging moves libperl.a a couple of levels up from the
7CORE directory to match other static libraries.
8
9Patch-Name: debian/extutils_set_libperl_path.diff
Brad Bishopd7bf8c12018-02-25 22:55:05 -050010Upstream-Status: Pending
Patrick Williamsc124f4f2015-09-15 14:41:29 -050011---
12 cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | 2 +-
13 pp.c | 2 +-
14 2 files changed, 2 insertions(+), 2 deletions(-)
15
16diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
17index 5f1b87f..570a631 100644
18--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
19+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
20@@ -2505,7 +2505,7 @@ MAP_PRELIBS = $Config{perllibs} $Config{cryptlib}
21 ($lperl = $libperl) =~ s/\$\(A\)/$self->{LIB_EXT}/;
22 }
23 unless ($libperl && -f $lperl) { # Ilya's code...
24- my $dir = $self->{PERL_SRC} || "$self->{PERL_ARCHLIB}/CORE";
25+ my $dir = $self->{PERL_SRC} || "$self->{PERL_ARCHLIB}/../..";
26 $dir = "$self->{PERL_ARCHLIB}/.." if $self->{UNINSTALLED_PERL};
27 $libperl ||= "libperl$self->{LIB_EXT}";
28 $libperl = "$dir/$libperl";
29diff --git a/pp.c b/pp.c
30index 42f156a..77c1279 100644
31--- a/pp.c
32+++ b/pp.c
33@@ -1,4 +1,4 @@
34-/* pp.c
35+ /* pp.c
36 *
37 * Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
38 * 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 by Larry Wall and others