| Message ID | 20241008193103.2429829-1-ross.burton@arm.com |
|---|---|
| State | New |
| Headers | show |
| Series | [01/10] ffmpeg: nasm is x86 only, so only DEPEND if x86 | expand |
On Tue, 2024-10-08 at 20:30 +0100, Ross Burton via lists.openembedded.org wrote: > No need to depend on nasm if we're not going to use it. > > Signed-off-by: Ross Burton <ross.burton@arm.com> > --- > meta/recipes-multimedia/ffmpeg/ffmpeg_7.0.2.bb | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_7.0.2.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_7.0.2.bb > index 9e60b5cd23e..b16bd51dbd7 100644 > --- a/meta/recipes-multimedia/ffmpeg/ffmpeg_7.0.2.bb > +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_7.0.2.bb > @@ -46,7 +46,8 @@ ARM_INSTRUCTION_SET:armv6 = "arm" > # libpostproc was previously packaged from a separate recipe > PROVIDES = "libav libpostproc" > > -DEPENDS = "nasm-native" > +DEPENDS:append:x86 = " nasm-native" > +DEPENDS:append:x86-64 = " nasm-native" > > inherit autotools pkgconfig > > I think something in here is causing: https://valkyrie.yoctoproject.org/#/builders/99/builds/216/steps/17/logs/stdio https://valkyrie.yoctoproject.org/#/builders/89/builds/208/steps/12/logs/stdio https://valkyrie.yoctoproject.org/#/builders/7/builds/233/steps/12/logs/stdio and maybe more. Cheers, Richard
> On 10 Oct 2024, at 14:03, Richard Purdie <richard.purdie@linuxfoundation.org> wrote: > I think something in here is causing: > > https://valkyrie.yoctoproject.org/#/builders/99/builds/216/steps/17/logs/stdio > https://valkyrie.yoctoproject.org/#/builders/89/builds/208/steps/12/logs/stdio > https://valkyrie.yoctoproject.org/#/builders/7/builds/233/steps/12/logs/stdio > > and maybe more. That would be the DEBIAN/CONTROL ignoring which I made a logic error on. v2 incoming. Ross
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_7.0.2.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_7.0.2.bb index 9e60b5cd23e..b16bd51dbd7 100644 --- a/meta/recipes-multimedia/ffmpeg/ffmpeg_7.0.2.bb +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_7.0.2.bb @@ -46,7 +46,8 @@ ARM_INSTRUCTION_SET:armv6 = "arm" # libpostproc was previously packaged from a separate recipe PROVIDES = "libav libpostproc" -DEPENDS = "nasm-native" +DEPENDS:append:x86 = " nasm-native" +DEPENDS:append:x86-64 = " nasm-native" inherit autotools pkgconfig
No need to depend on nasm if we're not going to use it. Signed-off-by: Ross Burton <ross.burton@arm.com> --- meta/recipes-multimedia/ffmpeg/ffmpeg_7.0.2.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)