Patchwork [v2] x264_r2245: do not override `DEPENDS` for x86

login
register
mail settings
Submitter Bob Foerster
Date May 8, 2011, 11 a.m.
Message ID <1304852453-9294-1-git-send-email-robert@erafx.com>
Download mbox | patch
Permalink /patch/3385/
State Accepted
Headers show

Comments

Bob Foerster - May 8, 2011, 11 a.m.
The recipe intended to add "yasm-native" to the dependencies on x86,
but it set DEPENDS_x86 = "yasm-native" which obliterated the base
dependencies. On a fresh build, this package was failing since it
was trying to build before the compiler was ready.

Depends is now set with DEPENDS_append_x86, which leaves the base
dependencies intact.

Signed-off-by: Bob Foerster <robert@erafx.com>
---
 recipes/vlc/x264_r2245.bb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Paul Menzel - May 8, 2011, 11:09 a.m.
Dear Bob,


Am Sonntag, den 08.05.2011, 07:00 -0400 schrieb Bob Foerster:
> The recipe intended to add "yasm-native" to the dependencies on x86,
> but it set DEPENDS_x86 = "yasm-native" which obliterated the base
> dependencies. On a fresh build, this package was failing since it
> was trying to build before the compiler was ready.
> 
> Depends is now set with DEPENDS_append_x86, which leaves the base
> dependencies intact.

Btw. What `MACHINE` and `DISTRIBUTION` do you use?

> Signed-off-by: Bob Foerster <robert@erafx.com>
> ---
>  recipes/vlc/x264_r2245.bb |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/recipes/vlc/x264_r2245.bb b/recipes/vlc/x264_r2245.bb
> index 0cffea3..21e5a0e 100644
> --- a/recipes/vlc/x264_r2245.bb
> +++ b/recipes/vlc/x264_r2245.bb
> @@ -23,7 +23,7 @@ X264_ECFLAGS_mipsel = "-fPIC"
>  X264_DISABLE_ASM = "--disable-asm"
>  # use assembler written functions for those archs supporting this
>  X264_DISABLE_ASM_x86 = ""
> -DEPENDS_x86 = "yasm-native"
> +DEPENDS_append_x86 = " yasm-native"
>  
>  EXTRA_OECONF = '--enable-shared ${X264_DISABLE_ASM} --extra-cflags="${X264_ECFLAGS}"'

Acked-by: Paul Menzel <paulepanter@users.sourceforge.net>


Thanks,

Paul
Bob Foerster - May 8, 2011, 11:33 a.m.
On Sun, May 8, 2011 at 7:09 AM, Paul Menzel <
paulepanter@users.sourceforge.net> wrote:

> Dear Bob,
>
>
> Am Sonntag, den 08.05.2011, 07:00 -0400 schrieb Bob Foerster:
> > The recipe intended to add "yasm-native" to the dependencies on x86,
> > but it set DEPENDS_x86 = "yasm-native" which obliterated the base
> > dependencies. On a fresh build, this package was failing since it
> > was trying to build before the compiler was ready.
> >
> > Depends is now set with DEPENDS_append_x86, which leaves the base
> > dependencies intact.
>
> Btw. What `MACHINE` and `DISTRIBUTION` do you use?
>

machine=x86, distro=custom


>
> > Signed-off-by: Bob Foerster <robert@erafx.com>
> > ---
> >  recipes/vlc/x264_r2245.bb |    2 +-
> >  1 files changed, 1 insertions(+), 1 deletions(-)
> >
> > diff --git a/recipes/vlc/x264_r2245.bb b/recipes/vlc/x264_r2245.bb
> > index 0cffea3..21e5a0e 100644
> > --- a/recipes/vlc/x264_r2245.bb
> > +++ b/recipes/vlc/x264_r2245.bb
> > @@ -23,7 +23,7 @@ X264_ECFLAGS_mipsel = "-fPIC"
> >  X264_DISABLE_ASM = "--disable-asm"
> >  # use assembler written functions for those archs supporting this
> >  X264_DISABLE_ASM_x86 = ""
> > -DEPENDS_x86 = "yasm-native"
> > +DEPENDS_append_x86 = " yasm-native"
> >
> >  EXTRA_OECONF = '--enable-shared ${X264_DISABLE_ASM}
> --extra-cflags="${X264_ECFLAGS}"'
>
> Acked-by: Paul Menzel <paulepanter@users.sourceforge.net>
>
>
> Thanks,
>
> Paul
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>
>
Paul Menzel - May 8, 2011, 3:35 p.m.
Am Sonntag, den 08.05.2011, 07:33 -0400 schrieb Robert Foerster:
> On Sun, May 8, 2011 at 7:09 AM, Paul Menzel wrote:

