vlc/vlc-2.2 | branch: master | Gleb Pinigin <[email protected]> | Wed Mar 18 
12:21:09 2015 +0600| [c44e9ef9c96de3e1ab51e797abcf3a04e56f33fc] | committer: 
Felix Paul Kühne

contrib/gpg-error: fix crash in lock object on iOS (fixes #13194)

Signed-off-by: Felix Paul Kühne <[email protected]>
(cherry picked from commit c417e384c905058d3d571d2277a30fe4955c984f)

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

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

diff --git a/contrib/src/gpg-error/rules.mak b/contrib/src/gpg-error/rules.mak
index acfcea8..7ce5519 100644
--- a/contrib/src/gpg-error/rules.mak
+++ b/contrib/src/gpg-error/rules.mak
@@ -16,7 +16,11 @@ endif
        $(MOVE)
        cp $@/src/syscfg/lock-obj-pub.arm-unknown-linux-androideabi.h 
$@/src/syscfg/lock-obj-pub.linux-android.h
 ifdef HAVE_IOS
-       cp $@/src/syscfg/lock-obj-pub.arm-unknown-linux-androideabi.h 
$@/src/syscfg/lock-obj-pub.$(HOST).h
+ifdef HAVE_ARMV7A
+       cp $@/src/syscfg/lock-obj-pub.arm-apple-darwin.h 
$@/src/syscfg/lock-obj-pub.$(HOST).h
+else
+       cp $@/src/syscfg/lock-obj-pub.aarch64-apple-darwin.h 
$@/src/syscfg/lock-obj-pub.$(HOST).h
+endif
 endif
 
 .gpg-error: libgpg-error

_______________________________________________
vlc-commits mailing list
[email protected]
https://mailman.videolan.org/listinfo/vlc-commits

Reply via email to