Mon Jan 31 09:31:59 2022 UTC ()
On macOS, do not use DYLD_LIBRARY_PATH for ordinary configure checks.
Fixes configure (and build, and package) on at least Monterey. This
workaround will be unneeded in the next curl release. From MacPorts, via
Michael-John Turner on pkgsrc-users@.


(schmonz)
diff -r1.178 -r1.179 pkgsrc/www/curl/distinfo
diff -r1.13 -r1.14 pkgsrc/www/curl/patches/patch-configure
cvs diff -r1.178 -r1.179 pkgsrc/www/curl/distinfo (expand / switch to unified diff)

--- pkgsrc/www/curl/distinfo 2022/01/07 21:05:37 1.178
+++ pkgsrc/www/curl/distinfo 2022/01/31 09:31:59 1.179
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.178 2022/01/07 21:05:37 adam Exp $ 1$NetBSD: distinfo,v 1.179 2022/01/31 09:31:59 schmonz Exp $
2 2
3BLAKE2s (curl-7.81.0.tar.xz) = ff0f098e3baa14aad53af343bcbd53cfabcfde3950f2f54e92764fa9ce37e6fc 3BLAKE2s (curl-7.81.0.tar.xz) = ff0f098e3baa14aad53af343bcbd53cfabcfde3950f2f54e92764fa9ce37e6fc
4SHA512 (curl-7.81.0.tar.xz) = 38355aaee38db04bb2babdc5fd7a88284580c836d15df754f42b104997dd344b7841be8e53b4fc91aea31db170a7d6967c4976833eb4bfe0d265c7275c4800df 4SHA512 (curl-7.81.0.tar.xz) = 38355aaee38db04bb2babdc5fd7a88284580c836d15df754f42b104997dd344b7841be8e53b4fc91aea31db170a7d6967c4976833eb4bfe0d265c7275c4800df
5Size (curl-7.81.0.tar.xz) = 2486388 bytes 5Size (curl-7.81.0.tar.xz) = 2486388 bytes
6SHA1 (patch-configure) = 898732721ea9c76ec8729c711eba018f6c88ff6c 6SHA1 (patch-configure) = b800985acb6a1d710f9da0f3ed13d884745828d8
7SHA1 (patch-curl-config.in) = a58c777fc1a0a087776e62ed2e2a1e0a339716df 7SHA1 (patch-curl-config.in) = a58c777fc1a0a087776e62ed2e2a1e0a339716df
cvs diff -r1.13 -r1.14 pkgsrc/www/curl/patches/patch-configure (expand / switch to unified diff)

--- pkgsrc/www/curl/patches/patch-configure 2021/11/10 10:55:08 1.13
+++ pkgsrc/www/curl/patches/patch-configure 2022/01/31 09:31:59 1.14
@@ -1,145 +1,290 @@ @@ -1,145 +1,290 @@
1$NetBSD: patch-configure,v 1.13 2021/11/10 10:55:08 adam Exp $ 1$NetBSD: patch-configure,v 1.14 2022/01/31 09:31:59 schmonz Exp $
2 2
3- Builtin krb5-config in platforms such as solaris do not support 3- Builtin krb5-config in platforms such as solaris do not support
4 the gssapi option, and need an explicit -lgss 4 the gssapi option, and need an explicit -lgss
5- On Darwin, do not append custom CFLAGS. 5- On Darwin, do not append custom CFLAGS.
 6 Also do not use DYLD_LIBRARY_PATH for ordinary configure checks.
