Skip to content

Commit eee683c

Browse files
author
Erlend Egeberg Aasland
authored
bpo-45847: Port audioop, _csv, and _posixsubprocess to PY_STDLIB_MOD_SIMPLE (GH-29705)
Automerge-Triggered-By: GH:tiran
1 parent c6dec7e commit eee683c

File tree

4 files changed

+56
-4
lines changed

4 files changed

+56
-4
lines changed

Modules/Setup.stdlib.in

+3
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
@MODULE__ASYNCIO_TRUE@_asyncio _asynciomodule.c
3333
@MODULE__BISECT_TRUE@_bisect _bisectmodule.c
3434
@MODULE__CONTEXTVARS_TRUE@_contextvars _contextvarsmodule.c
35+
@MODULE__CSV_TRUE@_csv _csv.c
3536
@MODULE__HEAPQ_TRUE@_heapq _heapqmodule.c
3637
@MODULE__JSON_TRUE@_json _json.c
3738
@MODULE__LSPROF_TRUE@_lsprof _lsprof.c rotatingtree.c
@@ -44,6 +45,7 @@
4445
@MODULE__ZONEINFO_TRUE@_zoneinfo _zoneinfo.c
4546

4647
# needs libm
48+
@MODULE_AUDIOOP_TRUE@audioop audioop.c
4749
@MODULE_MATH_TRUE@math mathmodule.c
4850
@MODULE_CMATH_TRUE@cmath cmathmodule.c
4951
@MODULE__STATISTICS_TRUE@_statistics _statisticsmodule.c
@@ -103,6 +105,7 @@
103105
@MODULE_NIS_TRUE@nis nismodule.c
104106
# needs sys/soundcard.h or linux/soundcard.h (Linux, FreeBSD)
105107
@MODULE_OSSAUDIODEV_TRUE@ossaudiodev ossaudiodev.c
108+
@MODULE__POSIXSUBPROCESS_TRUE@_posixsubprocess _posixsubprocess.c
106109
@MODULE_RESOURCE_TRUE@resource resource.c
107110
@MODULE_SELECT_TRUE@select selectmodule.c
108111
# AIX has shadow passwords, but does not provide getspent API

configure

+47
Original file line numberDiff line numberDiff line change
@@ -710,6 +710,8 @@ MODULE_CMATH_FALSE
710710
MODULE_CMATH_TRUE
711711
MODULE__STATISTICS_FALSE
712712
MODULE__STATISTICS_TRUE
713+
MODULE_AUDIOOP_FALSE
714+
MODULE_AUDIOOP_TRUE
713715
MODULE__ZONEINFO_FALSE
714716
MODULE__ZONEINFO_TRUE
715717
MODULE__XXSUBINTERPRETERS_FALSE
@@ -722,6 +724,8 @@ MODULE__RANDOM_FALSE
722724
MODULE__RANDOM_TRUE
723725
MODULE__QUEUE_FALSE
724726
MODULE__QUEUE_TRUE
727+
MODULE__POSIXSUBPROCESS_FALSE
728+
MODULE__POSIXSUBPROCESS_TRUE
725729
MODULE__PICKLE_FALSE
726730
MODULE__PICKLE_TRUE
727731
MODULE__OPCODE_FALSE
@@ -732,6 +736,8 @@ MODULE__JSON_FALSE
732736
MODULE__JSON_TRUE
733737
MODULE__HEAPQ_FALSE
734738
MODULE__HEAPQ_TRUE
739+
MODULE__CSV_FALSE
740+
MODULE__CSV_TRUE
735741
MODULE__CONTEXTVARS_FALSE
736742
MODULE__CONTEXTVARS_TRUE
737743
MODULE__BISECT_FALSE
@@ -20475,6 +20481,15 @@ else
2047520481
fi
2047620482
as_fn_append MODULE_BLOCK "MODULE__CONTEXTVARS=yes$as_nl"
2047720483

