diff options
author | 2022-08-31 00:48:13 +0100 | |
---|---|---|
committer | 2022-08-31 00:53:54 +0100 | |
commit | 285bc8a90bd1cb60a8e7c7097d5ef1e46b68248c (patch) | |
tree | 00bd6d50ba858a73f392760cf659fa03ac14a1a1 | |
parent | darwin20-conf: change regex for future releases (diff) | |
download | elt-patches-285bc8a90bd1cb60a8e7c7097d5ef1e46b68248c.tar.gz elt-patches-285bc8a90bd1cb60a8e7c7097d5ef1e46b68248c.tar.bz2 elt-patches-285bc8a90bd1cb60a8e7c7097d5ef1e46b68248c.zip |
darwin20-conf: split 2.4.6 into two20220831
Apparently doesn't apply properly (skips second hunk?) otherwise.
Signed-off-by: Sam James <sam@gentoo.org>
-rw-r--r-- | patches/darwin20-conf/2.4.6 | 11 | ||||
-rw-r--r-- | patches/darwin20-conf/2.4.6-alt | 13 |
2 files changed, 13 insertions, 11 deletions
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 + ;; |