[vlc-commits] contrib/gpg-error: fix compilation for appleOS

[Felix Paul Kühne]

vlc | branch: master | Felix Paul Kühne <felix at feepk.net> | Thu Jan 23 11:20:47 2020 +0100| [0455fc1dd297bbc30bfcc02833a824235e317885] | committer: Felix Paul Kühne

contrib/gpg-error: fix compilation for appleOS

This fixes the compilation in case the host triplet does not include a version number and can therefore conflict with the files potentially to be copied.

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

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

diff --git a/contrib/src/gpg-error/rules.mak b/contrib/src/gpg-error/rules.mak
index b36cc57344..e0223dc753 100644
--- a/contrib/src/gpg-error/rules.mak
+++ b/contrib/src/gpg-error/rules.mak
@@ -34,19 +34,27 @@ endif
 endif
 ifdef HAVE_DARWIN_OS
 ifdef HAVE_ARMV7A
+ifneq ($(HOST),arm-apple-darwin)
 	cp $@/src/syscfg/lock-obj-pub.arm-apple-darwin.h $@/src/syscfg/lock-obj-pub.$(HOST).h
+endif
 else
 ifeq ($(ARCH),aarch64)
 ifneq ($(HOST),aarch64-apple-darwin)
 	cp $@/src/syscfg/lock-obj-pub.aarch64-apple-darwin.h $@/src/syscfg/lock-obj-pub.$(HOST).h
 endif
 else
-ifneq ($(ARCH),x86_64)
+ifeq ($(ARCH),x86_64)
+ifneq ($(HOST),x86_64-apple-darwin)
+	cp $@/src/syscfg/lock-obj-pub.x86_64-apple-darwin.h $@/src/syscfg/lock-obj-pub.$(HOST).h
+endif
+else
+ifneq ($(HOST),i386-apple-darwin)
 	cp $@/src/syscfg/lock-obj-pub.x86_64-apple-darwin.h $@/src/syscfg/lock-obj-pub.$(HOST).h
 endif
 endif
 endif
 endif
+endif
 ifdef HAVE_NACL
 ifeq ($(ARCH),i386) # 32bits intel
 	cp $@/src/syscfg/lock-obj-pub.i686-pc-linux-gnu.h $@/src/syscfg/lock-obj-pub.nacl.h