Skip to contentSkip to conversation

package/ffmpeg: simplify BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS logic

PATCH New Bernd Kuhls 2 participants 4 messages Nov 11, 2017

lore
Share & tools
lore

Bernd Kuhls

author
#0 lore raw

PATCH 1/2 package/ffmpeg: simplify BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS logic

Suggested by Arnout:
http://lists.busybox.net/pipermail/buildroot/2017-November/206631.html

Signed-off-by Bernd Kuhls <[email protected]>
---
 package/ffmpeg/Config.in | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
package/ffmpeg/Config.in +5 -1
index ed87ddd492..17a4881348 100644
@@ -1,15 +1,19 @@
 config BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
 	bool
+	default y
 	# fenv.h lacks FE_INVALID, FE_OVERFLOW & FE_UNDERFLOW on nios2
+	depends on !BR2_nios
 	# No support for ARMv7-M in the ARM assembly logic
+	depends on !BR2_ARM_CPU_ARMV7M
 	# Microblaze build affected by gcc PR71124 (infinite loop)
+	depends on !BR2_microblaze
 	# m68k coldfire causes a build failure, because the check for
 	# atomics (atomic_store) succeeds, which causes ffmpeg to
 	# think atomic intrinsics are available, while they are
 	# not. See https://patchwork.ozlabs.org/patch/756664/ and
 	# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68467 for more
 	# details.
-	default y if !BR2_nios2 && !BR2_ARM_CPU_ARMV7M && !BR2_microblaze && !BR2_m68k_cf
+	depends on !BR2_m68k_cf
 
 menuconfig BR2_PACKAGE_FFMPEG
 	bool "ffmpeg"
Signature · 1 line
2.11.0
author
#1 lore raw

PATCH 2/2 package/ffmpeg: fix fenv build failure on ARCv2 with glibc

https://git.buildroot.net/buildroot/commit/toolchain?id=0633eb58a2912328508a76f8fe9875a0d113a880
added glibc support for ARCv2 which lacks fenv.h.

Code format was suggested by Arnout:
http://lists.busybox.net/pipermail/buildroot/2017-November/206631.html

Fixes
http://autobuild.buildroot.net/results/aec/aec300d7d4472421398a24202d6871c965bd1be5/

Signed-off-by Bernd Kuhls <[email protected]>
---
 package/ffmpeg/Config.in | 2 ++
 1 file changed, 2 insertions(+)
package/ffmpeg/Config.in +2 -0
index 17a4881348..1b0e71a836 100644
@@ -1,6 +1,8 @@
 config BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS
 	bool
 	default y
+	# fenv.h lacks FE_INVALID, FE_OVERFLOW & FE_UNDERFLOW
+	depends on !BR2_archs38 || !BR2_TOOLCHAIN_USES_GLIBC
 	# fenv.h lacks FE_INVALID, FE_OVERFLOW & FE_UNDERFLOW on nios2
 	depends on !BR2_nios
 	# No support for ARMv7-M in the ARM assembly logic
Signature · 1 line
2.11.0
#2 lore raw

PATCH 2/2 package/ffmpeg: fix fenv build failure on ARCv2 with glibc

Hello,

package/ffmpeg/Config.in line 5

Quoted 2 lines · Bernd Kuhls
package/ffmpeg/Config.in +2 -0
+	# fenv.h lacks FE_INVALID, FE_OVERFLOW & FE_UNDERFLOW
+	depends on !BR2_archs38 || !BR2_TOOLCHAIN_USES_GLIBC

I've changed this to:

	depends on !(BR2_archs38 && BR2_TOOLCHAIN_USES_GLIBC)

which IMO is easier to read as it match the human way of expressingthe
dependency: "not available on ARC HS38 with glibc".

Applied with this change. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
Applied
#3 lore raw

PATCH 1/2 package/ffmpeg: simplify BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS logic

In reply to Bernd Kuhls

Hello,

Quoted 7 lines · Bernd Kuhls

Suggested by Arnout:
http://lists.busybox.net/pipermail/buildroot/2017-November/206631.html

Signed-off-by Bernd Kuhls <[email protected]>
---
 package/ffmpeg/Config.in | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com