| 1 |
commit: 285bc8a90bd1cb60a8e7c7097d5ef1e46b68248c |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Aug 30 23:48:13 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Aug 30 23:53:54 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/elt-patches.git/commit/?id=285bc8a9 |
| 7 |
|
| 8 |
darwin20-conf: split 2.4.6 into two |
| 9 |
|
| 10 |
Apparently doesn't apply properly (skips second hunk?) otherwise. |
| 11 |
|
| 12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 13 |
|
| 14 |
patches/darwin20-conf/2.4.6 | 11 ----------- |
| 15 |
patches/darwin20-conf/{2.4.6 => 2.4.6-alt} | 11 ----------- |
| 16 |
2 files changed, 22 deletions(-) |
| 17 |
|
| 18 |
diff --git a/patches/darwin20-conf/2.4.6 b/patches/darwin20-conf/2.4.6 |
| 19 |
index 0932eae..7bfb3bb 100644 |
| 20 |
--- a/patches/darwin20-conf/2.4.6 |
| 21 |
+++ b/patches/darwin20-conf/2.4.6 |
| 22 |
@@ -11,14 +11,3 @@ macOS Monterey is 12.0. |
| 23 |
_lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; |
| 24 |
esac |
| 25 |
;; |
| 26 |
---- configure |
| 27 |
-+++ configure |
| 28 |
-@@ -8949,7 +8949,7 @@ printf "%s\n" "$lt_cv_ld_force_load" >&6; } |
| 29 |
- _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; |
| 30 |
- 10.[012][,.]*) |
| 31 |
- _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; |
| 32 |
-- 10.*|11.*) |
| 33 |
-+ 1[0-9].*) |
| 34 |
- _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; |
| 35 |
- esac |
| 36 |
- ;; |
| 37 |
|
| 38 |
diff --git a/patches/darwin20-conf/2.4.6 b/patches/darwin20-conf/2.4.6-alt |
| 39 |
similarity index 58% |
| 40 |
copy from patches/darwin20-conf/2.4.6 |
| 41 |
copy to patches/darwin20-conf/2.4.6-alt |
| 42 |
index 0932eae..3454602 100644 |
| 43 |
--- a/patches/darwin20-conf/2.4.6 |
| 44 |
+++ b/patches/darwin20-conf/2.4.6-alt |
| 45 |
@@ -2,17 +2,6 @@ macOS Big Sur is 11.0, Darwin 20, after a long line of 10.X releases. |
| 46 |
macOS Monterey is 12.0. |
| 47 |
--- configure |
| 48 |
+++ configure |
| 49 |
-@@ -1076,7 +1076,7 @@ |
| 50 |
- _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; |
| 51 |
- 10.[[012]][[,.]]*) |
| 52 |
- _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; |
| 53 |
-- 10.*) |
| 54 |
-+ 1[0-9].*) |
| 55 |
- _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; |
| 56 |
- esac |
| 57 |
- ;; |
| 58 |
---- configure |
| 59 |
-+++ configure |
| 60 |
@@ -8949,7 +8949,7 @@ printf "%s\n" "$lt_cv_ld_force_load" >&6; } |
| 61 |
_lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; |
| 62 |
10.[012][,.]*) |
Archives