20484+
if true; then
20485+
MODULE__CSV_TRUE=
20486+
MODULE__CSV_FALSE='#'
20487+
else
20488+
MODULE__CSV_TRUE='#'
20489+
MODULE__CSV_FALSE=
20490+
fi
20491+
as_fn_append MODULE_BLOCK "MODULE__CSV=yes$as_nl"
20492+
2047820493
if true; then
2047920494
MODULE__HEAPQ_TRUE=
2048020495
MODULE__HEAPQ_FALSE='#'
@@ -20520,6 +20535,15 @@ else
2052020535
fi
2052120536
as_fn_append MODULE_BLOCK "MODULE__PICKLE=yes$as_nl"
2052220537

20538+
if true; then
20539+
MODULE__POSIXSUBPROCESS_TRUE=
20540+
MODULE__POSIXSUBPROCESS_FALSE='#'
20541+
else
20542+
MODULE__POSIXSUBPROCESS_TRUE='#'
20543+
MODULE__POSIXSUBPROCESS_FALSE=
20544+
fi
20545+
as_fn_append MODULE_BLOCK "MODULE__POSIXSUBPROCESS=yes$as_nl"
20546+
2052320547
if true; then
2052420548
MODULE__QUEUE_TRUE=
2052520549
MODULE__QUEUE_FALSE='#'
@@ -20575,6 +20599,17 @@ fi
2057520599
as_fn_append MODULE_BLOCK "MODULE__ZONEINFO=yes$as_nl"
2057620600

2057720601

20602+
if true; then
20603+
MODULE_AUDIOOP_TRUE=
20604+
MODULE_AUDIOOP_FALSE='#'
20605+
else
20606+
MODULE_AUDIOOP_TRUE='#'
20607+
MODULE_AUDIOOP_FALSE=
20608+
fi
20609+
as_fn_append MODULE_BLOCK "MODULE_AUDIOOP=yes$as_nl"
20610+
as_fn_append MODULE_BLOCK "MODULE_AUDIOOP_LDFLAGS=$LIBM$as_nl"
20611+
20612+
2057820613
if true; then
2057920614
MODULE__STATISTICS_TRUE=
2058020615
MODULE__STATISTICS_FALSE='#'
@@ -21936,6 +21971,10 @@ if test -z "${MODULE__CONTEXTVARS_TRUE}" && test -z "${MODULE__CONTEXTVARS_FALSE
2193621971
as_fn_error $? "conditional \"MODULE__CONTEXTVARS\" was never defined.
2193721972
Usually this means the macro was only invoked conditionally." "$LINENO" 5
2193821973
fi
21974+
if test -z "${MODULE__CSV_TRUE}" && test -z "${MODULE__CSV_FALSE}"; then
21975+
as_fn_error $? "conditional \"MODULE__CSV\" was never defined.
21976+
Usually this means the macro was only invoked conditionally." "$LINENO" 5
21977+
fi
2193921978
if test -z "${MODULE__HEAPQ_TRUE}" && test -z "${MODULE__HEAPQ_FALSE}"; then
2194021979
as_fn_error $? "conditional \"MODULE__HEAPQ\" was never defined.
2194121980
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -21956,6 +21995,10 @@ if test -z "${MODULE__PICKLE_TRUE}" && test -z "${MODULE__PICKLE_FALSE}"; then
2195621995
as_fn_error $? "conditional \"MODULE__PICKLE\" was never defined.
2195721996
Usually this means the macro was only invoked conditionally." "$LINENO" 5
2195821997
fi
21998+
if test -z "${MODULE__POSIXSUBPROCESS_TRUE}" && test -z "${MODULE__POSIXSUBPROCESS_FALSE}"; then
21999+
as_fn_error $? "conditional \"MODULE__POSIXSUBPROCESS\" was never defined.
22000+
Usually this means the macro was only invoked conditionally." "$LINENO" 5
22001+
fi
2195922002
if test -z "${MODULE__QUEUE_TRUE}" && test -z "${MODULE__QUEUE_FALSE}"; then
2196022003
as_fn_error $? "conditional \"MODULE__QUEUE\" was never defined.
2196122004
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -21980,6 +22023,10 @@ if test -z "${MODULE__ZONEINFO_TRUE}" && test -z "${MODULE__ZONEINFO_FALSE}"; th
2198022023
as_fn_error $? "conditional \"MODULE__ZONEINFO\" was never defined.
2198122024
Usually this means the macro was only invoked conditionally." "$LINENO" 5
2198222025
fi
22026+
if test -z "${MODULE_AUDIOOP_TRUE}" && test -z "${MODULE_AUDIOOP_FALSE}"; then
22027+
as_fn_error $? "conditional \"MODULE_AUDIOOP\" was never defined.
22028+
Usually this means the macro was only invoked conditionally." "$LINENO" 5
22029+
fi
2198322030
if test -z "${MODULE__STATISTICS_TRUE}" && test -z "${MODULE__STATISTICS_FALSE}"; then
2198422031
as_fn_error $? "conditional \"MODULE__STATISTICS\" was never defined.
2198522032
Usually this means the macro was only invoked conditionally." "$LINENO" 5