6- Do not strip debug flags. 7- Do not strip debug flags.
7- Support Minix. 8- Support Minix.
8 9
9--- configure.orig 2021-11-09 08:16:06.000000000 +0000 10--- configure.orig 2022-01-03 21:33:05.000000000 +0000
10+++ configure 11+++ configure
11@@ -4243,6 +4243,7 @@ printf "%s\n" "$as_me: $xc_bad_var_msg l 12@@ -4243,6 +4243,7 @@ printf "%s\n" "$as_me: $xc_bad_var_msg l
12 ;; 13 ;;
13 esac 14 esac
14 done 15 done
15+ xc_bad_var_cflags=no 16+ xc_bad_var_cflags=no
16 if test $xc_bad_var_cflags = yes; then 17 if test $xc_bad_var_cflags = yes; then
17 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: using CFLAGS: $CFLAGS" >&5 18 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: using CFLAGS: $CFLAGS" >&5
18 printf "%s\n" "$as_me: using CFLAGS: $CFLAGS" >&6;} 19 printf "%s\n" "$as_me: using CFLAGS: $CFLAGS" >&6;}
19@@ -8623,7 +8624,7 @@ else $as_nop 20@@ -8641,7 +8642,7 @@ else $as_nop
20 lt_cv_sys_max_cmd_len=8192; 21 lt_cv_sys_max_cmd_len=8192;
21 ;; 22 ;;
22  23
23- bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) 24- bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
24+ bitrig* | darwin* | dragonfly* | freebsd* | minix* | netbsd* | openbsd*) 25+ bitrig* | darwin* | dragonfly* | freebsd* | minix* | netbsd* | openbsd*)
25 # This has been around since 386BSD, at least. Likely further. 26 # This has been around since 386BSD, at least. Likely further.
26 if test -x /sbin/sysctl; then 27 if test -x /sbin/sysctl; then
27 lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` 28 lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
28@@ -9103,12 +9104,8 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu  29@@ -9121,12 +9122,8 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu
29 lt_cv_deplibs_check_method=pass_all 30 lt_cv_deplibs_check_method=pass_all
30 ;; 31 ;;
31  32
32-netbsd* | netbsdelf*-gnu) 33-netbsd* | netbsdelf*-gnu)
33- if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then 34- if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
34- lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' 35- lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
35- else 36- else
36- lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$' 37- lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
37- fi 38- fi
38+netbsd* | netbsdelf*-gnu | minix*) 39+netbsd* | netbsdelf*-gnu | minix*)
39+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$' 40+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
40 ;; 41 ;;
41  42
42 newos6*) 43 newos6*)
43@@ -13374,14 +13371,13 @@ _LT_EOF 44@@ -13392,14 +13389,13 @@ _LT_EOF
44 fi 45 fi
45 ;; 46 ;;
46  47
47- netbsd* | netbsdelf*-gnu) 48- netbsd* | netbsdelf*-gnu)
48- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then 49- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
49- archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 50- archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
50- wlarc= 51- wlarc=
51- else 52- else
52- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' 53- archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
53- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' 54- archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
54- fi 55- fi
55+ netbsd* | netbsdelf*-gnu | minix*) 56+ netbsd* | netbsdelf*-gnu | minix*)
56+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 57+ archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
57+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 58+ archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
58+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir' 59+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
59+ hardcode_direct=yes 60+ hardcode_direct=yes
60+ hardcode_shlibpath_var=no 61+ hardcode_shlibpath_var=no
61+ output_verbose_link_cmd=func_echo_all 62+ output_verbose_link_cmd=func_echo_all
62 ;; 63 ;;
63  64
64 solaris*) 65 solaris*)
65@@ -14071,15 +14067,13 @@ printf "%s\n" "$lt_cv_irix_exported_symb 66@@ -14089,15 +14085,13 @@ printf "%s\n" "$lt_cv_irix_exported_symb
66 esac 67 esac
67 ;; 68 ;;
68  69
69- netbsd* | netbsdelf*-gnu) 70- netbsd* | netbsdelf*-gnu)
70- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then 71- if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
71- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out 72- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
72- else 73- else
73- archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF 74- archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF
74- fi 75- fi
75- hardcode_libdir_flag_spec='-R$libdir' 76- hardcode_libdir_flag_spec='-R$libdir'
76+ netbsd* | netbsdelf*-gnu | minix*) 77+ netbsd* | netbsdelf*-gnu | minix*)
77+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' 78+ archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
78+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' 79+ archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
79+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir' 80+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
80 hardcode_direct=yes 81 hardcode_direct=yes
81 hardcode_shlibpath_var=no 82 hardcode_shlibpath_var=no
82+ output_verbose_link_cmd=func_echo_all 83+ output_verbose_link_cmd=func_echo_all
83 ;; 84 ;;
84  85
85 newsos6) 86 newsos6)
86@@ -15189,6 +15183,18 @@ fi 87@@ -15207,6 +15201,18 @@ fi
87 dynamic_linker='GNU/Linux ld.so' 88 dynamic_linker='GNU/Linux ld.so'
88 ;; 89 ;;
89  90
90+minix*) 91+minix*)
91+ version_type=linux 92+ version_type=linux
92+ need_lib_prefix=no 93+ need_lib_prefix=no
93+ need_version=no 94+ need_version=no
94+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' 95+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
95+ soname_spec='${libname}${release}${shared_ext}$major' 96+ soname_spec='${libname}${release}${shared_ext}$major'
96+ dynamic_linker='Minix ld.elf_so' 97+ dynamic_linker='Minix ld.elf_so'
97+ shlibpath_var=LD_LIBRARY_PATH 98+ shlibpath_var=LD_LIBRARY_PATH
98+ shlibpath_overrides_runpath=yes 99+ shlibpath_overrides_runpath=yes
99+ hardcode_into_libs=yes 100+ hardcode_into_libs=yes
100+ ;; 101+ ;;
101+ 102+
102 netbsdelf*-gnu) 103 netbsdelf*-gnu)
103 version_type=linux 104 version_type=linux
104 need_lib_prefix=no 105 need_lib_prefix=no
105@@ -17749,7 +17755,7 @@ squeeze() { 106@@ -17767,7 +17773,7 @@ squeeze() {
106  107
107  108
108 # 109 #
109- if test "$compiler_id" != "unknown"; then 110- if test "$compiler_id" != "unknown"; then
110+ if false; then 111+ if false; then
111 # 112 #
112 tmp_save_CPPFLAGS="$CPPFLAGS" 113 tmp_save_CPPFLAGS="$CPPFLAGS"
113 tmp_save_CFLAGS="$CFLAGS" 114 tmp_save_CFLAGS="$CFLAGS"
114@@ -18004,13 +18010,6 @@ printf %s "checking if compiler accepts  115@@ -17938,7 +17944,7 @@ rm -f core conftest.err conftest.$ac_obj
 116 test "$tmp_compiler_works" = "yes"; then
 117
 118 case $host_os in
 119- darwin*) library_path_var=DYLD_LIBRARY_PATH ;;
 120+ darwin*) library_path_var=LD_LIBRARY_PATH ;;
 121 *) library_path_var=LD_LIBRARY_PATH ;;
 122 esac
 123
 124@@ -18029,13 +18035,6 @@ printf %s "checking if compiler accepts
115 tmp_options="$flags_dbg_yes" 125 tmp_options="$flags_dbg_yes"
116 fi 126 fi
117 # 127 #
118- if test "$flags_prefer_cppflags" = "yes"; then 128- if test "$flags_prefer_cppflags" = "yes"; then
119- CPPFLAGS="$tmp_CPPFLAGS $tmp_options" 129- CPPFLAGS="$tmp_CPPFLAGS $tmp_options"
120- CFLAGS="$tmp_CFLAGS" 130- CFLAGS="$tmp_CFLAGS"
121- else 131- else
122- CPPFLAGS="$tmp_CPPFLAGS" 132- CPPFLAGS="$tmp_CPPFLAGS"
123- CFLAGS="$tmp_CFLAGS $tmp_options" 133- CFLAGS="$tmp_CFLAGS $tmp_options"
124- fi 134- fi
125 squeeze CPPFLAGS 135 squeeze CPPFLAGS
126 squeeze CFLAGS 136 squeeze CFLAGS
127 fi 137 fi
128@@ -20667,7 +20666,7 @@ printf "%s\n" "no" >&6; } 138@@ -18226,7 +18225,7 @@ rm -f core conftest.err conftest.$ac_obj
 139 test "$tmp_compiler_works" = "yes"; then
 140
 141 case $host_os in
 142- darwin*) library_path_var=DYLD_LIBRARY_PATH ;;
 143+ darwin*) library_path_var=LD_LIBRARY_PATH ;;
 144 *) library_path_var=LD_LIBRARY_PATH ;;
 145 esac
 146
 147@@ -19672,7 +19671,7 @@ rm -f core conftest.err conftest.$ac_obj
 148 test "$tmp_compiler_works" = "yes"; then
 149
 150 case $host_os in
 151- darwin*) library_path_var=DYLD_LIBRARY_PATH ;;
 152+ darwin*) library_path_var=LD_LIBRARY_PATH ;;
 153 *) library_path_var=LD_LIBRARY_PATH ;;
 154 esac
 155
 156@@ -20704,7 +20703,7 @@ printf "%s\n" "no" >&6; }
129 tst_cflags="no" 157 tst_cflags="no"
130 case $host_os in 158 case $host_os in
131 darwin*) 159 darwin*)
132- tst_cflags="yes" 160- tst_cflags="yes"
133+ tst_cflags="no" 161+ tst_cflags="no"
134 ;; 162 ;;
135 esac 163 esac
136  164
137@@ -24729,7 +24728,7 @@ printf "%s\n" "found" >&6; } 165@@ -22521,7 +22520,7 @@ printf "%s\n" "$curl_cv_gclk_LIBS" >&6;
 166 printf %s "checking if monotonic clock_gettime works... " >&6; }
 167
 168 case $host_os in
 169- darwin*) library_path_var=DYLD_LIBRARY_PATH ;;
 170+ darwin*) library_path_var=LD_LIBRARY_PATH ;;
 171 *) library_path_var=LD_LIBRARY_PATH ;;
 172 esac
 173
 174@@ -24231,7 +24230,7 @@ fi
 175 printf %s "checking if argv can be written to... " >&6; }
 176
 177 case $host_os in
 178- darwin*) library_path_var=DYLD_LIBRARY_PATH ;;
 179+ darwin*) library_path_var=LD_LIBRARY_PATH ;;
 180 *) library_path_var=LD_LIBRARY_PATH ;;
 181 esac
 182
 183@@ -24783,7 +24782,7 @@ printf "%s\n" "found" >&6; }
138 LIBS="-lgss $LIBS" 184 LIBS="-lgss $LIBS"
139 ;; 185 ;;
140 *) 186 *)
141- LIBS="-lgssapi $LIBS" 187- LIBS="-lgssapi $LIBS"
142+ LIBS="-lgssapi -lkrb5 $LIBS" 188+ LIBS="-lgssapi -lkrb5 $LIBS"
143 ;; 189 ;;
144 esac 190 esac
145 fi 191 fi
 192@@ -33995,7 +33994,7 @@ printf "%s\n" "#define HAVE_STRUCT_TIMEV
 193 printf %s "checking run-time libs availability... " >&6; }
 194
 195 case $host_os in
 196- darwin*) library_path_var=DYLD_LIBRARY_PATH ;;
 197+ darwin*) library_path_var=LD_LIBRARY_PATH ;;
 198 *) library_path_var=LD_LIBRARY_PATH ;;
 199 esac
 200
 201@@ -34459,7 +34458,7 @@ fi
 202 printf %s "checking if time_t is unsigned... " >&6; }
 203
 204 case $host_os in
 205- darwin*) library_path_var=DYLD_LIBRARY_PATH ;;
 206+ darwin*) library_path_var=LD_LIBRARY_PATH ;;
 207 *) library_path_var=LD_LIBRARY_PATH ;;
 208 esac
 209
 210@@ -37487,7 +37486,7 @@ rm -f core conftest.err conftest.$ac_obj
 211 printf %s "checking if getaddrinfo seems to work... " >&6; }
 212
 213 case $host_os in
 214- darwin*) library_path_var=DYLD_LIBRARY_PATH ;;
 215+ darwin*) library_path_var=LD_LIBRARY_PATH ;;
 216 *) library_path_var=LD_LIBRARY_PATH ;;
 217 esac
 218
 219@@ -38994,7 +38993,7 @@ rm -f core conftest.err conftest.$ac_obj
 220 printf %s "checking if getifaddrs seems to work... " >&6; }
 221
 222 case $host_os in
 223- darwin*) library_path_var=DYLD_LIBRARY_PATH ;;
 224+ darwin*) library_path_var=LD_LIBRARY_PATH ;;
 225 *) library_path_var=LD_LIBRARY_PATH ;;
 226 esac
 227
 228@@ -39239,7 +39238,7 @@ rm -f core conftest.err conftest.$ac_obj
 229 printf %s "checking if gmtime_r seems to work... " >&6; }
 230
 231 case $host_os in
 232- darwin*) library_path_var=DYLD_LIBRARY_PATH ;;
 233+ darwin*) library_path_var=LD_LIBRARY_PATH ;;
 234 *) library_path_var=LD_LIBRARY_PATH ;;
 235 esac
 236
 237@@ -39507,7 +39506,7 @@ rm -f core conftest.err conftest.$ac_obj
 238 printf %s "checking if inet_ntop seems to work... " >&6; }
 239
 240 case $host_os in
 241- darwin*) library_path_var=DYLD_LIBRARY_PATH ;;
 242+ darwin*) library_path_var=LD_LIBRARY_PATH ;;
 243 *) library_path_var=LD_LIBRARY_PATH ;;
 244 esac
 245
 246@@ -39767,7 +39766,7 @@ rm -f core conftest.err conftest.$ac_obj
 247 printf %s "checking if inet_pton seems to work... " >&6; }
 248
 249 case $host_os in
 250- darwin*) library_path_var=DYLD_LIBRARY_PATH ;;
 251+ darwin*) library_path_var=LD_LIBRARY_PATH ;;
 252 *) library_path_var=LD_LIBRARY_PATH ;;
 253 esac
 254
 255@@ -40813,7 +40812,7 @@ rm -f core conftest.err conftest.$ac_obj
 256 printf %s "checking if localtime_r seems to work... " >&6; }
 257
 258 case $host_os in
 259- darwin*) library_path_var=DYLD_LIBRARY_PATH ;;
 260+ darwin*) library_path_var=LD_LIBRARY_PATH ;;
 261 *) library_path_var=LD_LIBRARY_PATH ;;
 262 esac
 263
 264@@ -41218,7 +41217,7 @@ rm -f core conftest.err conftest.$ac_obj
 265 printf %s "checking if poll seems to work... " >&6; }
 266
 267 case $host_os in
 268- darwin*) library_path_var=DYLD_LIBRARY_PATH ;;
 269+ darwin*) library_path_var=LD_LIBRARY_PATH ;;
 270 *) library_path_var=LD_LIBRARY_PATH ;;
 271 esac
 272
 273@@ -43169,7 +43168,7 @@ printf "%s\n" "yes" >&6; }
 274 printf %s "checking if strerror_r seems to work... " >&6; }
 275
 276 case $host_os in
 277- darwin*) library_path_var=DYLD_LIBRARY_PATH ;;
 278+ darwin*) library_path_var=LD_LIBRARY_PATH ;;
 279 *) library_path_var=LD_LIBRARY_PATH ;;
 280 esac
 281
 282@@ -43285,7 +43284,7 @@ printf "%s\n" "yes" >&6; }
 283 printf %s "checking if strerror_r seems to work... " >&6; }
 284
 285 case $host_os in
 286- darwin*) library_path_var=DYLD_LIBRARY_PATH ;;
 287+ darwin*) library_path_var=LD_LIBRARY_PATH ;;
 288 *) library_path_var=LD_LIBRARY_PATH ;;
 289 esac
 290