From patchwork Tue Mar 24 16:41:27 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Oudinet X-Patchwork-Id: 453951 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 EAC3A140082 for ; Wed, 25 Mar 2015 03:41:48 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=gmail.com header.i=@gmail.com header.b=VgCA8Zxc; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 1930B336AD; Tue, 24 Mar 2015 16:41:48 +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 cQkrQsooRyrX; Tue, 24 Mar 2015 16:41:46 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 1D58F33692; Tue, 24 Mar 2015 16:41:46 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 2BED21C2437 for ; Tue, 24 Mar 2015 16:41:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 26D4591BE6 for ; Tue, 24 Mar 2015 16:41:44 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id G7sWzcwfLgXU for ; Tue, 24 Mar 2015 16:41:43 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wg0-f45.google.com (mail-wg0-f45.google.com [74.125.82.45]) by whitealder.osuosl.org (Postfix) with ESMTPS id 26B6491C0E for ; Tue, 24 Mar 2015 16:41:43 +0000 (UTC) Received: by wgs2 with SMTP id 2so68791744wgs.1 for ; Tue, 24 Mar 2015 09:41:41 -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=hue0fwY5z3W8b2ustSKPAx7VaN/0WqrjGln2KM2BepU=; b=VgCA8ZxcWLQBprazUsnbXDEHjOH3QPbYQ6aYNv1b9hPnuwTyKziZWNMj7PNqzgfndA Mlx2FiEXZx+TgIC/TEOQFJ/FqBsW2L6YzheoIg+MYGbISVfFsYloE/AkeLgt+KFhTdwf 1V0hIRi8loYt7KdTshgOJ9DtukDdmtTQpmGYCsth2Rrg1d4XI5GxEmzCeL57OPxvKQFF cdbniM+01FfZ3Z8FJ6d5sgBAVe47kMoQ05CYpX+KlmJ/SeDfWl4Eb1pi7dc+L2dhGm2Z NHi0e2oCrorfzuruHT1WzZpj0AufzYXGchriTjdFaciSYrToq/n/Nw4ZHDj0YWFuh0qH xjiA== X-Received: by 10.180.218.162 with SMTP id ph2mr29558019wic.22.1427215301799; Tue, 24 Mar 2015 09:41:41 -0700 (PDT) Received: from localhost.localdomain ([193.51.194.209]) by mx.google.com with ESMTPSA id ps4sm6815132wjc.31.2015.03.24.09.41.40 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 24 Mar 2015 09:41:40 -0700 (PDT) From: Johan Oudinet To: buildroot@buildroot.org Date: Tue, 24 Mar 2015 17:41:27 +0100 Message-Id: <1427215287-28980-1-git-send-email-johan.oudinet@gmail.com> X-Mailer: git-send-email 2.1.0 Subject: [Buildroot] [PATCH 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 | 117 +++++++++++++++++++++ 1 file changed, 117 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..ca5a88d --- /dev/null +++ b/package/erlang/0004-erts-fix-incorrect-use-of-ac-egrep-cpp.patch @@ -0,0 +1,117 @@ +diff -uprN erlang-17.4.orig/aclocal.m4 erlang-17.4.fixed/aclocal.m4 +--- erlang-17.4.orig/aclocal.m4 2015-03-24 14:42:36.176568511 +0100 ++++ erlang-17.4.fixed/aclocal.m4 2015-03-24 14:59:22.463659414 +0100 +@@ -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 -uprN erlang-17.4.orig/erts/aclocal.m4 erlang-17.4.fixed/erts/aclocal.m4 +--- erlang-17.4.orig/erts/aclocal.m4 2015-03-24 14:42:36.904562066 +0100 ++++ erlang-17.4.fixed/erts/aclocal.m4 2015-03-24 14:59:55.563366368 +0100 +@@ -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 -uprN erlang-17.4.orig/erts/configure.in erlang-17.4.fixed/erts/configure.in +--- erlang-17.4.orig/erts/configure.in 2015-03-24 14:42:36.800562987 +0100 ++++ erlang-17.4.fixed/erts/configure.in 2015-03-24 15:05:25.441505273 +0100 +@@ -1555,10 +1555,11 @@ if test "$have_gethostbyname_r" = yes; t + [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_s + 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]) +diff -uprN erlang-17.4.orig/lib/erl_interface/aclocal.m4 erlang-17.4.fixed/lib/erl_interface/aclocal.m4 +--- erlang-17.4.orig/lib/erl_interface/aclocal.m4 2015-03-24 14:42:33.828589299 +0100 ++++ erlang-17.4.fixed/lib/erl_interface/aclocal.m4 2015-03-24 15:07:07.057508803 +0100 +@@ -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 -uprN erlang-17.4.orig/lib/megaco/aclocal.m4 erlang-17.4.fixed/lib/megaco/aclocal.m4 +--- erlang-17.4.orig/lib/megaco/aclocal.m4 2015-03-24 14:42:35.528574248 +0100 ++++ erlang-17.4.fixed/lib/megaco/aclocal.m4 2015-03-24 15:06:18.081509514 +0100 +@@ -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 -uprN erlang-17.4.orig/lib/odbc/aclocal.m4 erlang-17.4.fixed/lib/odbc/aclocal.m4 +--- erlang-17.4.orig/lib/odbc/aclocal.m4 2015-03-24 14:42:34.388584341 +0100 ++++ erlang-17.4.fixed/lib/odbc/aclocal.m4 2015-03-24 15:06:41.993509724 +0100 +@@ -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 -uprN erlang-17.4.orig/lib/wx/aclocal.m4 erlang-17.4.fixed/lib/wx/aclocal.m4 +--- erlang-17.4.orig/lib/wx/aclocal.m4 2015-03-24 14:42:34.928579560 +0100 ++++ erlang-17.4.fixed/lib/wx/aclocal.m4 2015-03-24 15:07:36.105506283 +0100 +@@ -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