configure.ac

+3
Original file line numberDiff line numberDiff line change
@@ -6127,11 +6127,13 @@ PY_STDLIB_MOD_SIMPLE([array])
61276127
PY_STDLIB_MOD_SIMPLE([_asyncio])
61286128
PY_STDLIB_MOD_SIMPLE([_bisect])
61296129
PY_STDLIB_MOD_SIMPLE([_contextvars])
6130+
PY_STDLIB_MOD_SIMPLE([_csv])
61306131
PY_STDLIB_MOD_SIMPLE([_heapq])
61316132
PY_STDLIB_MOD_SIMPLE([_json])
61326133
PY_STDLIB_MOD_SIMPLE([_lsprof])
61336134
PY_STDLIB_MOD_SIMPLE([_opcode])
61346135
PY_STDLIB_MOD_SIMPLE([_pickle])
6136+
PY_STDLIB_MOD_SIMPLE([_posixsubprocess])
61356137
PY_STDLIB_MOD_SIMPLE([_queue])
61366138
PY_STDLIB_MOD_SIMPLE([_random])
61376139
PY_STDLIB_MOD_SIMPLE([select])
@@ -6140,6 +6142,7 @@ PY_STDLIB_MOD_SIMPLE([_xxsubinterpreters])
61406142
PY_STDLIB_MOD_SIMPLE([_zoneinfo])
61416143

61426144
dnl needs libm
6145+
PY_STDLIB_MOD_SIMPLE([audioop], [], [$LIBM])
61436146
PY_STDLIB_MOD_SIMPLE([_statistics], [], [$LIBM])
61446147
PY_STDLIB_MOD_SIMPLE([cmath], [], [$LIBM])
61456148
PY_STDLIB_MOD_SIMPLE([math], [], [$LIBM])

setup.py

+3-4
Original file line numberDiff line numberDiff line change
@@ -1062,14 +1062,13 @@ def detect_simple_extensions(self):
10621062
# 64-bit platforms.
10631063
#
10641064
# audioop needs libm for floor() in multiple functions.
1065-
self.add(Extension('audioop', ['audioop.c'],
1066-
libraries=['m']))
1065+
self.addext(Extension('audioop', ['audioop.c']))
10671066

10681067
# CSV files
1069-
self.add(Extension('_csv', ['_csv.c']))
1068+
self.addext(Extension('_csv', ['_csv.c']))
10701069

10711070
# POSIX subprocess module helper.
1072-
self.add(Extension('_posixsubprocess', ['_posixsubprocess.c']))
1071+
self.addext(Extension('_posixsubprocess', ['_posixsubprocess.c']))
10731072

10741073
def detect_test_extensions(self):
10751074
# Python C API test module

0 commit comments

Comments
 (0)