contribs: gpg-error: Provide a lock-obj for armv8
authorHugo Beauzée-Luyssen <hugo@beauzee.fr>
Fri, 21 Apr 2017 12:50:56 +0000 (14:50 +0200)
committerHugo Beauzée-Luyssen <hugo@beauzee.fr>
Fri, 21 Apr 2017 13:14:49 +0000 (15:14 +0200)
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

contrib/src/gpg-error/rules.mak

index 9c54fc6..025fdc0 100644 (file)
@@ -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