From patchwork Sat Feb 8 14:34:53 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Martin X-Patchwork-Id: 318428 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 001AA2C00A5 for ; Sun, 9 Feb 2014 01:35:26 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 4A8808C986; Sat, 8 Feb 2014 14:35:26 +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 kBbdtYTCrB1j; Sat, 8 Feb 2014 14:35:22 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 959608C9BA; Sat, 8 Feb 2014 14:35:16 +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 EA8391BF960 for ; Sat, 8 Feb 2014 14:35:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id DF88D8C961 for ; Sat, 8 Feb 2014 14:35:12 +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 pwsoVf6-d2GJ for ; Sat, 8 Feb 2014 14:35:11 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-we0-f174.google.com (mail-we0-f174.google.com [74.125.82.174]) by whitealder.osuosl.org (Postfix) with ESMTPS id C97E78C09C for ; Sat, 8 Feb 2014 14:35:10 +0000 (UTC) Received: by mail-we0-f174.google.com with SMTP id x55so3125833wes.33 for ; Sat, 08 Feb 2014 06:35:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=8V4NnZ+FZcW2CoG2Jfpo0y5iRQ1vfmZc0CFDdBWtdJ0=; b=Pn70r5Z9Gsnn/Hh/JIaI15VoosfV4fNh3DtArsPslxl89AdIaCs+zkiJ6E/PRuO2Pq 0slG0prA0l80Uyoe+p2tn2+qdAJctCz+Iii1Inzrrd59uubBMFIm2ziIFoJyA4Ibg7DM QnAR6gDjc4SXa4aVgnuDEaMH8k9vm3p/gX/dQBDNaU/d4PYbzhVi+Daouk9i3YwZzdD+ YI7uYHX1s2tG0VdsiylNJylv+temc2Zcm9c0HXonXzd4NK2/OWuB26qMfHNrFJLtMQ94 dzplIscmq/ZFWX4c8PZipxM7njnvaFqyU+Ks4dJ0wrOT7n5varIsCDkf9is8myW2MANA qc6g== X-Received: by 10.194.174.197 with SMTP id bu5mr276807wjc.71.1391870109170; Sat, 08 Feb 2014 06:35:09 -0800 (PST) Received: from localhost.localdomain (ivr94-4-82-229-165-48.fbx.proxad.net. [82.229.165.48]) by mx.google.com with ESMTPSA id ua8sm19088346wjc.4.2014.02.08.06.35.08 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 08 Feb 2014 06:35:08 -0800 (PST) From: Samuel Martin To: buildroot@busybox.net Date: Sat, 8 Feb 2014 15:34:53 +0100 Message-Id: <1391870095-3738-5-git-send-email-s.martin49@gmail.com> X-Mailer: git-send-email 1.8.5.4 In-Reply-To: <1391870095-3738-1-git-send-email-s.martin49@gmail.com> References: <1391870095-3738-1-git-send-email-s.martin49@gmail.com> Subject: [Buildroot] [PATCH v1 4/6] vlc: fix libgcrypt support 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 This patch allows to override the libgcrypt-config location instead of using the one found in the PATH, which is usually the host system one. Fixes: http://autobuild.buildroot.org/results/5e4/5e42d1139bbbed2421193d8acc52df9442c43730/build-end.log Signed-off-by: Samuel Martin --- ...ac-add-check-for-libgcrypt-config-program.patch | 43 ++++++++++++++++++++++ package/vlc/vlc.mk | 3 ++ 2 files changed, 46 insertions(+) create mode 100644 package/vlc/vlc-0002-configure.ac-add-check-for-libgcrypt-config-program.patch diff --git a/package/vlc/vlc-0002-configure.ac-add-check-for-libgcrypt-config-program.patch b/package/vlc/vlc-0002-configure.ac-add-check-for-libgcrypt-config-program.patch new file mode 100644 index 0000000..1ad6712 --- /dev/null +++ b/package/vlc/vlc-0002-configure.ac-add-check-for-libgcrypt-config-program.patch @@ -0,0 +1,43 @@ +From 88bf3313850bc7f0e6db21daee2b8d8e607b7bb4 Mon Sep 17 00:00:00 2001 +From: Samuel Martin +Date: Sat, 8 Feb 2014 14:33:27 +0100 +Subject: [PATCH] configure.ac: add check for libgcrypt-config program + +This allows to override the default libgcrypt-config location (which is +useful when cross-compiling), instead of using the one from the host +system. + +Signed-off-by: Samuel Martin +--- + configure.ac | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 02fb8aa..5a2267b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -3943,16 +3943,17 @@ dnl + AC_ARG_ENABLE(libgcrypt, + [ --disable-libgcrypt gcrypt support (default enabled)]) + AS_IF([test "${enable_libgcrypt}" != "no"], [ ++ AC_PATH_PROG(GCRYPT_CONFIG,libgcrypt-config,libgcrypt-config) + AC_CHECK_DECL([GCRYCTL_SET_THREAD_CBS], [ +- libgcrypt-config --version >/dev/null || \ ++ ${GCRYPT_CONFIG} --version >/dev/null || \ + AC_MSG_ERROR([gcrypt.h present but libgcrypt-config could not be found]) + AC_CHECK_LIB(gcrypt, gcry_control, [ + have_libgcrypt="yes" +- GCRYPT_CFLAGS="`libgcrypt-config --cflags`" +- GCRYPT_LIBS="`libgcrypt-config --libs`" ++ GCRYPT_CFLAGS="`${GCRYPT_CONFIG} --cflags`" ++ GCRYPT_LIBS="`${GCRYPT_CONFIG} --libs`" + ], [ + AC_MSG_ERROR([libgcrypt not found. Install libgcrypt or use --disable-libgcrypt. Have a nice day.]) +- ], [`libgcrypt-config --libs`]) ++ ], [`${GCRYPT_CONFIG} --libs`]) + ], [ + AC_MSG_ERROR([libgcrypt version 1.1.94 or higher not found. Install libgcrypt or use --disable-libgcrypt. Have a nice day.]) + ], [#include ] +-- +1.8.5.4 + diff --git a/package/vlc/vlc.mk b/package/vlc/vlc.mk index feee82d..65aab36 100644 --- a/package/vlc/vlc.mk +++ b/package/vlc/vlc.mk @@ -10,6 +10,7 @@ VLC_SOURCE = vlc-$(VLC_VERSION).tar.xz VLC_LICENSE = GPLv2+ LGPLv2.1+ VLC_LICENSE_FILES = COPYING COPYING.LIB VLC_DEPENDENCIES = host-pkgconf +VLC_AUTORECONF = YES VLC_CONF_OPT += \ --disable-a52 \ @@ -110,6 +111,8 @@ endif ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) VLC_CONF_OPT += --enable-libgcrypt VLC_DEPENDENCIES += libgcrypt +VLC_CONF_ENV += \ + GCRYPT_CONFIG="$(STAGING_DIR)/usr/bin/libgcrypt-config" else VLC_CONF_OPT += --disable-libgcrypt endif