Patchwork [32/33] perl: fix Configure-multilib.patch

login
register
mail settings
Submitter Saul Wold
Date May 3, 2011, 11:45 p.m.
Message ID <e573adeeb0272294c005c4ae5c03346dd9c938d3.1304465724.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/3171/
State New, archived
Headers show

Comments

Saul Wold - May 3, 2011, 11:45 p.m.
From: Saul Wold <sgw@linux.intel.com>

Thanks to Gary Thomas for his input on fixing this for Ubuntu 11.04

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../perl/perl-5.12.3/Configure-multilib.patch      |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Khem Raj - May 4, 2011, 1:28 a.m.
On May 3, 2011, at 4:45 PM, Saul Wold <sgw@linux.intel.com> wrote:

> From: Saul Wold <sgw@linux.intel.com>
> 
> Thanks to Gary Thomas for his input on fixing this for Ubuntu 11.04

Looks good 


> 
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
> .../perl/perl-5.12.3/Configure-multilib.patch      |    2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/meta/recipes-devtools/perl/perl-5.12.3/Configure-multilib.patch b/meta/recipes-devtools/perl/perl-5.12.3/Configure-multilib.patch
> index ef2be3d..9625b0b 100644
> --- a/meta/recipes-devtools/perl/perl-5.12.3/Configure-multilib.patch
> +++ b/meta/recipes-devtools/perl/perl-5.12.3/Configure-multilib.patch
> @@ -11,7 +11,7 @@ Index: perl-5.12.3/Configure
> -glibpth="/lib /usr/lib $xlibpth"
> +glibpth="/lib /usr/lib /lib64 /usr/lib64 $xlibpth"
>  glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib"
> -+test -f /usr/lib/`uname -m`-linux-gnu/libc.so && glibpth="/usr/lib/`uname -m`-linux-gnu $glibpth"
> ++test -f /usr/lib/*-linux-gnu/libc.so && glibpth="/usr/lib/*-linux-gnu $glibpth"
>  test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth"
>  test -f /shlib/libc.so     && glibpth="/shlib $glibpth"
>  test -d /usr/lib64         && glibpth="$glibpth /lib64 /usr/lib64 /usr/local/lib64"
> -- 
> 1.7.4.1
>

Patch

diff --git a/meta/recipes-devtools/perl/perl-5.12.3/Configure-multilib.patch b/meta/recipes-devtools/perl/perl-5.12.3/Configure-multilib.patch
index ef2be3d..9625b0b 100644
--- a/meta/recipes-devtools/perl/perl-5.12.3/Configure-multilib.patch
+++ b/meta/recipes-devtools/perl/perl-5.12.3/Configure-multilib.patch
@@ -11,7 +11,7 @@  Index: perl-5.12.3/Configure
 -glibpth="/lib /usr/lib $xlibpth"
 +glibpth="/lib /usr/lib /lib64 /usr/lib64 $xlibpth"
  glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib"
-+test -f /usr/lib/`uname -m`-linux-gnu/libc.so && glibpth="/usr/lib/`uname -m`-linux-gnu $glibpth"
++test -f /usr/lib/*-linux-gnu/libc.so && glibpth="/usr/lib/*-linux-gnu $glibpth"
  test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth"
  test -f /shlib/libc.so     && glibpth="/shlib $glibpth"
  test -d /usr/lib64         && glibpth="$glibpth /lib64 /usr/lib64 /usr/local/lib64"