From patchwork Wed Mar 25 15:06:59 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Oudinet X-Patchwork-Id: 454592 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id 0D21E1400A0 for ; Thu, 26 Mar 2015 02:07:18 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=gmail.com header.i=@gmail.com header.b=MGXR/wP9; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 5A2BE338CD; Wed, 25 Mar 2015 15:07:17 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 89r32P21p6Fx; Wed, 25 Mar 2015 15:07:13 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id CC6E7338D0; Wed, 25 Mar 2015 15:07:12 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id AA2831C22F5 for ; Wed, 25 Mar 2015 15:07:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id A6C02A3521 for ; Wed, 25 Mar 2015 15:07:11 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id HeGy0eITrAZ8 for ; Wed, 25 Mar 2015 15:07:11 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wg0-f48.google.com (mail-wg0-f48.google.com [74.125.82.48]) by fraxinus.osuosl.org (Postfix) with ESMTPS id BD9408A07C for ; Wed, 25 Mar 2015 15:07:10 +0000 (UTC) Received: by wgra20 with SMTP id a20so30904081wgr.3 for ; Wed, 25 Mar 2015 08:07:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=I3n78mCMd08D3heY9GqAZ/9gyxNUd1RtzefoGwJVd88=; b=MGXR/wP9hNPHnT0otQohnV46p+rlWNWcocd1XHaTP9EtSrFK9r9cNmA7IA7z2NnrZ2 eQdD1X3WoUKaDYZGfGAbFgU1RjZ8CBz7ZGyFExhUkSI4p6YSwN2V47dlFWy3ublUESjP p0XkTv927bH2gGzksZXaYvYX0PLcWxt936kNqWyhc9vZdO6Jcrb8MZqceM1I+8+Nsqtv 1AOqwDOtS0DcQ0tEtgceAKg62rWveADoeVtYu2QgNT/9hPtSFMIHGoI1PCcDJEVZP7ps +hXS+qgmVKvBB2P36jOcVJiPljAta9YFX0D94S76mHba1Esgh7pRYRRYMSVPPU471rh+ sb9w== X-Received: by 10.180.78.136 with SMTP id b8mr39708422wix.6.1427296029117; Wed, 25 Mar 2015 08:07:09 -0700 (PDT) Received: from localhost.localdomain ([193.51.194.209]) by mx.google.com with ESMTPSA id hj10sm4086552wjc.48.2015.03.25.08.07.07 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 25 Mar 2015 08:07:08 -0700 (PDT) From: Johan Oudinet To: buildroot@buildroot.org Date: Wed, 25 Mar 2015 16:06:59 +0100 Message-Id: <1427296020-12945-1-git-send-email-johan.oudinet@gmail.com> X-Mailer: git-send-email 2.1.0 Subject: [Buildroot] [PATCH v2 1/1] erlang: fix incorrect use of AC_EGREP_CPP X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Using 'AC_EGREP_CPP(yes' without restraining the pattern always return true if it runs from a path containing the string 'yes'. Signed-off-by: Johan Oudinet --- ...04-erts-fix-incorrect-use-of-ac-egrep-cpp.patch | 79 ++++++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 package/erlang/0004-erts-fix-incorrect-use-of-ac-egrep-cpp.patch diff --git a/package/erlang/0004-erts-fix-incorrect-use-of-ac-egrep-cpp.patch b/package/erlang/0004-erts-fix-incorrect-use-of-ac-egrep-cpp.patch new file mode 100644 index 0000000..934b863 --- /dev/null +++ b/package/erlang/0004-erts-fix-incorrect-use-of-ac-egrep-cpp.patch @@ -0,0 +1,79 @@ +Status: upstream +https://github.com/erlang/otp/pull/658 + +Signed-off-by: Johan Oudinet + +From 73392fcb6f8fddba57de6fb7ae6eeafa0e444686 Mon Sep 17 00:00:00 2001 +From: Johan Oudinet +Date: Tue, 24 Mar 2015 15:54:31 +0100 +Subject: [PATCH] erts: Fix incorrect use of AC_EGREP_CPP + +Using 'AC_EGREP_CPP(yes' without restraining the pattern always return +true if it runs from a path containing the string 'yes'. +--- + erts/aclocal.m4 | 2 +- + erts/configure.in | 17 +++++++++-------- + 2 files changed, 10 insertions(+), 9 deletions(-) + +diff --git a/erts/aclocal.m4 b/erts/aclocal.m4 +index 5735cde..70a5b40 100644 +--- a/erts/aclocal.m4 ++++ b/erts/aclocal.m4 +@@ -559,7 +559,7 @@ dnl + + AC_DEFUN(LM_SYS_MULTICAST, + [AC_CACHE_CHECK([for multicast support], ac_cv_sys_multicast_support, +-[AC_EGREP_CPP(yes, ++[AC_EGREP_CPP(^yes$, + [#include + #include + #include +diff --git a/erts/configure.in b/erts/configure.in +index b3fe48d..9e19e33 100644 +--- a/erts/configure.in ++++ b/erts/configure.in +@@ -1555,10 +1555,11 @@ if test "$have_gethostbyname_r" = yes; then + [Define to flavour of gethostbyname_r])) + ;; + *) +- AC_EGREP_CPP(yes,[#include +- #ifdef __GLIBC__ +- yes +- #endif ++ AC_EGREP_CPP(^yes$,[ ++#include ++#ifdef __GLIBC__ ++yes ++#endif + ], AC_DEFINE(HAVE_GETHOSTBYNAME_R, GHBN_R_GLIBC, + [Define to flavour of gethostbyname_r])) + ;; +@@ -4303,10 +4304,10 @@ case "$erl_xcomp_without_sysroot-$with_ssl" in + SSL_INCLUDE="-I$dir/include" + old_CPPFLAGS=$CPPFLAGS + CPPFLAGS=$SSL_INCLUDE +- AC_EGREP_CPP(yes,[ ++ AC_EGREP_CPP(^yes$,[ + #include + #if OPENSSL_VERSION_NUMBER >= 0x0090700fL +- yes ++yes + #endif + ],[ + ssl_found=yes +@@ -4501,10 +4502,10 @@ if test "x$SSL_APP" != "x" ; then + AC_MSG_CHECKING(for OpenSSL kerberos 5 support) + old_CPPFLAGS=$CPPFLAGS + CPPFLAGS=$SSL_INCLUDE +- AC_EGREP_CPP(yes,[ ++ AC_EGREP_CPP(^yes$,[ + #include + #ifndef OPENSSL_NO_KRB5 +- yes ++yes + #endif + ],[ + AC_MSG_RESULT([yes]) +-- +2.1.0 +