> > Am Sonntag, den 08.05.2011, 07:00 -0400 schrieb Bob Foerster:
> > > The recipe intended to add "yasm-native" to the dependencies on x86,
> > > but it set DEPENDS_x86 = "yasm-native" which obliterated the base
> > > dependencies. On a fresh build, this package was failing since it
> > > was trying to build before the compiler was ready.
> > >
> > > Depends is now set with DEPENDS_append_x86, which leaves the base
> > > dependencies intact.
> >
> > Btw. What `MACHINE` and `DISTRIBUTION` do you use?
> 
> machine=x86, distro=custom
> 
> > > Signed-off-by: Bob Foerster <robert@erafx.com>
> > > ---
> > >  recipes/vlc/x264_r2245.bb |    2 +-
> > >  1 files changed, 1 insertions(+), 1 deletions(-)
> > >
> > > diff --git a/recipes/vlc/x264_r2245.bb b/recipes/vlc/x264_r2245.bb
> > > index 0cffea3..21e5a0e 100644
> > > --- a/recipes/vlc/x264_r2245.bb
> > > +++ b/recipes/vlc/x264_r2245.bb
> > > @@ -23,7 +23,7 @@ X264_ECFLAGS_mipsel = "-fPIC"
> > >  X264_DISABLE_ASM = "--disable-asm"
> > >  # use assembler written functions for those archs supporting this
> > >  X264_DISABLE_ASM_x86 = ""
> > > -DEPENDS_x86 = "yasm-native"
> > > +DEPENDS_append_x86 = " yasm-native"
> > >
> > >  EXTRA_OECONF = '--enable-shared ${X264_DISABLE_ASM}
> > --extra-cflags="${X264_ECFLAGS}"'
> >
> > Acked-by: Paul Menzel <paulepanter@users.sourceforge.net>

I pushed your patch upstream in 0409d1d9 [1].

Please update the patch queue [2] with for example the following
command.

	$ pwclient update -s Accepted -c 0409d1d98a400c56d348de1f49c8a09f38b52fba 3385

I do not have the rights to change the state of patches I did not
submit.


Thanks,

Paul


[1] http://cgit.openembedded.org/cgit.cgi/openembedded/commit/?id=0409d1d98a400c56d348de1f49c8a09f38b52fba
[2] http://openembedded.org/index.php/Patchwork
Bob Foerster - May 9, 2011, 2:54 p.m.
On Sun, May 8, 2011 at 11:35 AM, Paul Menzel <
paulepanter@users.sourceforge.net> wrote:

> Am Sonntag, den 08.05.2011, 07:33 -0400 schrieb Robert Foerster:
> > On Sun, May 8, 2011 at 7:09 AM, Paul Menzel wrote:
>
> > > Am Sonntag, den 08.05.2011, 07:00 -0400 schrieb Bob Foerster:
> > > > The recipe intended to add "yasm-native" to the dependencies on x86,
> > > > but it set DEPENDS_x86 = "yasm-native" which obliterated the base
> > > > dependencies. On a fresh build, this package was failing since it
> > > > was trying to build before the compiler was ready.
> > > >
> > > > Depends is now set with DEPENDS_append_x86, which leaves the base
> > > > dependencies intact.
> > >
> > > Btw. What `MACHINE` and `DISTRIBUTION` do you use?
> >
> > machine=x86, distro=custom
> >
> > > > Signed-off-by: Bob Foerster <robert@erafx.com>
> > > > ---
> > > >  recipes/vlc/x264_r2245.bb |    2 +-
> > > >  1 files changed, 1 insertions(+), 1 deletions(-)
> > > >
> > > > diff --git a/recipes/vlc/x264_r2245.bb b/recipes/vlc/x264_r2245.bb
> > > > index 0cffea3..21e5a0e 100644
> > > > --- a/recipes/vlc/x264_r2245.bb
> > > > +++ b/recipes/vlc/x264_r2245.bb
> > > > @@ -23,7 +23,7 @@ X264_ECFLAGS_mipsel = "-fPIC"
> > > >  X264_DISABLE_ASM = "--disable-asm"
> > > >  # use assembler written functions for those archs supporting this
> > > >  X264_DISABLE_ASM_x86 = ""
> > > > -DEPENDS_x86 = "yasm-native"
> > > > +DEPENDS_append_x86 = " yasm-native"
> > > >
> > > >  EXTRA_OECONF = '--enable-shared ${X264_DISABLE_ASM}
> > > --extra-cflags="${X264_ECFLAGS}"'
> > >
> > > Acked-by: Paul Menzel <paulepanter@users.sourceforge.net>
>
> I pushed your patch upstream in 0409d1d9 [1].
>
> Please update the patch queue [2] with for example the following
> command.
>
>        $ pwclient update -s Accepted -c
> 0409d1d98a400c56d348de1f49c8a09f38b52fba 3385
>
> I do not have the rights to change the state of patches I did not
> submit.
>
>
>
Done. Thanks, Paul!



> Thanks,
>
> Paul
>
>
> [1]
> http://cgit.openembedded.org/cgit.cgi/openembedded/commit/?id=0409d1d98a400c56d348de1f49c8a09f38b52fba
> [2] http://openembedded.org/index.php/Patchwork
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>
>

Patch

diff --git a/recipes/vlc/x264_r2245.bb b/recipes/vlc/x264_r2245.bb
index 0cffea3..21e5a0e 100644
--- a/recipes/vlc/x264_r2245.bb
+++ b/recipes/vlc/x264_r2245.bb
@@ -23,7 +23,7 @@  X264_ECFLAGS_mipsel = "-fPIC"
 X264_DISABLE_ASM = "--disable-asm"
 # use assembler written functions for those archs supporting this
 X264_DISABLE_ASM_x86 = ""
-DEPENDS_x86 = "yasm-native"
+DEPENDS_append_x86 = " yasm-native"
 
 EXTRA_OECONF = '--enable-shared ${X264_DISABLE_ASM} --extra-cflags="${X264_ECFLAGS}"'