From patchwork Wed Mar 19 17:27:58 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Clayton Shotwell X-Patchwork-Id: 331805 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 210832C00AE for ; Thu, 20 Mar 2014 04:28:08 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 56AAF8B3FD; Wed, 19 Mar 2014 17:28:07 +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 s7MgqEIrgqth; Wed, 19 Mar 2014 17:28:05 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 529B38B3E2; Wed, 19 Mar 2014 17:28:05 +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 9CE351BF97C for ; Wed, 19 Mar 2014 17:28:03 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 99E4C8B7C5 for ; Wed, 19 Mar 2014 17:28:03 +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 tH2SJUzM89Ja for ; Wed, 19 Mar 2014 17:28:02 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from secvs01.rockwellcollins.com (secvs01.rockwellcollins.com [205.175.225.240]) by fraxinus.osuosl.org (Postfix) with ESMTPS id CBC948B7A3 for ; Wed, 19 Mar 2014 17:28:01 +0000 (UTC) Received: from nosuchhost.198.131.in-addr.arpa (HELO collinscrsmtp01.rockwellcollins.com) ([131.198.63.132]) by mail-virt.rockwellcollins.com with ESMTP; 19 Mar 2014 12:28:00 -0500 Received: from nyx ([131.198.63.11]) by collinscrsmtp01.rockwellcollins.com (Lotus Domino Release 8.5.2FP2 HF162) with ESMTP id 2014031912275995-5138428 ; Wed, 19 Mar 2014 12:27:59 -0500 From: Clayton Shotwell To: buildroot@buildroot.org Date: Wed, 19 Mar 2014 12:27:58 -0500 Message-Id: <1395250078-16782-1-git-send-email-clshotwe@rockwellcollins.com> X-Mailer: git-send-email 1.7.1 X-MIMETrack: Itemize by SMTP Server on CollinsCRSMTP01/CedarRapids/Collins/Rockwell(Release 8.5.2FP2 HF162|May 16, 2011) at 03/19/2014 12:27:59 PM, Serialize by Router on CollinsCRSMTP01/CedarRapids/Collins/Rockwell(Release 8.5.2FP2 HF162|May 16, 2011) at 03/19/2014 12:28:00 PM, Serialize complete at 03/19/2014 12:28:00 PM X-TNEFEvaluated: 1 Cc: Clayton Shotwell Subject: [Buildroot] [PATCH] rsyslog: Update patch to upstreamed version X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 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-bounces@busybox.net Patch for the libgcrypt-config path correction was accepted by the mainline for rsyslog. Updating the buildroot patch until a new version with the fix is released. --- ...yslog-0001-libgcrypt-config-path-override.patch | 22 +++++++++++-------- 1 files changed, 13 insertions(+), 9 deletions(-) diff --git a/package/rsyslog/rsyslog-0001-libgcrypt-config-path-override.patch b/package/rsyslog/rsyslog-0001-libgcrypt-config-path-override.patch index 6af0db7..c0d8bfa 100644 --- a/package/rsyslog/rsyslog-0001-libgcrypt-config-path-override.patch +++ b/package/rsyslog/rsyslog-0001-libgcrypt-config-path-override.patch @@ -1,6 +1,6 @@ -From 2d498883b19c386abacffca969eb404c9407a8cc Mon Sep 17 00:00:00 2001 +From 86d19e4e63c3fa5b9690991f3e29ffab93990acd Mon Sep 17 00:00:00 2001 From: Clayton Shotwell -Date: Mon, 10 Mar 2014 14:40:35 -0500 +Date: Wed, 19 Mar 2014 08:28:55 -0500 Subject: [PATCH] configure: Allow overriding of libgcrypt-config Allow the overriding of the libgcrypt-config path if it is not at @@ -8,14 +8,14 @@ a standard location. Signed-off-by: Clayton Shotwell --- - configure.ac | 12 ++++-------- - 1 file changed, 4 insertions(+), 8 deletions(-) + configure.ac | 14 +++++--------- + 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac -index 9643b84..7eb7712 100644 +index 314c16e..bf017d2 100644 --- a/configure.ac +++ b/configure.ac -@@ -820,19 +820,15 @@ AC_ARG_ENABLE(libgcrypt, +@@ -797,22 +797,18 @@ AC_ARG_ENABLE(libgcrypt, [enable_libgcrypt=yes] ) if test "x$enable_libgcrypt" = "xyes"; then @@ -25,8 +25,8 @@ index 9643b84..7eb7712 100644 - [yes],,, - ) - if test "x${HAVE_LIBGCRYPT_CONFIG}" != "xyes"; then -+ AC_PATH_PROG(LIBGCRYPT_CONFIG,libgcrypt-config) -+ if test "x${LIBGCRYPT_CONFIG}" == "x"; then ++ AC_PATH_PROG([LIBGCRYPT_CONFIG],[libgcrypt-config],[no]) ++ if test "x${LIBGCRYPT_CONFIG}" = "xno"; then AC_MSG_FAILURE([libgcrypt-config not found in PATH]) fi AC_CHECK_LIB( @@ -38,7 +38,11 @@ index 9643b84..7eb7712 100644 + LIBGCRYPT_LIBS="`${LIBGCRYPT_CONFIG} --libs`" ], [AC_MSG_FAILURE([libgcrypt is missing])], - [`libgcrypt-config --libs --cflags`] +- [`libgcrypt-config --libs --cflags`] ++ [`${LIBGCRYPT_CONFIG} --libs --cflags`] + ) + AC_DEFINE([ENABLE_LIBGCRYPT], [1], [Indicator that LIBGCRYPT is present]) + fi -- 1.7.9.5