Patchwork libgcc: Use TARGET_VENDOR_virtclass-multilib for symlink src calculation

login
register
mail settings
Submitter Alexandru-Cezar Sardan
Date April 9, 2014, 3:01 p.m.
Message ID <1397055663-5541-1-git-send-email-alexandru.sardan@freescale.com>
Download mbox | patch
Permalink /patch/70389/
State New
Headers show

Comments

Alexandru-Cezar Sardan - April 9, 2014, 3:01 p.m.
When defining a symlink for the multilib location based on MULTILIB_VARIANTS,
use TARGET_VENDOR_virtclass-multilib to get the vendor, as hardcoding
the value with TARGET_VENDOR + 'ml' + mlvariant may not corespond with
the actual directory where the libs are installed.

Signed-off-by: Alexandru-Cezar Sardan <alexandru.sardan@freescale.com>
---
 meta/recipes-devtools/gcc/libgcc.inc |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Alexandru-Cezar Sardan - April 30, 2014, 11:44 a.m.
Ping


> -----Original Message-----
> From: Alexandru-Cezar Sardan [mailto:alexandru.sardan@freescale.com]
> Sent: Wednesday, April 09, 2014 6:01 PM
> To: openembedded-core@lists.openembedded.org
> Cc: Saul Wold; Sardan Alexandru Cezar-B41700
> Subject: [PATCH] libgcc: Use TARGET_VENDOR_virtclass-multilib for symlink
> src calculation
> 
> When defining a symlink for the multilib location based on
> MULTILIB_VARIANTS,
> use TARGET_VENDOR_virtclass-multilib to get the vendor, as hardcoding
> the value with TARGET_VENDOR + 'ml' + mlvariant may not corespond with
> the actual directory where the libs are installed.
> 
> Signed-off-by: Alexandru-Cezar Sardan <alexandru.sardan@freescale.com>
> ---
>  meta/recipes-devtools/gcc/libgcc.inc |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/recipes-devtools/gcc/libgcc.inc b/meta/recipes-
> devtools/gcc/libgcc.inc
> index 96f1969..eb7a6e8 100644
> --- a/meta/recipes-devtools/gcc/libgcc.inc
> +++ b/meta/recipes-devtools/gcc/libgcc.inc
> @@ -131,8 +131,8 @@ python do_multilib_install() {
>          if not tune_bitness:
>              tune_bitness = '32' # /lib => 32bit lib
> 
> -        src = '../../../' + tune_baselib + '/' + \
> -            tune_arch + d.getVar('TARGET_VENDOR', True) + 'ml' + ml + \
> +        vendor = d.getVar('TARGET_VENDOR_virtclass-multilib' + '-' + ml,
> True)
> +        src = '../../../' + tune_baselib + '/' + tune_arch + vendor + \
>              '-' + d.getVar('TARGET_OS', True) + '/' + binv + '/'
> 
>          dest = d.getVar('D', True) + d.getVar('libdir', True) + '/' + \
> --
> 1.7.9.5
>

Patch

diff --git a/meta/recipes-devtools/gcc/libgcc.inc b/meta/recipes-devtools/gcc/libgcc.inc
index 96f1969..eb7a6e8 100644
--- a/meta/recipes-devtools/gcc/libgcc.inc
+++ b/meta/recipes-devtools/gcc/libgcc.inc
@@ -131,8 +131,8 @@  python do_multilib_install() {
         if not tune_bitness:
             tune_bitness = '32' # /lib => 32bit lib
 
-        src = '../../../' + tune_baselib + '/' + \
-            tune_arch + d.getVar('TARGET_VENDOR', True) + 'ml' + ml + \
+        vendor = d.getVar('TARGET_VENDOR_virtclass-multilib' + '-' + ml, True)
+        src = '../../../' + tune_baselib + '/' + tune_arch + vendor + \
             '-' + d.getVar('TARGET_OS', True) + '/' + binv + '/'
 
         dest = d.getVar('D', True) + d.getVar('libdir', True) + '/' + \