Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

bpo-28762: Revert last commit (now using Android Unified Headers) (GH-4488)

This commit is contained in:
xdegaye 2017-11-23 12:01:36 +01:00 committed by GitHub
parent c06c22e9a9
commit 5ce1069a6f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Misc/NEWS.d/next/Build/2017-11-21-17-12-24.bpo-28762.R6uu8w.rst Normal file
View File

@ -0,0 +1 @@
Revert the last commit, the F_LOCK macro is defined by Android Unified Headers.

31
configure vendored
View File

@ -11147,7 +11147,7 @@ for ac_func in alarm accept4 setitimer getitimer bind_textdomain_codeset chown \
getgrouplist getgroups getlogin getloadavg getpeername getpgid getpid \ getgrouplist getgroups getlogin getloadavg getpeername getpgid getpid \
getpriority getresuid getresgid getpwent getspnam getspent getsid getwd \ getpriority getresuid getresgid getpwent getspnam getspent getsid getwd \
if_nameindex \ if_nameindex \
initgroups kill killpg lchmod lchown linkat lstat lutimes mmap \ initgroups kill killpg lchmod lchown lockf linkat lstat lutimes mmap \
memrchr mbrtowc mkdirat mkfifo \ memrchr mbrtowc mkdirat mkfifo \
mkfifoat mknod mknodat mktime mremap nice openat pathconf pause pipe2 plock poll \ mkfifoat mknod mknodat mktime mremap nice openat pathconf pause pipe2 plock poll \
posix_fallocate posix_fadvise pread \ posix_fallocate posix_fadvise pread \
@ -12577,35 +12577,6 @@ else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; } $as_echo "no" >&6; }
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
# Issue #28762: lockf() is available on Android API level 24, but the F_LOCK
# macro is not defined in android-ndk-r13.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for lockf" >&5
$as_echo_n "checking for lockf... " >&6; }
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <unistd.h>
int
main ()
{
lockf(0, F_LOCK, 0);
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
$as_echo "#define HAVE_LOCKF 1" >>confdefs.h
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi fi
rm -f core conftest.err conftest.$ac_objext \ rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext conftest$ac_exeext conftest.$ac_ext

11
configure.ac
View File

@ -3415,7 +3415,7 @@ AC_CHECK_FUNCS(alarm accept4 setitimer getitimer bind_textdomain_codeset chown \
getgrouplist getgroups getlogin getloadavg getpeername getpgid getpid \ getgrouplist getgroups getlogin getloadavg getpeername getpgid getpid \
getpriority getresuid getresgid getpwent getspnam getspent getsid getwd \ getpriority getresuid getresgid getpwent getspnam getspent getsid getwd \
if_nameindex \ if_nameindex \
initgroups kill killpg lchmod lchown linkat lstat lutimes mmap \ initgroups kill killpg lchmod lchown lockf linkat lstat lutimes mmap \
memrchr mbrtowc mkdirat mkfifo \ memrchr mbrtowc mkdirat mkfifo \
mkfifoat mknod mknodat mktime mremap nice openat pathconf pause pipe2 plock poll \ mkfifoat mknod mknodat mktime mremap nice openat pathconf pause pipe2 plock poll \
posix_fallocate posix_fadvise pread \ posix_fallocate posix_fadvise pread \
@ -3764,15 +3764,6 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
]) ])
# Issue #28762: lockf() is available on Android API level 24, but the F_LOCK
# macro is not defined in android-ndk-r13.
AC_MSG_CHECKING(for lockf)
AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <unistd.h> ]],[[lockf(0, F_LOCK, 0);]])],
[AC_DEFINE(HAVE_LOCKF, 1, Define to 1 if you have the 'lockf' function and the F_LOCK macro.)
AC_MSG_RESULT(yes)],
[AC_MSG_RESULT(no)
])
# On OSF/1 V5.1, getaddrinfo is available, but a define # On OSF/1 V5.1, getaddrinfo is available, but a define
# for [no]getaddrinfo in netdb.h. # for [no]getaddrinfo in netdb.h.
AC_MSG_CHECKING(for getaddrinfo) AC_MSG_CHECKING(for getaddrinfo)

2
pyconfig.h.in
View File

@ -601,7 +601,7 @@
/* Define to 1 if you have the <linux/vm_sockets.h> header file. */ /* Define to 1 if you have the <linux/vm_sockets.h> header file. */
#undef HAVE_LINUX_VM_SOCKETS_H #undef HAVE_LINUX_VM_SOCKETS_H
/* Define to 1 if you have the 'lockf' function and the F_LOCK macro. */ /* Define to 1 if you have the `lockf' function. */
#undef HAVE_LOCKF #undef HAVE_LOCKF
/* Define to 1 if you have the `log1p' function. */ /* Define to 1 if you have the `log1p' function. */