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

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Mon Jun 25 14:12:43 2018 +0200| [0feb493b2146493b32e74bc4f49cd768d25562e5] | committer: Steve Lhomme

contrib:gmp: do not try to detect assembler format when assembler is disabled

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0feb493b2146493b32e74bc4f49cd768d25562e5
---

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

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 0000000000..ec80dc0453
--- /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 6f7ca27c4c..fa9b281873 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