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