[vlc-devel] [PATCH] contrib:gmp: do not try to detect assembler format when assembler is disabled

[Steve Lhomme]

---
 contrib/src/gmp/gmp-fix-asm-detection.patch | 11 +++++++++++
 contrib/src/gmp/rules.mak                   |  1 +
 2 files changed, 12 insertions(+)
 create mode 100644 contrib/src/gmp/gmp-fix-asm-detection.patch

diff --git a/contrib/src/gmp/gmp-fix-asm-detection.patch b/contrib/src/gmp/gmp-fix-asm-detection.patch
new file mode 100644
index 00000000000..ec80dc04531
--- /dev/null
+++ b/contrib/src/gmp/gmp-fix-asm-detection.patch
@@ -0,0 +1,11 @@
+--- gmp/configure.ac.asm	2018-06-25 13:50:38.561396100 +0200
++++ gmp/configure.ac	2018-06-25 14:02:43.731673800 +0200
+@@ -3592,7 +3592,7 @@ if test $found_asm = yes; then
+ fi
+ 
+ # Only do the GMP_ASM checks if there's a .S or .asm wanting them.
+-if test $found_asm = no && test $found_S = no; then
++if test $found_asm = no || test $enable_assembly = no ; then
+   gmp_asm_syntax_testing=no
+ fi
+ 
diff --git a/contrib/src/gmp/rules.mak b/contrib/src/gmp/rules.mak
index 6f7ca27c4cd..fa9b281873a 100644
--- a/contrib/src/gmp/rules.mak
+++ b/contrib/src/gmp/rules.mak
@@ -34,6 +34,7 @@ gmp: gmp-$(GMP_VERSION).tar.bz2 .sum-gmp
 	$(UNPACK)
 	$(APPLY) $(SRC)/gmp/ppc64.patch
 	$(APPLY) $(SRC)/gmp/win-arm64.patch
+	$(APPLY) $(SRC)/gmp/gmp-fix-asm-detection.patch
 	$(MOVE)
 
 # GMP requires either GPLv2 or LGPLv3
-- 
2.17.0