From 285bc8a90bd1cb60a8e7c7097d5ef1e46b68248c Mon Sep 17 00:00:00 2001 From: Sam James Date: Wed, 31 Aug 2022 00:48:13 +0100 Subject: darwin20-conf: split 2.4.6 into two Apparently doesn't apply properly (skips second hunk?) otherwise. Signed-off-by: Sam James --- patches/darwin20-conf/2.4.6 | 11 ----------- patches/darwin20-conf/2.4.6-alt | 13 +++++++++++++ 2 files changed, 13 insertions(+), 11 deletions(-) create mode 100644 patches/darwin20-conf/2.4.6-alt diff --git a/patches/darwin20-conf/2.4.6 b/patches/darwin20-conf/2.4.6 index 0932eae..7bfb3bb 100644 --- a/patches/darwin20-conf/2.4.6 +++ b/patches/darwin20-conf/2.4.6 @@ -11,14 +11,3 @@ macOS Monterey is 12.0. _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; esac ;; ---- configure -+++ configure -@@ -8949,7 +8949,7 @@ printf "%s\n" "$lt_cv_ld_force_load" >&6; } - _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; - 10.[012][,.]*) - _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; -- 10.*|11.*) -+ 1[0-9].*) - _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; - esac - ;; diff --git a/patches/darwin20-conf/2.4.6-alt b/patches/darwin20-conf/2.4.6-alt new file mode 100644 index 0000000..3454602 --- /dev/null +++ b/patches/darwin20-conf/2.4.6-alt @@ -0,0 +1,13 @@ +macOS Big Sur is 11.0, Darwin 20, after a long line of 10.X releases. +macOS Monterey is 12.0. +--- configure ++++ configure +@@ -8949,7 +8949,7 @@ printf "%s\n" "$lt_cv_ld_force_load" >&6; } + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + 10.[012][,.]*) + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; +- 10.*|11.*) ++ 1[0-9].*) + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + esac + ;; -- cgit v1.2.3-65-gdbad