Skip to content

Commit 39f7d2f

Browse files
author
Erlend Egeberg Aasland
authored
bpo-45847: Port _lfprof, _opcode, _asyncio, _queue, _statistics, and _typing to PY_STDLIB_MOD_SIMPLE (GH-29690)
Automerge-Triggered-By: GH:tiran
1 parent 512dbf6 commit 39f7d2f

File tree

4 files changed

+184
-58
lines changed

4 files changed

+184
-58
lines changed

‎Modules/Setup.stdlib.in‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,23 @@
2929
############################################################################
3030
# Modules that should always be present (POSIX and Windows):
3131
@MODULE_ARRAY_TRUE@array arraymodule.c
32+
@MODULE__ASYNCIO_TRUE@_asyncio _asynciomodule.c
3233
@MODULE__BISECT_TRUE@_bisect _bisectmodule.c
3334
@MODULE__CONTEXTVARS_TRUE@_contextvars _contextvarsmodule.c
3435
@MODULE__HEAPQ_TRUE@_heapq _heapqmodule.c
3536
@MODULE__JSON_TRUE@_json _json.c
37+
@MODULE__LSPROF_TRUE@_lsprof _lsprof.c rotatingtree.c
38+
@MODULE__OPCODE_TRUE@_opcode _opcode.c
3639
@MODULE__PICKLE_TRUE@_pickle _pickle.c
40+
@MODULE__QUEUE_TRUE@_queue _queuemodule.c
3741
@MODULE__RANDOM_TRUE@_random _randommodule.c
42+
@MODULE__TYPING_TRUE@_typing _typingmodule.c
3843
@MODULE__ZONEINFO_TRUE@_zoneinfo _zoneinfo.c
3944

4045
# needs libm
4146
@MODULE_MATH_TRUE@math mathmodule.c
4247
@MODULE_CMATH_TRUE@cmath cmathmodule.c
48+
@MODULE__STATISTICS_TRUE@_statistics _statisticsmodule.c
4349

4450
# needs libm and on some platforms librt
4551
@MODULE__DATETIME_TRUE@_datetime _datetimemodule.c

‎configure‎

Lines changed: 157 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -688,26 +688,38 @@ MODULE_OSSAUDIODEV_FALSE
688688
MODULE_OSSAUDIODEV_TRUE
689689
MODULE_GRP_FALSE
690690
MODULE_GRP_TRUE
691+
MODULE__DATETIME_FALSE
692+
MODULE__DATETIME_TRUE
693+
MODULE_MATH_FALSE
694+
MODULE_MATH_TRUE
695+
MODULE_CMATH_FALSE
696+
MODULE_CMATH_TRUE
697+
MODULE__STATISTICS_FALSE
698+
MODULE__STATISTICS_TRUE
691699
MODULE__ZONEINFO_FALSE
692700
MODULE__ZONEINFO_TRUE
701+
MODULE__TYPING_FALSE
702+
MODULE__TYPING_TRUE
693703
MODULE__RANDOM_FALSE
694704
MODULE__RANDOM_TRUE
705+
MODULE__QUEUE_FALSE
706+
MODULE__QUEUE_TRUE
695707
MODULE__PICKLE_FALSE
696708
MODULE__PICKLE_TRUE
697-
MODULE_MATH_FALSE
698-
MODULE_MATH_TRUE
709+
MODULE__OPCODE_FALSE
710+
MODULE__OPCODE_TRUE
711+
MODULE__LSPROF_FALSE
712+
MODULE__LSPROF_TRUE
699713
MODULE__JSON_FALSE
700714
MODULE__JSON_TRUE
701715
MODULE__HEAPQ_FALSE
702716
MODULE__HEAPQ_TRUE
703-
MODULE__DATETIME_FALSE
704-
MODULE__DATETIME_TRUE
705717
MODULE__CONTEXTVARS_FALSE
706718
MODULE__CONTEXTVARS_TRUE
707-
MODULE_CMATH_FALSE
708-
MODULE_CMATH_TRUE
709719
MODULE__BISECT_FALSE
710720
MODULE__BISECT_TRUE
721+
MODULE__ASYNCIO_FALSE
722+
MODULE__ASYNCIO_TRUE
711723
MODULE_ARRAY_FALSE
712724
MODULE_ARRAY_TRUE
713725
MODULE_TIME_FALSE
@@ -19599,29 +19611,27 @@ fi
1959919611

