[vlc-commits] contrib: gcrypt: force --tag for asm files

[Alexandre Janniaux]

vlc | branch: master | Alexandre Janniaux <ajanni at videolabs.io> | Thu Apr 23 19:20:24 2020 +0200| [14bd15dabd56cc4fdf6d74883bce681a4bf96d1f] | committer: Alexandre Janniaux

contrib: gcrypt: force --tag for asm files

It fixes build for iOS armv7 as libtool expects a --tag on ios armv7
builds for assembly files. I don't really know why it need this
addition to accept compiling though...

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

 ...her-Makefile.am-force-tag-CC-for-.S-files.patch | 29 ++++++++++++++++++++++
 contrib/src/gcrypt/rules.mak                       |  2 ++
 2 files changed, 31 insertions(+)

diff --git a/contrib/src/gcrypt/0001-cipher-Makefile.am-force-tag-CC-for-.S-files.patch b/contrib/src/gcrypt/0001-cipher-Makefile.am-force-tag-CC-for-.S-files.patch
new file mode 100644
index 0000000000..34c7a0cebe
--- /dev/null
+++ b/contrib/src/gcrypt/0001-cipher-Makefile.am-force-tag-CC-for-.S-files.patch
@@ -0,0 +1,29 @@
+From e09d5f889ce7c00e9ebe6ef0173aa7a27b975646 Mon Sep 17 00:00:00 2001
+From: Alexandre Janniaux <ajanni at videolabs.io>
+Date: Fri, 24 Apr 2020 10:26:25 +0200
+Subject: [PATCH] cipher: Makefile.am: force --tag=CC for .S files
+
+When building the library for armv7 on iOS, the following error prevents
+the success of the compilation:
+
+libtool: compile: unable to infer tagged configuration
+libtool:   error: specify a tag with '--tag'
+---
+ cipher/Makefile.am | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/cipher/Makefile.am b/cipher/Makefile.am
+index ac0ec58e..a2cb409c 100644
+--- a/cipher/Makefile.am
++++ b/cipher/Makefile.am
+@@ -125,3 +125,8 @@ tiger.o: $(srcdir)/tiger.c
+
+ tiger.lo: $(srcdir)/tiger.c
+ 	`echo $(LTCOMPILE) -c $(srcdir)/tiger.c | $(o_flag_munging) `
++
++SUFFIXES = .S
++
++.S.lo:
++	$(LIBTOOL) --mode compile --tag=CC $(CC) $(CFLAGS) $(CPPFLAGS) -c -I ../ "$<" -o "$@"
+--
+2.26.1
diff --git a/contrib/src/gcrypt/rules.mak b/contrib/src/gcrypt/rules.mak
index 0e57d1f8eb..a92790fe7f 100644
--- a/contrib/src/gcrypt/rules.mak
+++ b/contrib/src/gcrypt/rules.mak
@@ -29,6 +29,8 @@ ifeq ($(ARCH),mips64el)
 	$(APPLY) $(SRC)/gcrypt/clang-mips64.patch
 endif
 endif
+	# Ensure we can compile the assembly code in cipher, for armv7 ios builds
+	$(APPLY) $(SRC)/gcrypt/0001-cipher-Makefile.am-force-tag-CC-for-.S-files.patch
 	$(MOVE)
 
 DEPS_gcrypt = gpg-error