0018-contrib-gpg-error-remove-appleOS-hacks.patch 1.2 KB

12345678910111213141516171819202122232425262728293031323334353637
  1. From 17e2fda214de9c912b876a5bc59c3f879ef1e7e2 Mon Sep 17 00:00:00 2001
  2. From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <felix@feepk.net>
  3. Date: Wed, 22 Jan 2020 17:59:47 +0100
  4. Subject: [PATCH 18/18] contrib/gpg-error: remove appleOS hacks
  5. ---
  6. contrib/src/gpg-error/rules.mak | 13 -------------
  7. 1 file changed, 13 deletions(-)
  8. diff --git a/contrib/src/gpg-error/rules.mak b/contrib/src/gpg-error/rules.mak
  9. index badf00cf57..d08ac94384 100644
  10. --- a/contrib/src/gpg-error/rules.mak
  11. +++ b/contrib/src/gpg-error/rules.mak
  12. @@ -32,19 +32,6 @@ else
  13. cp $@/src/syscfg/lock-obj-pub.arm-unknown-linux-androideabi.h $@/src/syscfg/lock-obj-pub.linux-android.h
  14. endif
  15. endif
  16. -ifdef HAVE_DARWIN_OS
  17. -ifdef HAVE_ARMV7A
  18. - cp $@/src/syscfg/lock-obj-pub.arm-apple-darwin.h $@/src/syscfg/lock-obj-pub.$(HOST).h
  19. -else
  20. -ifeq ($(ARCH),aarch64)
  21. -ifneq ($(HOST),aarch64-apple-darwin)
  22. - cp $@/src/syscfg/lock-obj-pub.aarch64-apple-darwin.h $@/src/syscfg/lock-obj-pub.$(HOST).h
  23. -endif
  24. -else
  25. - cp $@/src/syscfg/lock-obj-pub.x86_64-apple-darwin.h $@/src/syscfg/lock-obj-pub.$(HOST).h
  26. -endif
  27. -endif
  28. -endif
  29. ifdef HAVE_NACL
  30. ifeq ($(ARCH),i386) # 32bits intel
  31. cp $@/src/syscfg/lock-obj-pub.i686-pc-linux-gnu.h $@/src/syscfg/lock-obj-pub.nacl.h
  32. --
  33. 2.21.1 (Apple Git-122.3)