Skip to content

Commit 28fc1ba

Browse files
closes bpo-39619 Fix os.chroot on HP-UX 11.31 (GH-18495)
Setting `-D_XOPEN_SOURCE=700` on HP-UX causes system functions such as chroot to be undefined. This change stops `_XOPEN_SOURCE` begin set on HP-UX Co-authored-by: Benjamin Peterson <benjamin@python.org> (cherry picked from commit a9edf44) Co-authored-by: Ian Norton <inorton@gmail.com>
1 parent 581b860 commit 28fc1ba

File tree

3 files changed

+26
-1
lines changed

3 files changed

+26
-1
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Enable use of :func:`os.chroot` on HP-UX systems.

configure

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -782,6 +782,7 @@ infodir
782782
docdir
783783
oldincludedir
784784
includedir
785+
runstatedir
785786
localstatedir
786787
sharedstatedir
787788
sysconfdir
@@ -895,6 +896,7 @@ datadir='${datarootdir}'
895896
sysconfdir='${prefix}/etc'
896897
sharedstatedir='${prefix}/com'
897898
localstatedir='${prefix}/var'
899+
runstatedir='${localstatedir}/run'
898900
includedir='${prefix}/include'
899901
oldincludedir='/usr/include'
900902
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1147,6 +1149,15 @@ do
11471149
| -silent | --silent | --silen | --sile | --sil)
11481150
silent=yes ;;
11491151

1152+
-runstatedir | --runstatedir | --runstatedi | --runstated \
1153+
| --runstate | --runstat | --runsta | --runst | --runs \
1154+
| --run | --ru | --r)
1155+
ac_prev=runstatedir ;;
1156+
-runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
1157+
| --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
1158+
| --run=* | --ru=* | --r=*)
1159+
runstatedir=$ac_optarg ;;
1160+
11501161
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
11511162
ac_prev=sbindir ;;
11521163
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1284,7 +1295,7 @@ fi
12841295
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
12851296
datadir sysconfdir sharedstatedir localstatedir includedir \
12861297
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
1287-
libdir localedir mandir
1298+
libdir localedir mandir runstatedir
12881299
do
12891300
eval ac_val=\$$ac_var
12901301
# Remove trailing slashes.
@@ -1437,6 +1448,7 @@ Fine tuning of the installation directories:
14371448
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
14381449
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
14391450
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
1451+
--runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
14401452
--libdir=DIR object code libraries [EPREFIX/lib]
14411453
--includedir=DIR C header files [PREFIX/include]
14421454
--oldincludedir=DIR C header files for non-gcc [/usr/include]
@@ -3405,6 +3417,12 @@ $as_echo "#define _BSD_SOURCE 1" >>confdefs.h
34053417
define_xopen_source=no
34063418
;;
34073419

3420+
# On HP-UX, defining _XOPEN_SOURCE to 600 or greater hides
3421+
# chroot() and other functions
3422+
hp*|HP*)
3423+
define_xopen_source=no
3424+
;;
3425+
34083426
esac
34093427

34103428
if test $define_xopen_source = yes

configure.ac

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -521,6 +521,12 @@ case $ac_sys_system/$ac_sys_release in
521521
define_xopen_source=no
522522
;;
523523

524+
# On HP-UX, defining _XOPEN_SOURCE to 600 or greater hides
525+
# chroot() and other functions
526+
hp*|HP*)
527+
define_xopen_source=no
528+
;;
529+
524530
esac
525531

526532
if test $define_xopen_source = yes

0 commit comments

Comments
 (0)