cirros-testvm/src-cirros/buildroot-2015.05/package/erlang/0004-erts-fix-incorrect-use-of-ac-egrep-cpp.patch

   1 Status: upstream
   2 https://github.com/erlang/otp/pull/658
   3
   4 Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com>
   5
   6 From 73392fcb6f8fddba57de6fb7ae6eeafa0e444686 Mon Sep 17 00:00:00 2001
   7 From: Johan Oudinet <johan.oudinet@gmail.com>
   8 Date: Tue, 24 Mar 2015 15:54:31 +0100
   9 Subject: [PATCH] erts: Fix incorrect use of AC_EGREP_CPP
  10
  11 Using 'AC_EGREP_CPP(yes' without restraining the pattern always return
  12 true if it runs from a path containing the string 'yes'.
  13 ---
  14  erts/aclocal.m4   |  2 +-
  15  erts/configure.in | 17 +++++++++--------
  16  2 files changed, 10 insertions(+), 9 deletions(-)
  17
  18 diff --git a/erts/aclocal.m4 b/erts/aclocal.m4
  19 index 5735cde..70a5b40 100644
  20 --- a/erts/aclocal.m4
  21 +++ b/erts/aclocal.m4
  22 @@ -559,7 +559,7 @@ dnl
  23
  24  AC_DEFUN(LM_SYS_MULTICAST,
  25  [AC_CACHE_CHECK([for multicast support], ac_cv_sys_multicast_support,
  26 -[AC_EGREP_CPP(yes,
  27 +[AC_EGREP_CPP(^yes$,
  28  [#include <sys/types.h>
  29  #include <sys/socket.h>
  30  #include <netinet/in.h>
  31 diff --git a/erts/configure.in b/erts/configure.in
  32 index b3fe48d..9e19e33 100644
  33 --- a/erts/configure.in
  34 +++ b/erts/configure.in
  35 @@ -1555,10 +1555,11 @@ if test "$have_gethostbyname_r" = yes; then
  36                                     [Define to flavour of gethostbyname_r]))
  37                 ;;
  38                 *)
  39 -                       AC_EGREP_CPP(yes,[#include <stdio.h>
  40 -                         #ifdef __GLIBC__
  41 -                         yes
  42 -                         #endif
  43 +                       AC_EGREP_CPP(^yes$,[
  44 +#include <stdio.h>
  45 +#ifdef __GLIBC__
  46 +yes
  47 +#endif
  48                           ], AC_DEFINE(HAVE_GETHOSTBYNAME_R, GHBN_R_GLIBC,
  49                                 [Define to flavour of gethostbyname_r]))
  50                 ;;
  51 @@ -4303,10 +4304,10 @@ case "$erl_xcomp_without_sysroot-$with_ssl" in
  52                         SSL_INCLUDE="-I$dir/include"
  53                         old_CPPFLAGS=$CPPFLAGS
  54                         CPPFLAGS=$SSL_INCLUDE
  55 -                       AC_EGREP_CPP(yes,[
  56 +                       AC_EGREP_CPP(^yes$,[
  57  #include <openssl/opensslv.h>
  58  #if OPENSSL_VERSION_NUMBER >= 0x0090700fL
  59 -  yes
  60 +yes
  61  #endif
  62                         ],[
  63                         ssl_found=yes
  64 @@ -4501,10 +4502,10 @@ if test "x$SSL_APP" != "x" ; then
  65      AC_MSG_CHECKING(for OpenSSL kerberos 5 support)
  66      old_CPPFLAGS=$CPPFLAGS
  67      CPPFLAGS=$SSL_INCLUDE
  68 -    AC_EGREP_CPP(yes,[
  69 +    AC_EGREP_CPP(^yes$,[
  70  #include <openssl/opensslconf.h>
  71  #ifndef OPENSSL_NO_KRB5
  72 -  yes
  73 +yes
  74  #endif
  75        ],[
  76        AC_MSG_RESULT([yes])
  77 --
  78 2.1.0
  79