[OE-core] [CONSOLIDATED PULL 26/32] procps: Fix lib path to support multilib

[Richard Purdie]

On Thu, 2011-08-18 at 13:55 -0700, Saul Wold wrote:
> From: Dongxiao Xu <dongxiao.xu at intel.com>
> 
> Remove the install.patch which hardcode the lib paths.
> Change ${PN} to ${BPN} in file names.
> 
> Signed-off-by: Dongxiao Xu <dongxiao.xu at intel.com>
> ---
>  .../procps/procps-3.2.8/install.patch              |   29 --------------------
>  meta/recipes-extended/procps/procps.inc            |    3 +-
>  meta/recipes-extended/procps/procps_3.2.8.bb       |    8 +++---
>  3 files changed, 5 insertions(+), 35 deletions(-)
>  delete mode 100644 meta/recipes-extended/procps/procps-3.2.8/install.patch
> 
> diff --git a/meta/recipes-extended/procps/procps-3.2.8/install.patch b/meta/recipes-extended/procps/procps-3.2.8/install.patch
> deleted file mode 100644
> index b52a2c9..0000000
> --- a/meta/recipes-extended/procps/procps-3.2.8/install.patch
> +++ /dev/null
> @@ -1,29 +0,0 @@
> -Upstream-Status: Inappropriate [configuration]
> -
> ---- procps-3.2.5.virgin/Makefile	2005-01-26 05:55:26.000000000 +0100
> -+++ procps-3.2.5/Makefile	2005-08-03 04:55:26.346984488 +0200
> -@@ -30,7 +30,10 @@
> - install  := install -D --owner 0 --group 0
> - 
> - # Lame x86-64 /lib64 and /usr/lib64 abomination:
> --lib64    := lib$(shell [ -d /lib64 ] && echo 64)
> -+# lib64    := lib$(shell [ -d /lib64 ] && echo 64)
> -+
> -+# Equally lame hack to work around makefile lameness when the host arch is 64bit, but the target is not.
> -+lib64      := lib

Both these cases are plain wrong. We can't simply drop this patch since
we may be building 64 bit on a 32 bit system and /lib64 may not exist.
Dropping the patch will therefore fix some cases and break others (e.g.
what a about x32?).

We likely need to heavier patch the Makefile.

Cheers,

Richard