tjh.dev
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
1From 33a8dc728eb5da3e1d3439c96810d1f6b2660b89 Mon Sep 17 00:00:00 2001
2From: Andrew Childs <andrew.childs@bibo.com.ph>
3Date: Tue, 22 Feb 2022 12:24:46 +0900
4Subject: [PATCH] libtool.m4: update macos version detection block
5
6Includes upstream change
79e8c882517082fe5755f2524d23efb02f1522490
8---
9 libtool.m4 | 21 ++++++++-------------
10 1 file changed, 8 insertions(+), 13 deletions(-)
11
12diff --git a/libtool.m4 b/libtool.m4
13index 7a711249304..f452efb4300 100644
14--- a/libtool.m4
15+++ b/libtool.m4
16@@ -996,20 +996,15 @@ _LT_EOF
17 ])
18 case $host_os in
19 rhapsody* | darwin1.[[012]])
20- _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
21+ _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
22 darwin1.*)
23- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
24- darwin*) # darwin 5.x on
25- # if running on 10.5 or later, the deployment target defaults
26- # to the OS version, if on x86, and 10.4, the deployment
27- # target defaults to 10.4. Don't you love it?
28- case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
29- 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
30- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
31- 10.[[012]][[,.]]*)
32- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
33- 10.*)
34- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
35+ _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
36+ darwin*)
37+ case $MACOSX_DEPLOYMENT_TARGET,$host in
38+ 10.[[012]],*|,*powerpc*-darwin[[5-8]]*)
39+ _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
40+ *)
41+ _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
42 esac
43 ;;
44 esac
45--
462.34.1
47