8000 bpo-45847: Port _scproxy to PY_STDLIB_MOD (GH-29644) · python/cpython@5596909 · GitHub
[go: up one dir, main page]
Skip to content

Commit 5596909

Browse files
tirantiran
authored
bpo-45847: Port _scproxy to PY_STDLIB_MOD (GH-29644)
1 parent be36e06 commit 5596909

File tree

5 files changed

+74
-7
lines changed

5 files changed

+74
-7
lines changed

‎Modules/Setup

+2-2
Original file line numberDiff line numberDiff line change
@@ -267,8 +267,8 @@ PYTHONPATH=$(COREPYTHONPATH)
267267
#_curses -lncurses -lncursesw -ltermcap _cursesmodule.c
268268
#_curses_panel -lpanel -lncurses _curses_panel.c
269269

270-
# macOS specific modules
271-
# _scproxy _scproxy.c -framework SystemConfiguration -framework CoreFoundation
270+
# macOS specific module, needs SystemConfiguration and CoreFoundation framework
271+
# _scproxy _scproxy.c
272272

273273
# Examples
274274

‎Modules/Setup.stdlib.in

+7
< 10000 td data-grid-cell-id="diff-93b54a98829ea89eaf6335c02f546511f7780d865131407436b10a401ecd375c-71-72-1" data-selected="false" role="gridcell" style="background-color:var(--diffBlob-additionNum-bgColor, var(--diffBlob-addition-bgColor-num));text-align:center" tabindex="-1" valign="top" class="focusable-grid-cell diff-line-number position-relative left-side">72
Original file line numberDiff line numberDiff line change
@@ -69,3 +69,10 @@
6969
# Modules with third party dependencies
7070
#
7171
@MODULE__SQLITE3_TRUE@_sqlite3 _sqlite/connection.c _sqlite/cursor.c _sqlite/microprotocols.c _sqlite/module.c _sqlite/prepare_protocol.c _sqlite/row.c _sqlite/statement.c _sqlite/util.c
+
73+
74+
############################################################################
75+
# macOS specific modules
76+
77+
# _scproxy needs SystemConfiguration and CoreFoundation framework
78+
@MODULE__SCPROXY_TRUE@_scproxy _scproxy.c

‎configure

+60
Original file line numberDiff line numberDiff line change
@@ -644,6 +644,8 @@ MODULE__ELEMENTTREE_FALSE
644644
MODULE__ELEMENTTREE_TRUE
645645
MODULE_PYEXPAT_FALSE
646646
MODULE_PYEXPAT_TRUE
647+
MODULE__SCPROXY_FALSE
648+
MODULE__SCPROXY_TRUE
647649
MODULE_OSSAUDIODEV_FALSE
648650
MODULE_OSSAUDIODEV_TRUE
649651
MODULE__DATETIME_FALSE
@@ -19588,6 +19590,56 @@ fi
1958819590
$as_echo "$py_cv_module_ossaudiodev" >&6; }
1958919591

1959019592

19593+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdlib extension module _scproxy" >&5
19594+
$as_echo_n "checking for stdlib extension module _scproxy... " >&6; }
19595+
case $py_stdlib_not_available in #(
19596+
*_scproxy*) :
19597+
py_cv_module__scproxy=n/a ;; #(
19598+
*) :
19599+
19600+
if test "$ac_sys_system" = "Darwin"; then :
19601+
if true; then :
19602+
py_cv_module__scproxy=yes
19603+
else
19604+
py_cv_module__scproxy=missing
19605+
fi
19606+
else
19607+
py_cv_module__scproxy=disabled
19608+
19609+
fi
19610+
19611+
;;
19612+
esac
19613+
as_fn_append MODULE_BLOCK "MODULE__SCPROXY=$py_cv_module__scproxy$as_nl"
19614+
if test "x$py_cv_module__scproxy" = xyes; then :
19615+
19616+
as_fn_append MODULE_BLOCK "MODULE__SCPROXY_CFLAGS=$as_nl"
19617+
as_fn_append MODULE_BLOCK "MODULE__SCPROXY_LDFLAGS=-framework SystemConfiguration -framework CoreFoundation$as_nl"
19618+
if true; then
19619+
MODULE__SCPROXY_TRUE=
19620+
MODULE__SCPROXY_FALSE='#'
19621+
else
19622+
MODULE__SCPROXY_TRUE='#'
19623+
MODULE__SCPROXY_FALSE=
19624+
fi
19625+
19626+
19627+
else
19628+
19629+
if false; then
19630+
MODULE__SCPROXY_TRUE=
19631+
MODULE__SCPROXY_FALSE='#'
19632+
else
19633+
MODULE__SCPROXY_TRUE='#'
19634+
MODULE__SCPROXY_FALSE=
19635+
fi
19636+
19637+
19638+
fi
19639+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $py_cv_module__scproxy" >&5
19640+
$as_echo "$py_cv_module__scproxy" >&6; }
19641+
19642+
1959119643

