From 266007d1819c1455965b605729363888a02d6f1a Mon Sep 17 00:00:00 2001 From: Povl Abrahamsen <14947646+PovlAbrahamsen@users.noreply.github.com> Date: Sun, 23 Jul 2023 18:54:30 +0100 Subject: [PATCH] gmt6: fix for Apple Silicon --- .../stable/main/finkinfo/sci/gmt6-shlibs.info | 5 ++++- .../stable/main/finkinfo/sci/gmt6-shlibs.patch | 12 ++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 10.9-libcxx/stable/main/finkinfo/sci/gmt6-shlibs.patch diff --git a/10.9-libcxx/stable/main/finkinfo/sci/gmt6-shlibs.info b/10.9-libcxx/stable/main/finkinfo/sci/gmt6-shlibs.info index 86bbf9c4fd8..31e47186c1c 100644 --- a/10.9-libcxx/stable/main/finkinfo/sci/gmt6-shlibs.info +++ b/10.9-libcxx/stable/main/finkinfo/sci/gmt6-shlibs.info @@ -1,10 +1,12 @@ Package: gmt6-shlibs # 6.2.0 requires glib2 >= 2.32 NEWGLIB24 Version: 6.1.1 -Revision: 2 +Revision: 3 Source: https://github.com/GenericMappingTools/gmt/releases/download/%v/gmt-%v-src.tar.xz Source-Checksum: SHA256(d476cba999340648146ef53ab4a3f64858cbd2f5511cdec9f7f06f3fb7896625) SourceDirectory: gmt-%v +PatchFile: %n.patch +PatchFile-MD5: 611be9177fcfcef644ca8e8354f9722a BuildDepends: << cmake, @@ -33,6 +35,7 @@ NoSetCPPFLAGS: true NoSetLDFLAGS: true PatchScript: << + %{default_script} # Virtualize explicit '/sw' in sources perl -pi -e 's,/sw,%p,g' cmake/modules/*.cmake << diff --git a/10.9-libcxx/stable/main/finkinfo/sci/gmt6-shlibs.patch b/10.9-libcxx/stable/main/finkinfo/sci/gmt6-shlibs.patch new file mode 100644 index 00000000000..210bb9cdb4d --- /dev/null +++ b/10.9-libcxx/stable/main/finkinfo/sci/gmt6-shlibs.patch @@ -0,0 +1,12 @@ +diff -Nurd gmt-6.1.1.orig/src/gmt_common_sighandler.c gmt-6.1.1/src/gmt_common_sighandler.c +--- gmt-6.1.1.orig/src/gmt_common_sighandler.c 2020-09-01 21:29:44 ++++ gmt-6.1.1/src/gmt_common_sighandler.c 2023-07-23 18:37:08 +@@ -58,6 +58,8 @@ + # if __DARWIN_UNIX03 + # ifdef __x86_64__ + # define UC_IP(uc) ((void *) (uc)->uc_mcontext->__ss.__rip) ++# elif __arm64__ /* Apple Silicon, e.g. M1 */ ++# define UC_IP(uc) ((void *) (uc)->uc_mcontext->__ss.__pc) + # else + # define UC_IP(uc) ((void *) (uc)->uc_mcontext->__ss.__eip) + # endif