jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-31 07:06:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

package/gst1-libav: fix build on mips64el

Browse Source 
Apply the same behavior for CPU in gst1-libav than in ffmpeg:
 - use generic cpu for all mips architectures
 - use GCC_TARGET_{ARCH,CPU} instead of BR2_TARGET_{ARCH,CPU}

Fixes:
 - http://autobuild.buildroot.org/results/776028a43bd180b4895efc74321e3aee56cbcb47

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Fabrice Fontaine 2019-03-29 16:30:39 +01:00 committed by Thomas Petazzoni
parent 0c6f83c3eb
commit 902d3d27bc
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
package/gstreamer1/gst1-libav/gst1-libav.mk
View File

@ -35,10 +35,14 @@ GST1_LIBAV_CONF_EXTRA_OPTS += --disable-bzlib
endif endif
# Generic CPU setup for bundled ffmpeg # Generic CPU setup for bundled ffmpeg
ifneq ($(call qstrip,$(BR2_GCC_TARGET_CPU)),) # Default to --cpu=generic for MIPS architecture, in order to avoid a
GST1_LIBAV_CONF_EXTRA_OPTS += --cpu=$(BR2_GCC_TARGET_CPU) # build failure on mips64r6.
else ifneq ($(call qstrip,$(BR2_GCC_TARGET_ARCH)),) ifeq ($(BR2_mips)$(BR2_mipsel)$(BR2_mips64)$(BR2_mips64el),y)
GST1_LIBAV_CONF_EXTRA_OPTS += --cpu=$(BR2_GCC_TARGET_ARCH) GST1_LIBAV_CONF_EXTRA_OPTS += --cpu=generic
else ifneq ($(GCC_TARGET_CPU),)
GST1_LIBAV_CONF_EXTRA_OPTS += --cpu=$(GCC_TARGET_CPU)
else ifneq ($(GCC_TARGET_ARCH),)
GST1_LIBAV_CONF_EXTRA_OPTS += --cpu=$(GCC_TARGET_ARCH)
endif endif
ifeq ($(BR2_X86_CPU_HAS_MMX),y) ifeq ($(BR2_X86_CPU_HAS_MMX),y)