8000 [3.6] bpo-34652: Remove lchmod from the big func checking block. (GH-… · python/cpython@2184fe5 · GitHub
[go: up one dir, main page]
Skip to content

Commit 2184fe5

Browse files
benjaminpbenjaminp
authored
[3.6] bpo-34652: Remove lchmod from the big func checking block. (GH-9250)
A fix for 883702e.. (cherry picked from commit ed709d5)
1 parent 21a8082 commit 2184fe5

File tree

2 files changed

+22
-4
lines changed

2 files changed

+22
-4
lines changed

‎configure

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -784,6 +784,7 @@ infodir
784784
docdir
785785
oldincludedir
786786
includedir
787+
runstatedir
787788
localstatedir
788789
sharedstatedir
789790
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]
@@ -11350,7 +11362,7 @@ for ac_func in alarm accept4 setitimer getitimer bind_textdomain_codeset chown \
1135011362
futimens futimes gai_strerror getentropy \
1135111363
getgrouplist getgroups getlogin getloadavg getpeername getpgid getpid \
1135211364
getpriority getresuid getresgid getpwent getspnam getspent getsid getwd \
11353-
initgroups kill killpg lchmod lchown linkat lstat lutimes mmap \
11365+
initgroups kill killpg lchown linkat lstat lutimes mmap \
1135411366
memrchr mbrtowc mkdirat mkfifo \
1135511367
mkfifoat mknod mknodat mktime mremap nice openat pathconf pause pipe2 plock poll \
1135611368
posix_fallocate posix_fadvise pread \
@@ -11381,10 +11393,16 @@ done
1138111393
# links. Some libc implementations have a stub lchmod implementation that always
1138211394
# returns an error.
1138311395
if test "$MACHDEP" != linux; then
11396+
for ac_func in lchmod
11397+
do :
1138411398
ac_fn_c_check_func "$LINENO" "lchmod" "ac_cv_func_lchmod"
1138511399
if test "x$ac_cv_func_lchmod" = xyes; then :
11400+
cat >>confdefs.h <<_ACEOF
11401+
#define HAVE_LCHMOD 1
11402+
_ACEOF
1138611403

1138711404
fi
11405+
done
1138811406

1138911407
fi
1139011408

‎configure.ac

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3479,7 +3479,7 @@ AC_CHECK_FUNCS(alarm accept4 setitimer getitimer bind_textdomain_codeset chown \
34793479
futimens futimes gai_strerror getentropy \
34803480
getgrouplist getgroups getlogin getloadavg getpeername getpgid getpid \
34813481
getpriority getresuid getresgid getpwent getspnam getspent getsid getwd \
3482-
initgroups kill killpg lchmod lchown linkat lstat lutimes mmap \
3482+
initgroups kill killpg lchown linkat lstat lutimes mmap \
34833483
memrchr mbrtowc mkdirat mkfifo \
34843484
mkfifoat mknod mknodat mktime mremap nice openat pathconf pause pipe2 plock poll \
34853485
posix_fallocate posix_fadvise pread \
@@ -3499,7 +3499,7 @@ AC_CHECK_FUNCS(alarm accept4 setitimer getitimer bind_textdomain_codeset chown \
34993499
# links. Some libc implementations have a stub lchmod implementation that always
35003500
# returns an error.
35013501
if test "$MACHDEP" != linux; then
3502-
AC_CHECK_FUNC(lchmod)
3502+
AC_CHECK_FUNCS(lchmod)
35033503
fi
35043504

35053505
AC_CHECK_DECL(dirfd,

0 commit comments

Comments
 (0)
0