Bug 1380118: Make aom_config.asm match upstream. draft
authorRalph Giles <giles@mozilla.com>
Fri, 04 Aug 2017 14:29:55 -0700
changeset 651851 4bd14d11a4487f234fa5cbe8baa61351d1baf8bb
parent 651850 4d11806b1adb62e186bfda8100b80d76725755d1
child 651852 39bdd3a53f313f45351c1af164fa1f142aae45cb
push id75832
push userbmo:giles@thaumas.net
push dateThu, 24 Aug 2017 03:49:46 +0000
bugs1380118
milestone57.0a1
Bug 1380118: Make aom_config.asm match upstream. Upstream is using a different syntax, which isn't as nice, but using the same format makes comparison easier. Also expect yasm for mingw. MozReview-Commit-ID: 8PvmyB45AOu
media/libaom/generate_sources_mozbuild.sh
--- a/media/libaom/generate_sources_mozbuild.sh
+++ b/media/libaom/generate_sources_mozbuild.sh
@@ -163,18 +163,18 @@ function gen_config_files {
   ./configure $2 #> /dev/null
 
   # Disable HAVE_UNISTD_H.
   ( echo '/HAVE_UNISTD_H'; echo 'd' ; echo 'w' ; echo 'q' ) | ed -s aom_config.h
 
   local ASM_CONV=ads2gas.pl
 
   # Generate aom_config.asm.
-  if [[ "$1" == *x64* ]] || [[ "$1" == *ia32* ]]; then
-    egrep "#define [A-Z0-9_]+ [01]" aom_config.h | awk '{print "%define " $2 " " $3}' > aom_config.asm
+  if [[ "$1" == *x64* ]] || [[ "$1" == *ia32* ]] || [[ "$1" == *mingw* ]]; then
+    egrep "#define [A-Z0-9_]+ [01]" aom_config.h | awk '{print $2 " equ " $3}' > aom_config.asm
   else
     egrep "#define [A-Z0-9_]+ [01]" aom_config.h | awk '{print $2 " EQU " $3}' | perl $BASE_DIR/$LIBAOM_SRC_DIR/build/make/$ASM_CONV > aom_config.asm
   fi
 
   mkdir -p $BASE_DIR/$LIBAOM_CONFIG_DIR/$1
   cp aom_config.* $BASE_DIR/$LIBAOM_CONFIG_DIR/$1
   make_clean
   rm -rf aom_config.*