Mercurial > mxe-octave

changeset 6784:556f39f841a3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* src/ffmpeg .mk: use --disable-asm when compile for gnu-linux and system gcc
author John Donoghue <john.donoghue@ieee.org>
date Thu, 20 Jul 2023 15:43:01 -0400
parents f661ae2d901d
children 09c905948f92
files src/ffmpeg.mk
diffstat 1 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/ffmpeg.mk	Thu Jul 20 10:01:28 2023 -0400
+++ b/src/ffmpeg.mk	Thu Jul 20 15:43:01 2023 -0400
@@ -24,6 +24,11 @@
   $(PKG)_CONFIG_OPTS += --disable-optimizations
 endif
 
+# disable asm usage when native linux with system gcc
+ifeq ($(MXE_SYSTEM)$(USE_SYSTEM_GCC),gnu-linuxyes)
+  $(PKG)_CONFIG_OPTS += --disable-asm
+endif
+
 ifeq ($(MXE_NATIVE_BUILD),no)
 
 define $(PKG)_BUILD
@@ -82,7 +87,8 @@
         --enable-libopencore-amrnb \
         --enable-libopencore-amrwb \
         --enable-libx264 \
-        --enable-libvpx
+        --enable-libvpx \
+	$($(PKG)_CONFIG_OPTS)
     $(MAKE) -C '$(1)' -j '$(JOBS)'
     $(MAKE) -C '$(1)' -j 1 install DESTDIR='$(3)'
     rm -rf "$(3)$(HOST_PREFIX)/share/ffmpeg"