[vlc-commits] contribs: gpg-error: Provide a lock-obj for armv8

[Hugo Beauzée-Luyssen]

vlc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Fri Apr 21 14:50:56 2017 +0200| [bbf2277ab2f0e92b5871dbbcf8312736fe52ced3] | committer: Hugo Beauzée-Luyssen

contribs: gpg-error: Provide a lock-obj for armv8

Which is the same as x86_64, and needs to be stored in the linux-android
file, since genheader appears to ignore the processor flavor

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

 contrib/src/gpg-error/rules.mak | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/contrib/src/gpg-error/rules.mak b/contrib/src/gpg-error/rules.mak
index 9c54fc6b10..025fdc0455 100644
--- a/contrib/src/gpg-error/rules.mak
+++ b/contrib/src/gpg-error/rules.mak
@@ -19,7 +19,14 @@ endif
 	$(APPLY) $(SRC)/gpg-error/no-executable.patch
 	$(APPLY) $(SRC)/gpg-error/win32-unicode.patch
 	$(MOVE)
+ifdef HAVE_ANDROID
+ifeq ($(ARCH),aarch64)
+	# x86_64-linux-gnu matches exactly what gets generated by gen-posix-lock-obj on arm64
+	cp $@/src/syscfg/lock-obj-pub.x86_64-pc-linux-gnu.h $@/src/syscfg/lock-obj-pub.linux-android.h
+else
 	cp $@/src/syscfg/lock-obj-pub.arm-unknown-linux-androideabi.h $@/src/syscfg/lock-obj-pub.linux-android.h
+endif
+endif
 ifdef HAVE_TIZEN
 ifeq ($(TIZEN_ABI), x86)
 	cp $@/src/syscfg/lock-obj-pub.i686-pc-linux-gnu.h $@/src/syscfg/lock-obj-pub.linux-gnueabi.h