commit: 285bc8a90bd1cb60a8e7c7097d5ef1e46b68248c
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 30 23:48:13 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Aug 30 23:53:54 2022 +0000
URL: https://gitweb.gentoo.org/proj/elt-patches.git/commit/?id=285bc8a9
darwin20-conf: split 2.4.6 into two
Apparently doesn't apply properly (skips second hunk?) otherwise.
Signed-off-by: Sam James <sam <AT> gentoo.org>
patches/darwin20-conf/2.4.6 | 11 -----------
patches/darwin20-conf/{2.4.6 => 2.4.6-alt} | 11 -----------
2 files changed, 22 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 b/patches/darwin20-conf/2.4.6-alt
similarity index 58%
copy from patches/darwin20-conf/2.4.6
copy to patches/darwin20-conf/2.4.6-alt
index 0932eae..3454602 100644
--- a/patches/darwin20-conf/2.4.6
+++ b/patches/darwin20-conf/2.4.6-alt
@@ -2,17 +2,6 @@ macOS Big Sur is 11.0, Darwin 20, after a long line of 10.X
releases.
macOS Monterey is 12.0.
--- configure
+++ configure
-@@ -1076,7 +1076,7 @@
- _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
- 10.[[012]][[,.]]*)
- _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined
${wl}suppress' ;;
-- 10.*)
-+ 1[0-9].*)
- _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][,.]*)
