Patchwork [1/4] multilib.bbclass: allow TARGET_VENDOR_virtclass-multilib to be overriden

login
register
mail settings
Submitter Matthew McClintock
Date Feb. 27, 2012, 7:38 p.m.
Message ID <1330371531-28803-1-git-send-email-msm@freescale.com>
Download mbox | patch
Permalink /patch/22189/
State Accepted
Commit 01fd9be5db633d881c789c5b119f794a3f1000da
Headers show

Comments

Matthew McClintock - Feb. 27, 2012, 7:38 p.m.
If we set this bit, we can override the ugly "pokymllib32" to back to
"poky" (powerpc-pokymllib32-linux-gcc -> powerpc-poky-linux-gcc). I've
left this unset by default, but can be set by adding the following:

TARGET_VENDOR_virtclass-multilib-lib32 = "-poky"

Signed-off-by: Matthew McClintock <msm@freescale.com>
---
 meta/classes/multilib.bbclass |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
McClintock Matthew-B29882 - Feb. 27, 2012, 10:55 p.m.
Per conversation with Saul on IRC - I'll push a branch to poky-contrib
for my 6 pending patches.

-M

On Mon, Feb 27, 2012 at 1:38 PM, Matthew McClintock <msm@freescale.com> wrote:
> If we set this bit, we can override the ugly "pokymllib32" to back to
> "poky" (powerpc-pokymllib32-linux-gcc -> powerpc-poky-linux-gcc). I've
> left this unset by default, but can be set by adding the following:
>
> TARGET_VENDOR_virtclass-multilib-lib32 = "-poky"
>
> Signed-off-by: Matthew McClintock <msm@freescale.com>
> ---
>  meta/classes/multilib.bbclass |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass
> index 87d0cd4..61b7765 100644
> --- a/meta/classes/multilib.bbclass
> +++ b/meta/classes/multilib.bbclass
> @@ -26,7 +26,8 @@ python multilib_virtclass_handler () {
>     e.data.setVar("MLPREFIX", variant + "-")
>     e.data.setVar("PN", variant + "-" + e.data.getVar("PN", False))
>     e.data.setVar("SHLIBSDIR_virtclass-multilib-" + variant ,e.data.getVar("SHLIBSDIR", False) + "/" + variant)
> -    e.data.setVar("TARGET_VENDOR_virtclass-multilib-" + variant, e.data.getVar("TARGET_VENDOR", False) + "ml" + variant)
> +    if e.data.getVar("TARGET_VENDOR_virtclass-multilib-" + variant, False) is None:
> +           e.data.setVar("TARGET_VENDOR_virtclass-multilib-" + variant, e.data.getVar("TARGET_VENDOR", False) + "ml" + variant)
>     e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + override)
>  }
>
> --
> 1.7.6.1
>
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Saul Wold - Feb. 28, 2012, 6:45 p.m.
On 02/27/2012 11:38 AM, Matthew McClintock wrote:
> If we set this bit, we can override the ugly "pokymllib32" to back to
> "poky" (powerpc-pokymllib32-linux-gcc ->  powerpc-poky-linux-gcc). I've
> left this unset by default, but can be set by adding the following:
>
> TARGET_VENDOR_virtclass-multilib-lib32 = "-poky"
>
> Signed-off-by: Matthew McClintock<msm@freescale.com>
> ---
>   meta/classes/multilib.bbclass |    3 ++-
>   1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass
> index 87d0cd4..61b7765 100644
> --- a/meta/classes/multilib.bbclass
> +++ b/meta/classes/multilib.bbclass
> @@ -26,7 +26,8 @@ python multilib_virtclass_handler () {
>       e.data.setVar("MLPREFIX", variant + "-")
>       e.data.setVar("PN", variant + "-" + e.data.getVar("PN", False))
>       e.data.setVar("SHLIBSDIR_virtclass-multilib-" + variant ,e.data.getVar("SHLIBSDIR", False) + "/" + variant)
> -    e.data.setVar("TARGET_VENDOR_virtclass-multilib-" + variant, e.data.getVar("TARGET_VENDOR", False) + "ml" + variant)
> +    if e.data.getVar("TARGET_VENDOR_virtclass-multilib-" + variant, False) is None:
> +	    e.data.setVar("TARGET_VENDOR_virtclass-multilib-" + variant, e.data.getVar("TARGET_VENDOR", False) + "ml" + variant)
>       e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + override)
>   }
>

Patches 1, 2, and 4 from this series where pulled into OE-core

Thanks	
	Sau!

Patch

diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass
index 87d0cd4..61b7765 100644
--- a/meta/classes/multilib.bbclass
+++ b/meta/classes/multilib.bbclass
@@ -26,7 +26,8 @@  python multilib_virtclass_handler () {
     e.data.setVar("MLPREFIX", variant + "-")
     e.data.setVar("PN", variant + "-" + e.data.getVar("PN", False))
     e.data.setVar("SHLIBSDIR_virtclass-multilib-" + variant ,e.data.getVar("SHLIBSDIR", False) + "/" + variant)
-    e.data.setVar("TARGET_VENDOR_virtclass-multilib-" + variant, e.data.getVar("TARGET_VENDOR", False) + "ml" + variant)
+    if e.data.getVar("TARGET_VENDOR_virtclass-multilib-" + variant, False) is None:
+	    e.data.setVar("TARGET_VENDOR_virtclass-multilib-" + variant, e.data.getVar("TARGET_VENDOR", False) + "ml" + variant)
     e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + override)
 }