1960019612

1960119613
if true; then
19602-
MODULE__BISECT_TRUE=
19603-
MODULE__BISECT_FALSE='#'
19614+
MODULE__ASYNCIO_TRUE=
19615+
MODULE__ASYNCIO_FALSE='#'
1960419616
else
19605-
MODULE__BISECT_TRUE='#'
19606-
MODULE__BISECT_FALSE=
19617+
MODULE__ASYNCIO_TRUE='#'
19618+
MODULE__ASYNCIO_FALSE=
1960719619
fi
1960819620

1960919621

1961019622

1961119623

1961219624

1961319625
if true; then
19614-
MODULE_CMATH_TRUE=
19615-
MODULE_CMATH_FALSE='#'
19626+
MODULE__BISECT_TRUE=
19627+
MODULE__BISECT_FALSE='#'
1961619628
else
19617-
MODULE_CMATH_TRUE='#'
19618-
MODULE_CMATH_FALSE=
19629+
MODULE__BISECT_TRUE='#'
19630+
MODULE__BISECT_FALSE=
1961919631
fi
1962019632

1962119633

1962219634

19623-
as_fn_append MODULE_BLOCK "MODULE_CMATH_LDFLAGS=$LIBM$as_nl"
19624-
1962519635

1962619636

1962719637
if true; then
@@ -19636,20 +19646,6 @@ fi
1963619646

1963719647

1963819648

19639-
if true; then
19640-
MODULE__DATETIME_TRUE=
19641-
MODULE__DATETIME_FALSE='#'
19642-
else
19643-
MODULE__DATETIME_TRUE='#'
19644-
MODULE__DATETIME_FALSE=
19645-
fi
19646-
19647-
19648-
19649-
as_fn_append MODULE_BLOCK "MODULE__DATETIME_LDFLAGS=$TIMEMODULE_LIB $LIBM$as_nl"
19650-
19651-
19652-
1965319649
if true; then
1965419650
MODULE__HEAPQ_TRUE=
1965519651
MODULE__HEAPQ_FALSE='#'
@@ -19675,16 +19671,26 @@ fi
1967519671

1967619672

1967719673
if true; then
19678-
MODULE_MATH_TRUE=
19679-
MODULE_MATH_FALSE='#'
19674+
MODULE__LSPROF_TRUE=
19675+
MODULE__LSPROF_FALSE='#'
1968019676
else
19681-
MODULE_MATH_TRUE='#'
19682-
MODULE_MATH_FALSE=
19677+
MODULE__LSPROF_TRUE='#'
19678+
MODULE__LSPROF_FALSE=
1968319679
fi
1968419680

1968519681

1968619682

19687-
as_fn_append MODULE_BLOCK "MODULE_MATH_LDFLAGS=$LIBM$as_nl"
19683+
19684+
19685+
if true; then
19686+
MODULE__OPCODE_TRUE=
19687+
MODULE__OPCODE_FALSE='#'
19688+
else
19689+
MODULE__OPCODE_TRUE='#'
19690+
MODULE__OPCODE_FALSE=
19691+
fi
19692+
19693+
1968819694

1968919695

1969019696

@@ -19700,6 +19706,18 @@ fi
1970019706

1970119707

1970219708

19709+
if true; then
19710+
MODULE__QUEUE_TRUE=
19711+
MODULE__QUEUE_FALSE='#'
19712+
else
19713+
MODULE__QUEUE_TRUE='#'
19714+
MODULE__QUEUE_FALSE=
19715+
fi
19716+
19717+
19718+
19719+
19720+
1970319721
if true; then
1970419722
MODULE__RANDOM_TRUE=
1970519723
MODULE__RANDOM_FALSE='#'
@@ -19712,6 +19730,18 @@ fi
1971219730

