| Message ID | 1413749285-1108-2-git-send-email-thomas.petazzoni@free-electrons.com |
|---|---|
| State | Accepted |
| Commit | adaf895e2bbb46a21002c5c33f73531766037eb8 |
| Headers | show |
Thomas, All, On 2014-10-19 22:07 +0200, Thomas Petazzoni spake thusly: > BR2_arm10 has been removed in commit > d60489a6e5e733a20d18b128646088981da57867 ("arch: remove BR2_arm10t"), > so there is no point in keeping a reference to it in the ffmpeg > package. > > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Regards, Yann E. MORIN. > --- > package/ffmpeg/ffmpeg.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk > index 166b5ce..21ec1c9 100644 > --- a/package/ffmpeg/ffmpeg.mk > +++ b/package/ffmpeg/ffmpeg.mk > @@ -285,7 +285,7 @@ FFMPEG_CONF_OPTS += --enable-armv6 > else > FFMPEG_CONF_OPTS += --disable-armv6 --disable-armv6t2 > endif > -ifeq ($(BR2_arm10)$(BR2_arm1136jf_s)$(BR2_arm1176jz_s)$(BR2_arm1176jzf_s)$(BR2_cortex_a5)$(BR2_cortex_a8)$(BR2_cortex_a9)$(BR2_cortex_a15),y) > +ifeq ($(BR2_arm1136jf_s)$(BR2_arm1176jz_s)$(BR2_arm1176jzf_s)$(BR2_cortex_a5)$(BR2_cortex_a8)$(BR2_cortex_a9)$(BR2_cortex_a15),y) > FFMPEG_CONF_OPTS += --enable-vfp > else > FFMPEG_CONF_OPTS += --disable-vfp > -- > 2.0.0 > > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot
On Sun, Oct 19, 2014 at 10:07 PM, Thomas Petazzoni <thomas.petazzoni@free-electrons.com> wrote: > BR2_arm10 has been removed in commit > d60489a6e5e733a20d18b128646088981da57867 ("arch: remove BR2_arm10t"), > so there is no point in keeping a reference to it in the ffmpeg > package. > > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Samuel Martin <s.martin49@gmail.com> > --- > package/ffmpeg/ffmpeg.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk > index 166b5ce..21ec1c9 100644 > --- a/package/ffmpeg/ffmpeg.mk > +++ b/package/ffmpeg/ffmpeg.mk > @@ -285,7 +285,7 @@ FFMPEG_CONF_OPTS += --enable-armv6 > else > FFMPEG_CONF_OPTS += --disable-armv6 --disable-armv6t2 > endif > -ifeq ($(BR2_arm10)$(BR2_arm1136jf_s)$(BR2_arm1176jz_s)$(BR2_arm1176jzf_s)$(BR2_cortex_a5)$(BR2_cortex_a8)$(BR2_cortex_a9)$(BR2_cortex_a15),y) > +ifeq ($(BR2_arm1136jf_s)$(BR2_arm1176jz_s)$(BR2_arm1176jzf_s)$(BR2_cortex_a5)$(BR2_cortex_a8)$(BR2_cortex_a9)$(BR2_cortex_a15),y) > FFMPEG_CONF_OPTS += --enable-vfp > else > FFMPEG_CONF_OPTS += --disable-vfp > -- > 2.0.0 > > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes: > BR2_arm10 has been removed in commit > d60489a6e5e733a20d18b128646088981da57867 ("arch: remove BR2_arm10t"), > so there is no point in keeping a reference to it in the ffmpeg > package. > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Committed, thanks.
diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk index 166b5ce..21ec1c9 100644 --- a/package/ffmpeg/ffmpeg.mk +++ b/package/ffmpeg/ffmpeg.mk @@ -285,7 +285,7 @@ FFMPEG_CONF_OPTS += --enable-armv6 else FFMPEG_CONF_OPTS += --disable-armv6 --disable-armv6t2 endif -ifeq ($(BR2_arm10)$(BR2_arm1136jf_s)$(BR2_arm1176jz_s)$(BR2_arm1176jzf_s)$(BR2_cortex_a5)$(BR2_cortex_a8)$(BR2_cortex_a9)$(BR2_cortex_a15),y) +ifeq ($(BR2_arm1136jf_s)$(BR2_arm1176jz_s)$(BR2_arm1176jzf_s)$(BR2_cortex_a5)$(BR2_cortex_a8)$(BR2_cortex_a9)$(BR2_cortex_a15),y) FFMPEG_CONF_OPTS += --enable-vfp else FFMPEG_CONF_OPTS += --disable-vfp
BR2_arm10 has been removed in commit d60489a6e5e733a20d18b128646088981da57867 ("arch: remove BR2_arm10t"), so there is no point in keeping a reference to it in the ffmpeg package. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- package/ffmpeg/ffmpeg.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)