[master][dizzy][PATCH] xkeyboard-config: Inherit gettext

[master][dizzy][PATCH] xkeyboard-config: Inherit gettext

[Andrei Gherzan]

In a GPLv3-free build we have two different versions of gettext in sysroot due
to GPLv3 restrictions. In this case we need gettext-native too so we can have
the needed macros and avoid errors like:
"error: possibly undefined macro: AM_GNU_GETTEXT"

The needed dependency is added by gettext class which is prefered because it
takes care of NLS flags too.

Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
---
 meta/recipes-graphics/xorg-lib/xkeyboard-config_2.12.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.12.bb b/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.12.bb
index 61e3847..adac0ee 100644
--- a/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.12.bb
+++ b/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.12.bb
@@ -23,7 +23,7 @@ EXTRA_OECONF = "--with-xkb-rules-symlink=xorg --disable-runtime-deps"
 
 FILES_${PN} += "${datadir}/X11/xkb"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig gettext
 
 do_install_append () {
     install -d ${D}${datadir}/X11/xkb/compiled
-- 
1.9.3

Re: [master][dizzy][PATCH] xkeyboard-config: Inherit gettext

[Andrei Gherzan]

[-- Attachment #1: Type: text/plain, Size: 1301 bytes --]

Ping?

On Fri, Nov 7, 2014 at 5:23 PM, Andrei Gherzan <andrei@gherzan.ro> wrote:

> In a GPLv3-free build we have two different versions of gettext in sysroot
> due
> to GPLv3 restrictions. In this case we need gettext-native too so we can
> have
> the needed macros and avoid errors like:
> "error: possibly undefined macro: AM_GNU_GETTEXT"
>
> The needed dependency is added by gettext class which is prefered because
> it
> takes care of NLS flags too.
>
> Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
> ---
>  meta/recipes-graphics/xorg-lib/xkeyboard-config_2.12.bb | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.12.bb
> b/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.12.bb
> index 61e3847..adac0ee 100644
> --- a/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.12.bb
> +++ b/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.12.bb
> @@ -23,7 +23,7 @@ EXTRA_OECONF = "--with-xkb-rules-symlink=xorg
> --disable-runtime-deps"
>
>  FILES_${PN} += "${datadir}/X11/xkb"
>
> -inherit autotools pkgconfig
> +inherit autotools pkgconfig gettext
>
>  do_install_append () {
>      install -d ${D}${datadir}/X11/xkb/compiled
> --
> 1.9.3
>
>


-- 
*Andrei Gherzan*

[-- Attachment #2: Type: text/html, Size: 2368 bytes --]

Re: [master][dizzy][PATCH] xkeyboard-config: Inherit gettext

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 200 bytes --]

On 12 November 2014 10:28, Andrei Gherzan <andrei@gherzan.ro> wrote:

> Ping?
>

Managed to totally miss this due to the dizzy tag, sorry for that.  Thanks
for the ping, merged to mut.

Ross

[-- Attachment #2: Type: text/html, Size: 595 bytes --]

Re: [master][dizzy][PATCH] xkeyboard-config: Inherit gettext

[akuster808]

On 11/12/2014 08:01 AM, Burton, Ross wrote:
>
> On 12 November 2014 10:28, Andrei Gherzan <andrei@gherzan.ro
> <mailto:andrei@gherzan.ro>> wrote:
>
>     Ping?
>
>
> Managed to totally miss this due to the dizzy tag, sorry for that.
> Thanks for the ping, merged to mut.

What part did you take care of? Master or Dizzy?

Armin

>
> Ross
>
>

Re: [master][dizzy][PATCH] xkeyboard-config: Inherit gettext

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 277 bytes --]

On 12 November 2014 16:21, akuster808 <akuster808@gmail.com> wrote:

> Thanks for the ping, merged to mut.
>>
>
> What part did you take care of? Master or Dizzy?
>

MUT feeds into master when Richard merges it.  You can backport from master
when it's there.

Ross

[-- Attachment #2: Type: text/html, Size: 755 bytes --]

Re: [master][dizzy][PATCH] xkeyboard-config: Inherit gettext

[Andrei Gherzan]

[-- Attachment #1: Type: text/plain, Size: 417 bytes --]

On Nov 12, 2014 5:40 PM, "Burton, Ross" <ross.burton@intel.com> wrote:
>
>
> On 12 November 2014 16:21, akuster808 <akuster808@gmail.com> wrote:
>>>
>>> Thanks for the ping, merged to mut.
>>

No problem. Hope to have it soon in dizzy

>>
>> What part did you take care of? Master or Dizzy?
>
>
> MUT feeds into master when Richard merges it.  You can backport from
master when it's there.
>
> Ross

[-- Attachment #2: Type: text/html, Size: 686 bytes --]

Re: [master][dizzy][PATCH] xkeyboard-config: Inherit gettext

[akuster808]

thanks,

staging for dizzy merge.

- armin
On 11/12/2014 04:18 PM, Andrei Gherzan wrote:
> On Nov 12, 2014 5:40 PM, "Burton, Ross" <ross.burton@intel.com
> <mailto:ross.burton@intel.com>> wrote:
>  >
>  >
>  > On 12 November 2014 16:21, akuster808 <akuster808@gmail.com
> <mailto:akuster808@gmail.com>> wrote:
>  >>>
>  >>> Thanks for the ping, merged to mut.
>  >>
>
> No problem. Hope to have it soon in dizzy
>
>  >>
>  >> What part did you take care of? Master or Dizzy?
>  >
>  >
>  > MUT feeds into master when Richard merges it.  You can backport from
> master when it's there.
>  >
>  > Ross
>