1971319731

1971419732

19733+
if true; then
19734+
MODULE__TYPING_TRUE=
19735+
MODULE__TYPING_FALSE='#'
19736+
else
19737+
MODULE__TYPING_TRUE='#'
19738+
MODULE__TYPING_FALSE=
19739+
fi
19740+
19741+
19742+
19743+
19744+
1971519745
if true; then
1971619746
MODULE__ZONEINFO_TRUE=
1971719747
MODULE__ZONEINFO_FALSE='#'
@@ -19725,6 +19755,64 @@ fi
1972519755

1972619756

1972719757

19758+
if true; then
19759+
MODULE__STATISTICS_TRUE=
19760+
MODULE__STATISTICS_FALSE='#'
19761+
else
19762+
MODULE__STATISTICS_TRUE='#'
19763+
MODULE__STATISTICS_FALSE=
19764+
fi
19765+
19766+
19767+
19768+
as_fn_append MODULE_BLOCK "MODULE__STATISTICS_LDFLAGS=$LIBM$as_nl"
19769+
19770+
19771+
19772+
if true; then
19773+
MODULE_CMATH_TRUE=
19774+
MODULE_CMATH_FALSE='#'
19775+
else
19776+
MODULE_CMATH_TRUE='#'
19777+
MODULE_CMATH_FALSE=
19778+
fi
19779+
19780+
19781+
19782+
as_fn_append MODULE_BLOCK "MODULE_CMATH_LDFLAGS=$LIBM$as_nl"
19783+
19784+
19785+
19786+
if true; then
19787+
MODULE_MATH_TRUE=
19788+
MODULE_MATH_FALSE='#'
19789+
else
19790+
MODULE_MATH_TRUE='#'
19791+
MODULE_MATH_FALSE=
19792+
fi
19793+
19794+
19795+
19796+
as_fn_append MODULE_BLOCK "MODULE_MATH_LDFLAGS=$LIBM$as_nl"
19797+
19798+
19799+
19800+
19801+
if true; then
19802+
MODULE__DATETIME_TRUE=
19803+
MODULE__DATETIME_FALSE='#'
19804+
else
19805+
MODULE__DATETIME_TRUE='#'
19806+
MODULE__DATETIME_FALSE=
19807+
fi
19808+
19809+
19810+
19811+
as_fn_append MODULE_BLOCK "MODULE__DATETIME_LDFLAGS=$TIMEMODULE_LIB $LIBM$as_nl"
19812+
19813+
19814+
19815+
1972819816
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdlib extension module grp" >&5
1972919817
$as_echo_n "checking for stdlib extension module grp... " >&6; }
1973019818
case $py_stdlib_not_available in #(
@@ -20893,22 +20981,18 @@ if test -z "${MODULE_ARRAY_TRUE}" && test -z "${MODULE_ARRAY_FALSE}"; then
2089320981
as_fn_error $? "conditional \"MODULE_ARRAY\" was never defined.
2089420982
Usually this means the macro was only invoked conditionally." "$LINENO" 5
2089520983
fi
20896-
if test -z "${MODULE__BISECT_TRUE}" && test -z "${MODULE__BISECT_FALSE}"; then
20897-
as_fn_error $? "conditional \"MODULE__BISECT\" was never defined.
20984+
if test -z "${MODULE__ASYNCIO_TRUE}" && test -z "${MODULE__ASYNCIO_FALSE}"; then
20985+
as_fn_error $? "conditional \"MODULE__ASYNCIO\" was never defined.
2089820986
Usually this means the macro was only invoked conditionally." "$LINENO" 5
2089920987
fi
20900-
if test -z "${MODULE_CMATH_TRUE}" && test -z "${MODULE_CMATH_FALSE}"; then
20901-
as_fn_error $? "conditional \"MODULE_CMATH\" was never defined.
20988+
if test -z "${MODULE__BISECT_TRUE}" && test -z "${MODULE__BISECT_FALSE}"; then
20989+
as_fn_error $? "conditional \"MODULE__BISECT\" was never defined.
2090220990
Usually this means the macro was only invoked conditionally." "$LINENO" 5
2090320991
fi
2090420992
if test -z "${MODULE__CONTEXTVARS_TRUE}" && test -z "${MODULE__CONTEXTVARS_FALSE}"; then
2090520993
as_fn_error $? "conditional \"MODULE__CONTEXTVARS\" was never defined.
2090620994
Usually this means the macro was only invoked conditionally." "$LINENO" 5
2090720995
fi
20908-
if test -z "${MODULE__DATETIME_TRUE}" && test -z "${MODULE__DATETIME_FALSE}"; then
20909-
as_fn_error $? "conditional \"MODULE__DATETIME\" was never defined.
20910-
Usually this means the macro was only invoked conditionally." "$LINENO" 5
20911-
fi
2091220996
if test -z "${MODULE__HEAPQ_TRUE}" && test -z "${MODULE__HEAPQ_FALSE}"; then
2091320997
as_fn_error $? "conditional \"MODULE__HEAPQ\" was never defined.
2091420998
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -20917,22 +21001,50 @@ if test -z "${MODULE__JSON_TRUE}" && test -z "${MODULE__JSON_FALSE}"; then
2091721001
as_fn_error $? "conditional \"MODULE__JSON\" was never defined.
2091821002
Usually this means the macro was only invoked conditionally." "$LINENO" 5
2091921003
fi
20920-
if test -z "${MODULE_MATH_TRUE}" && test -z "${MODULE_MATH_FALSE}"; then
20921-
as_fn_error $? "conditional \"MODULE_MATH\" was never defined.
21004+
if test -z "${MODULE__LSPROF_TRUE}" && test -z "${MODULE__LSPROF_FALSE}"; then
21005+
as_fn_error $? "conditional \"MODULE__LSPROF\" was never defined.
21006+
Usually this means the macro was only invoked conditionally." "$LINENO" 5
21007+
fi
21008+
if test -z "${MODULE__OPCODE_TRUE}" && test -z "${MODULE__OPCODE_FALSE}"; then
21009+
as_fn_error $? "conditional \"MODULE__OPCODE\" was never defined.
2092221010
Usually this means the macro was only invoked conditionally." "$LINENO" 5
2092321011
fi
2092421012
if test -z "${MODULE__PICKLE_TRUE}" && test -z "${MODULE__PICKLE_FALSE}"; then
2092521013
as_fn_error $? "conditional \"MODULE__PICKLE\" was never defined.
2092621014
Usually this means the macro was only invoked conditionally." "$LINENO" 5
2092721015
fi
21016+
if test -z "${MODULE__QUEUE_TRUE}" && test -z "${MODULE__QUEUE_FALSE}"; then
21017+
as_fn_error $? "conditional \"MODULE__QUEUE\" was never defined.
21018+
Usually this means the macro was only invoked conditionally." "$LINENO" 5
21019+
fi
2092821020
if test -z "${MODULE__RANDOM_TRUE}" && test -z "${MODULE__RANDOM_FALSE}"; then
2092921021
as_fn_error $? "conditional \"MODULE__RANDOM\" was never defined.
2093021022
Usually this means the macro was only invoked conditionally." "$LINENO" 5
2093121023
fi
21024+
if test -z "${MODULE__TYPING_TRUE}" && test -z "${MODULE__TYPING_FALSE}"; then
21025+
as_fn_error $? "conditional \"MODULE__TYPING\" was never defined.
21026+
Usually this means the macro was only invoked conditionally." "$LINENO" 5
21027+
fi
2093221028
if test -z "${MODULE__ZONEINFO_TRUE}" && test -z "${MODULE__ZONEINFO_FALSE}"; then
2093321029
as_fn_error $? "conditional \"MODULE__ZONEINFO\" was never defined.
2093421030
Usually this means the macro was only invoked conditionally." "$LINENO" 5
2093521031
fi
21032+
if test -z "${MODULE__STATISTICS_TRUE}" && test -z "${MODULE__STATISTICS_FALSE}"; then
21033+
as_fn_error $? "conditional \"MODULE__STATISTICS\" was never defined.
21034+
Usually this means the macro was only invoked conditionally." "$LINENO" 5
21035+
fi
21036+
if test -z "${MODULE_CMATH_TRUE}" && test -z "${MODULE_CMATH_FALSE}"; then
21037+
as_fn_error $? "conditional \"MODULE_CMATH\" was never defined.
21038+
Usually this means the macro was only invoked conditionally." "$LINENO" 5
21039+
fi
21040+
if test -z "${MODULE_MATH_TRUE}" && test -z "${MODULE_MATH_FALSE}"; then
21041+
as_fn_error $? "conditional \"MODULE_MATH\" was never defined.
21042+
Usually this means the macro was only invoked conditionally." "$LINENO" 5
21043+
fi
21044+
if test -z "${MODULE__DATETIME_TRUE}" && test -z "${MODULE__DATETIME_FALSE}"; then
21045+
as_fn_error $? "conditional \"MODULE__DATETIME\" was never defined.
21046+
Usually this means the macro was only invoked conditionally." "$LINENO" 5
21047+
fi
2093621048
if test -z "${MODULE_GRP_TRUE}" && test -z "${MODULE_GRP_FALSE}"; then
2093721049
as_fn_error $? "conditional \"MODULE_GRP\" was never defined.
2093821050
Usually this means the macro was only invoked conditionally." "$LINENO" 5

