Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 3c1928a

Browse files
ronaldoussorenronaldoussoren
committed
Merged revisions 76403 via svnmerge from
svn+ssh://[email protected]/python/trunk ........ r76403 | ronald.oussoren | 2009-11-19 17:25:21 +0100 (Thu, 19 Nov 2009) | 14 lines Fix for issue #7085 On MacOSX 10.6 the CoreFoundation framework must be initialized on the main thread, the constructor function in that framework will cause an SIGABRT when it is called on any other thread. Because a number of extension link (indirectly) to CoreFoundation and the Python core itself didn't the interpreter crashed when importing some extensions, such as _locale, on a secondary thread. This fix ensures that Python is linked to CoreFoundation on OSX, which results in the CoreFoundation constructor being called when Python is loaded. This does not require code changes. ........
1 parent 26afd48 commit 3c1928a

3 files changed

Lines changed: 27 additions & 16 deletions

File tree

‎Misc/NEWS‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ What's New in Python 3.2 Alpha 1?
1212
Core and Builtins
1313
-----------------
1414

15+
- Issue #7085: Fix crash when importing some extensions in a thread
16+
on MacOSX 10.6.
17+
1518
- Issue #1757126: Fix the cyrillic-asian alias for the ptcp154 encoding.
1619

1720
- Issue #6970: Remove redundant calls when comparing objects that don't

‎configure‎

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#! /bin/sh
2-
# From configure.in Revision: 76301 .
2+
# From configure.in Revision: 76328 .
33
# Guess values for system-dependent variables and create Makefiles.
44
# Generated by GNU Autoconf 2.61 for python 3.2.
55
#
@@ -3800,7 +3800,7 @@ else
38003800
{ echo "$as_me:$LINENO: result: no" >&5
38013801
echo "${ECHO_T}no" >&6; }
38023802
fi
3803-
rm -f conftest*
3803+
rm -f -r conftest*
38043804

38053805

38063806

@@ -5338,7 +5338,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
53385338
else
53395339
ac_cv_header_stdc=no
53405340
fi
5341-
rm -f conftest*
5341+
rm -f -r conftest*
53425342

53435343
fi
53445344

@@ -5359,7 +5359,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
53595359
else
53605360
ac_cv_header_stdc=no
53615361
fi
5362-
rm -f conftest*
5362+
rm -f -r conftest*
53635363

53645364
fi
53655365

@@ -6457,7 +6457,7 @@ _ACEOF
64576457

64586458

64596459
fi
6460-
rm -f conftest*
6460+
rm -f -r conftest*
64616461

64626462
{ echo "$as_me:$LINENO: result: $was_it_defined" >&5
64636463
echo "${ECHO_T}$was_it_defined" >&6; }
@@ -6987,7 +6987,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
69876987
else
69886988
ac_cv_type_uid_t=no
69896989
fi
6990-
rm -f conftest*
6990+
rm -f -r conftest*
69916991

69926992
fi
69936993
{ echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5
@@ -15529,7 +15529,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
1552915529
else
1553015530
unistd_defines_pthreads=no
1553115531
fi
15532-
rm -f conftest*
15532+
rm -f -r conftest*
1553315533

1553415534
{ echo "$as_me:$LINENO: result: $unistd_defines_pthreads" >&5
1553515535
echo "${ECHO_T}$unistd_defines_pthreads" >&6; }
@@ -16827,7 +16827,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
1682716827
$EGREP "yes" >/dev/null 2>&1; then
1682816828
ipv6type=$i
1682916829
fi
16830-
rm -f conftest*
16830+
rm -f -r conftest*
1683116831

1683216832
;;
1683316833
kame)
@@ -16850,7 +16850,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
1685016850
ipv6libdir=/usr/local/v6/lib
1685116851
ipv6trylibc=yes
1685216852
fi
16853-
rm -f conftest*
16853+
rm -f -r conftest*
1685416854

1685516855
;;
1685616856
linux-glibc)
@@ -16871,7 +16871,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
1687116871
ipv6type=$i;
1687216872
ipv6trylibc=yes
1687316873
fi
16874-
rm -f conftest*
16874+
rm -f -r conftest*
1687516875

1687616876
;;
1687716877
linux-inet6)
@@ -16909,7 +16909,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
1690916909
ipv6lib=inet6;
1691016910
ipv6libdir=/usr/local/v6/lib
1691116911
fi
16912-
rm -f conftest*
16912+
rm -f -r conftest*
1691316913

1691416914
;;
1691516915
v6d)
@@ -16932,7 +16932,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
1693216932
ipv6libdir=/usr/local/v6/lib;
1693316933
BASECFLAGS="-I/usr/local/v6/include $BASECFLAGS"
1693416934
fi
16935-
rm -f conftest*
16935+
rm -f -r conftest*
1693616936

1693716937
;;
1693816938
zeta)
@@ -16954,7 +16954,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
1695416954
ipv6lib=inet6;
1695516955
ipv6libdir=/usr/local/v6/lib
1695616956
fi
16957-
rm -f conftest*
16957+
rm -f -r conftest*
1695816958

1695916959
;;
1696016960
esac
@@ -25044,7 +25044,7 @@ cat >>confdefs.h <<\_ACEOF
2504425044
_ACEOF
2504525045

2504625046
fi
25047-
rm -f conftest*
25047+
rm -f -r conftest*
2504825048

2504925049
cat >conftest.$ac_ext <<_ACEOF
2505025050
/* confdefs.h. */
@@ -25063,7 +25063,7 @@ cat >>confdefs.h <<\_ACEOF
2506325063
_ACEOF
2506425064

2506525065
fi
25066-
rm -f conftest*
25066+
rm -f -r conftest*
2506725067

2506825068
fi
2506925069

@@ -25333,7 +25333,7 @@ cat >>confdefs.h <<\_ACEOF
2533325333
_ACEOF
2533425334

2533525335
fi
25336-
rm -f conftest*
25336+
rm -f -r conftest*
2533725337

2533825338
fi
2533925339

@@ -26411,6 +26411,10 @@ _ACEOF
2641126411

2641226412
fi
2641326413

26414+
if test $ac_sys_system = Darwin
26415+
then
26416+
LIBS="$LIBS -framework CoreFoundation"
26417+
fi
2641426418

2641526419
{ echo "$as_me:$LINENO: checking for %zd printf() format support" >&5
2641626420
echo $ECHO_N "checking for %zd printf() format support... $ECHO_C" >&6; }

‎configure.in‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3853,6 +3853,10 @@ then
38533853
[Define to printf format modifier for long long type])
38543854
fi
38553855

3856+
if test $ac_sys_system = Darwin
3857+
then
3858+
LIBS="$LIBS -framework CoreFoundation"
3859+
fi
38563860

38573861
AC_MSG_CHECKING(for %zd printf() format support)
38583862
AC_CACHE_VAL(ac_cv_have_size_t_format,

0 commit comments

Comments
 (0)