1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
|
$NetBSD: patch-ac,v 1.1 2015/12/09 21:00:47 asau Exp $
Post-release fix:
commit d077473517d2f5d62a297037b466826b4f0d7d11
check for GC_get_thr_restart_signal only on threaded build
--- src/aclocal.m4.orig
+++ src/aclocal.m4
@@ -935,12 +935,12 @@ if test "${enable_boehm}" = auto -o "${enable_boehm}" = system; then
dnl Try first with the prebuilt versions, if installed and accessible
dnl
system_boehm=yes
- AC_CHECK_LIB( [gc], [GC_get_thr_restart_signal],
- [], [system_boehm="no"] )
if test "${enable_threads}" = no; then
AC_CHECK_LIB( [gc], [GC_malloc],
[], [system_boehm="no"] )
else
+ AC_CHECK_LIB( [gc], [GC_get_thr_restart_signal],
+ [], [system_boehm="no"] )
AC_CHECK_LIB( [gc], [GC_register_my_thread],
[], [system_boehm="no"] )
fi
--- src/configure.orig
+++ src/configure
@@ -5841,9 +5841,10 @@ case "${enable_boehm}" in
esac
if test "${enable_boehm}" = auto -o "${enable_boehm}" = system; then
system_boehm=yes
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GC_get_thr_restart_signal in -lgc" >&5
-$as_echo_n "checking for GC_get_thr_restart_signal in -lgc... " >&6; }
-if ${ac_cv_lib_gc_GC_get_thr_restart_signal+:} false; then :
+ if test "${enable_threads}" = no; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GC_malloc in -lgc" >&5
+$as_echo_n "checking for GC_malloc in -lgc... " >&6; }
+if ${ac_cv_lib_gc_GC_malloc+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -5857,27 +5858,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char GC_get_thr_restart_signal ();
+char GC_malloc ();
int
main ()
{
-return GC_get_thr_restart_signal ();
+return GC_malloc ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_gc_GC_get_thr_restart_signal=yes
+ ac_cv_lib_gc_GC_malloc=yes
else
- ac_cv_lib_gc_GC_get_thr_restart_signal=no
+ ac_cv_lib_gc_GC_malloc=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gc_GC_get_thr_restart_signal" >&5
-$as_echo "$ac_cv_lib_gc_GC_get_thr_restart_signal" >&6; }
-if test "x$ac_cv_lib_gc_GC_get_thr_restart_signal" = xyes; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gc_GC_malloc" >&5
+$as_echo "$ac_cv_lib_gc_GC_malloc" >&6; }
+if test "x$ac_cv_lib_gc_GC_malloc" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBGC 1
_ACEOF
@@ -5888,10 +5889,10 @@ else
system_boehm="no"
fi
- if test "${enable_threads}" = no; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GC_malloc in -lgc" >&5
-$as_echo_n "checking for GC_malloc in -lgc... " >&6; }
-if ${ac_cv_lib_gc_GC_malloc+:} false; then :
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GC_get_thr_restart_signal in -lgc" >&5
+$as_echo_n "checking for GC_get_thr_restart_signal in -lgc... " >&6; }
+if ${ac_cv_lib_gc_GC_get_thr_restart_signal+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -5905,27 +5906,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
-char GC_malloc ();
+char GC_get_thr_restart_signal ();
int
main ()
{
-return GC_malloc ();
+return GC_get_thr_restart_signal ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_gc_GC_malloc=yes
+ ac_cv_lib_gc_GC_get_thr_restart_signal=yes
else
- ac_cv_lib_gc_GC_malloc=no
+ ac_cv_lib_gc_GC_get_thr_restart_signal=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gc_GC_malloc" >&5
-$as_echo "$ac_cv_lib_gc_GC_malloc" >&6; }
-if test "x$ac_cv_lib_gc_GC_malloc" = xyes; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gc_GC_get_thr_restart_signal" >&5
+$as_echo "$ac_cv_lib_gc_GC_get_thr_restart_signal" >&6; }
+if test "x$ac_cv_lib_gc_GC_get_thr_restart_signal" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBGC 1
_ACEOF
@@ -5936,7 +5937,6 @@ else
system_boehm="no"
fi
- else
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GC_register_my_thread in -lgc" >&5
$as_echo_n "checking for GC_register_my_thread in -lgc... " >&6; }
if ${ac_cv_lib_gc_GC_register_my_thread+:} false; then :
|
