From 7715aab257a9d4665f69220401d46412059c28e5 Mon Sep 17 00:00:00 2001 From: Xavier de Gaye Date: Mon, 20 Nov 2017 20:47:41 +0100 Subject: [PATCH 1/2] bpo-28538: Revert all the changes (now using Android Unified Headers) --- Misc/NEWS.d/3.7.0a1.rst | 10 ------- configure | 60 ++--------------------------------------- configure.ac | 26 +----------------- 3 files changed, 3 insertions(+), 93 deletions(-) diff --git a/Misc/NEWS.d/3.7.0a1.rst b/Misc/NEWS.d/3.7.0a1.rst index 262bfabb3ec1a76..b8560aea9608edb 100644 --- a/Misc/NEWS.d/3.7.0a1.rst +++ b/Misc/NEWS.d/3.7.0a1.rst @@ -5274,16 +5274,6 @@ defined in android-ndk-r13. .. -.. bpo: 28538 -.. date: 0034 -.. nonce: FqtN7v -.. section: Build - -Fix the compilation error that occurs because if_nameindex() is available on -Android API level 24, but the if_nameindex structure is not defined. - -.. - .. bpo: 20211 .. date: 0033 .. nonce: gpNptI diff --git a/configure b/configure index 5e0522476e71268..ab33115d56398df 100755 --- a/configure +++ b/configure @@ -778,7 +778,6 @@ infodir docdir oldincludedir includedir -runstatedir localstatedir sharedstatedir sysconfdir @@ -890,7 +889,6 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' -runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -1143,15 +1141,6 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; - -runstatedir | --runstatedir | --runstatedi | --runstated \ - | --runstate | --runstat | --runsta | --runst | --runs \ - | --run | --ru | --r) - ac_prev=runstatedir ;; - -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ - | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ - | --run=* | --ru=* | --r=*) - runstatedir=$ac_optarg ;; - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1289,7 +1278,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir runstatedir + libdir localedir mandir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1442,7 +1431,6 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -11155,6 +11143,7 @@ for ac_func in alarm accept4 setitimer getitimer bind_textdomain_codeset chown \ futimens futimes gai_strerror getentropy \ 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 \ memrchr mbrtowc mkdirat mkfifo \ mkfifoat mknod mknodat mktime mremap nice openat pathconf pause pipe2 plock poll \ @@ -12585,51 +12574,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 Android API level 24 with android-ndk-r13, if_nameindex() is available, -# but the if_nameindex structure is not defined. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for if_nameindex" >&5 -$as_echo_n "checking for if_nameindex... " >&6; } -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -#include -#ifdef STDC_HEADERS -# include -# include -#else -# ifdef HAVE_STDLIB_H -# include -# endif -#endif -#ifdef HAVE_SYS_SOCKET_H -# include -#endif -#ifdef HAVE_NET_IF_H -# include -#endif - -int -main () -{ -struct if_nameindex *ni = if_nameindex(); int x = ni[0].if_index; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - -$as_echo "#define HAVE_IF_NAMEINDEX 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 diff --git a/configure.ac b/configure.ac index 3464212eddc019b..501f07892f8575f 100644 --- a/configure.ac +++ b/configure.ac @@ -3411,6 +3411,7 @@ AC_CHECK_FUNCS(alarm accept4 setitimer getitimer bind_textdomain_codeset chown \ futimens futimes gai_strerror getentropy \ 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 \ memrchr mbrtowc mkdirat mkfifo \ mkfifoat mknod mknodat mktime mremap nice openat pathconf pause pipe2 plock poll \ @@ -3760,31 +3761,6 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[ AC_MSG_RESULT(no) ]) -# On Android API level 24 with android-ndk-r13, if_nameindex() is available, -# but the if_nameindex structure is not defined. -AC_MSG_CHECKING(for if_nameindex) -AC_LINK_IFELSE([AC_LANG_PROGRAM([[ -#include -#ifdef STDC_HEADERS -# include -# include -#else -# ifdef HAVE_STDLIB_H -# include -# endif -#endif -#ifdef HAVE_SYS_SOCKET_H -# include -#endif -#ifdef HAVE_NET_IF_H -# include -#endif -]], [[struct if_nameindex *ni = if_nameindex(); int x = ni[0].if_index;]])], - [AC_DEFINE(HAVE_IF_NAMEINDEX, 1, Define to 1 if you have the 'if_nameindex' function.) - AC_MSG_RESULT(yes)], - [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) From 91dadc2259b2be7a07c797d17d290ffd142ce0c8 Mon Sep 17 00:00:00 2001 From: Xavier de Gaye Date: Tue, 21 Nov 2017 17:28:51 +0100 Subject: [PATCH 2/2] Revert the changes made to Misc/NEWS.d/3.7.0a1.rst --- Misc/NEWS.d/3.7.0a1.rst | 10 ++++++++++ .../Build/2017-11-21-17-27-59.bpo-28538.DsNBS7.rst | 2 ++ 2 files changed, 12 insertions(+) create mode 100644 Misc/NEWS.d/next/Build/2017-11-21-17-27-59.bpo-28538.DsNBS7.rst diff --git a/Misc/NEWS.d/3.7.0a1.rst b/Misc/NEWS.d/3.7.0a1.rst index b8560aea9608edb..262bfabb3ec1a76 100644 --- a/Misc/NEWS.d/3.7.0a1.rst +++ b/Misc/NEWS.d/3.7.0a1.rst @@ -5274,6 +5274,16 @@ defined in android-ndk-r13. .. +.. bpo: 28538 +.. date: 0034 +.. nonce: FqtN7v +.. section: Build + +Fix the compilation error that occurs because if_nameindex() is available on +Android API level 24, but the if_nameindex structure is not defined. + +.. + .. bpo: 20211 .. date: 0033 .. nonce: gpNptI diff --git a/Misc/NEWS.d/next/Build/2017-11-21-17-27-59.bpo-28538.DsNBS7.rst b/Misc/NEWS.d/next/Build/2017-11-21-17-27-59.bpo-28538.DsNBS7.rst new file mode 100644 index 000000000000000..db435b008f724c6 --- /dev/null +++ b/Misc/NEWS.d/next/Build/2017-11-21-17-27-59.bpo-28538.DsNBS7.rst @@ -0,0 +1,2 @@ +Revert the previous changes, the if_nameindex structure is defined by +Unified Headers.