diff options
author | xdegaye <xdegaye@gmail.com> | 2017-11-23 11:01:36 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-23 11:01:36 (GMT) |
commit | 5ce1069a6ff0d5443074d33ba1d403ccd2eaf3d3 (patch) | |
tree | 5e7be2f6a553b139ffe871236ed772fa34d4a81b | |
parent | c06c22e9a9fb9326e79fcf1551601eacc1fd457d (diff) | |
download | cpython-5ce1069a6ff0d5443074d33ba1d403ccd2eaf3d3.zip cpython-5ce1069a6ff0d5443074d33ba1d403ccd2eaf3d3.tar.gz cpython-5ce1069a6ff0d5443074d33ba1d403ccd2eaf3d3.tar.bz2 |
bpo-28762: Revert last commit (now using Android Unified Headers) (GH-4488)
-rw-r--r-- | Misc/NEWS.d/next/Build/2017-11-21-17-12-24.bpo-28762.R6uu8w.rst | 1 | ||||
-rwxr-xr-x | configure | 31 | ||||
-rw-r--r-- | configure.ac | 11 | ||||
-rw-r--r-- | pyconfig.h.in | 2 |
4 files changed, 4 insertions, 41 deletions
diff --git a/Misc/NEWS.d/next/Build/2017-11-21-17-12-24.bpo-28762.R6uu8w.rst b/Misc/NEWS.d/next/Build/2017-11-21-17-12-24.bpo-28762.R6uu8w.rst new file mode 100644 index 0000000..0c57e33 --- /dev/null +++ b/Misc/NEWS.d/next/Build/2017-11-21-17-12-24.bpo-28762.R6uu8w.rst @@ -0,0 +1 @@ +Revert the last commit, the F_LOCK macro is defined by Android Unified Headers. @@ -11147,7 +11147,7 @@ for ac_func in alarm accept4 setitimer getitimer bind_textdomain_codeset chown \ getgrouplist getgroups getlogin getloadavg getpeername getpgid getpid \ getpriority getresuid getresgid getpwent getspnam getspent getsid getwd \ 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 \ mkfifoat mknod mknodat mktime mremap nice openat pathconf pause pipe2 plock poll \ posix_fallocate posix_fadvise pread \ @@ -12581,35 +12581,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 -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - # On OSF/1 V5.1, getaddrinfo is available, but a define # for [no]getaddrinfo in netdb.h. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getaddrinfo" >&5 diff --git a/configure.ac b/configure.ac index 6a69f78..68a95c3 100644 --- a/configure.ac +++ b/configure.ac @@ -3415,7 +3415,7 @@ AC_CHECK_FUNCS(alarm accept4 setitimer getitimer bind_textdomain_codeset chown \ getgrouplist getgroups getlogin getloadavg getpeername getpgid getpid \ getpriority getresuid getresgid getpwent getspnam getspent getsid getwd \ 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 \ mkfifoat mknod mknodat mktime mremap nice openat pathconf pause pipe2 plock poll \ posix_fallocate posix_fadvise pread \ @@ -3764,15 +3764,6 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[ 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 # for [no]getaddrinfo in netdb.h. AC_MSG_CHECKING(for getaddrinfo) diff --git a/pyconfig.h.in b/pyconfig.h.in index 6e0f3e8..66b9e88 100644 --- a/pyconfig.h.in +++ b/pyconfig.h.in @@ -601,7 +601,7 @@ /* Define to 1 if you have the <linux/vm_sockets.h> header file. */ #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 /* Define to 1 if you have the `log1p' function. */ |