1959219644
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdlib extension module pyexpat" >&5
1959319645
$as_echo_n "checking for stdlib extension module pyexpat... " >&6; }
@@ -20231,6 +20283,14 @@ if test -z "${MODULE_OSSAUDIODEV_TRUE}" && test -z "${MODULE_OSSAUDIODEV_FALSE}"
2023120283
as_fn_error $? "conditional \"MODULE_OSSAUDIODEV\" was never defined.
2023220284
Usually this means the macro was only invoked conditionally." "$LINENO" 5
2023320285
fi
20286+
if test -z "${MODULE__SCPROXY_TRUE}" && test -z "${MODULE__SCPROXY_FALSE}"; then
20287+
as_fn_error $? "conditional \"MODULE__SCPROXY\" was never defined.
20288+
Usually this means the macro was only invoked conditionally." "$LINENO" 5
20289+
fi
20290+
if test -z "${MODULE__SCPROXY_TRUE}" && test -z "${MODULE__SCPROXY_FALSE}"; then
20291+
as_fn_error $? "conditional \"MODULE__SCPROXY\" was never defined.
20292+
Usually this means the macro was only invoked conditionally." "$LINENO" 5
20293+
fi
2023420294
if test -z "${MODULE_PYEXPAT_TRUE}" && test -z "${MODULE_PYEXPAT_FALSE}"; then
2023520295
as_fn_error $? "conditional \"MODULE_PYEXPAT\" was never defined.
2023620296
Usually this means the macro was only invoked conditionally." "$LINENO" 5

‎configure.ac

+3
Original file line numberDiff line numberDiff line change
@@ -6062,6 +6062,9 @@ PY_STDLIB_MOD_SIMPLE([_datetime], [], [$TIMEMODULE_LIB $LIBM])
60626062
dnl platform specific extensions
60636063
PY_STDLIB_MOD([ossaudiodev],
60646064
[], [test "$ac_cv_header_linux_soundcard_h" = yes -o "$ac_cv_header_sys_soundcard_h" = yes])
6065+
PY_STDLIB_MOD([_scproxy],
6066+
[test "$ac_sys_system" = "Darwin"], [],
6067+
[], [-framework SystemConfiguration -framework CoreFoundation])
60656068

60666069
dnl _elementtree loads libexpat via CAPI hook in pyexpat
60676070
PY_STDLIB_MOD([pyexpat], [], [], [$LIBEXPAT_CFLAGS], [$LIBEXPAT_LDFLAGS])

‎setup.py

+2-5
Original file line numberDiff line numberDiff line change
@@ -1389,11 +1389,8 @@ def detect_platform_specific_exts(self):
13891389
# linux/soundcard.h or sys/soundcard.h
13901390
self.addext(Extension('ossaudiodev', ['ossaudiodev.c']))
13911391

1392-
if MACOS:
1393-
self.add(Extension('_scproxy', ['_scproxy.c'],
1394-
extra_link_args=[
1395-
'-framework', 'SystemConfiguration',
1396-
'-framework', 'CoreFoundation']))
1392+
# macOS-only, needs SystemConfiguration and CoreFoundation framework
1393+
self.addext(Extension('_scproxy', ['_scproxy.c']))
13971394

13981395
def detect_compress_exts(self):
13991396
# Andrew Kuchling's zlib module.

0 commit comments

Comments
 (0)
0