‎configure.ac‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6076,17 +6076,27 @@ PY_STDLIB_MOD_SIMPLE([time], [], [$TIMEMODULE_LIB])
60766076

60776077
dnl always enabled extension modules
60786078
PY_STDLIB_MOD_SIMPLE([array])
6079+
PY_STDLIB_MOD_SIMPLE([_asyncio])
60796080
PY_STDLIB_MOD_SIMPLE([_bisect])
6080-
PY_STDLIB_MOD_SIMPLE([cmath], [], [$LIBM])
60816081
PY_STDLIB_MOD_SIMPLE([_contextvars])
6082-
PY_STDLIB_MOD_SIMPLE([_datetime], [], [$TIMEMODULE_LIB $LIBM])
60836082
PY_STDLIB_MOD_SIMPLE([_heapq])
60846083
PY_STDLIB_MOD_SIMPLE([_json])
6085-
PY_STDLIB_MOD_SIMPLE([math], [], [$LIBM])
6084+
PY_STDLIB_MOD_SIMPLE([_lsprof])
6085+
PY_STDLIB_MOD_SIMPLE([_opcode])
60866086
PY_STDLIB_MOD_SIMPLE([_pickle])
6087+
PY_STDLIB_MOD_SIMPLE([_queue])
60876088
PY_STDLIB_MOD_SIMPLE([_random])
6089+
PY_STDLIB_MOD_SIMPLE([_typing])
60886090
PY_STDLIB_MOD_SIMPLE([_zoneinfo])
60896091

6092+
dnl needs libm
6093+
PY_STDLIB_MOD_SIMPLE([_statistics], [], [$LIBM])
6094+
PY_STDLIB_MOD_SIMPLE([cmath], [], [$LIBM])
6095+
PY_STDLIB_MOD_SIMPLE([math], [], [$LIBM])
6096+
6097+
dnl needs libm and on some platforms librt
6098+
PY_STDLIB_MOD_SIMPLE([_datetime], [], [$TIMEMODULE_LIB $LIBM])
6099+
60906100
dnl platform specific extensions
60916101
PY_STDLIB_MOD([grp], [], [test "$ac_cv_func_getgrgid" = yes -o "$ac_cv_func_getgrgid_r" = yes])
60926102
PY_STDLIB_MOD([ossaudiodev],

0 commit comments

Comments
 (0)