From patchwork Tue Oct 15 07:22:56 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Esben Haabendal X-Patchwork-Id: 283523 X-Patchwork-Delegate: esben@haabendal.dk Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hugin.dotsrc.org (hugin.dotsrc.org [IPv6:2001:878:346::102]) by ozlabs.org (Postfix) with ESMTP id 2A8A82C014D for ; Tue, 15 Oct 2013 18:20:12 +1100 (EST) Received: from hugin.dotsrc.org (localhost [127.0.0.1]) by hugin.dotsrc.org (Postfix) with ESMTP id BD9313F82B for ; Tue, 15 Oct 2013 09:20:10 +0200 (CEST) X-Original-To: dev@oe-lite.org Delivered-To: dev@oe-lite.org Received: from mail01.prevas.se (mail01.prevas.se [62.95.78.3]) by hugin.dotsrc.org (Postfix) with ESMTPS id 1E3063F82B for ; Tue, 15 Oct 2013 09:20:09 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=prevas.dk; i=@prevas.dk; l=2473; q=dns/txt; s=ironport1; t=1381821609; x=1413357609; h=from:to:cc:subject:references:date:in-reply-to: message-id:mime-version:content-transfer-encoding; bh=TF+Si415ekXBlOCIbgCQmU+1Et6jga+e+b2QAVIiQLE=; b=OZuyxkFUNq+3N/2mfvTbg65SiyU8YHIs19MsHqeGhyVeJ75f4FNacURZ Hcm4lP5JI6G4nkbdTKgXgXEkRPnYtndGMi2z2BDg5pWttzj5O5NfWckbr h0LKKAf61wCX3et8jUk3x+oX/wC0X1CvNBo3U++fkDPXO1aomUdINKmGh o=; X-IronPort-AV: E=Sophos;i="4.93,497,1378850400"; d="scan'208";a="4039355" Received: from vmprevas3.prevas.se (HELO smtp.prevas.se) ([172.16.8.103]) by ironport1.prevas.se with ESMTP/TLS/AES128-SHA; 15 Oct 2013 09:20:08 +0200 Received: from dev.prevas.dk (172.16.10.60) by smtp.prevas.se (172.16.8.105) with Microsoft SMTP Server (TLS) id 14.2.347.0; Tue, 15 Oct 2013 09:20:08 +0200 Received: from xpc.ulstruplund.dk (0x55532124.adsl.cybercity.dk [85.83.33.36]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: eha) by dev.prevas.dk (Postfix) with ESMTPSA id 31FED7FC97; Tue, 15 Oct 2013 09:20:08 +0200 (CEST) Received: by xpc.ulstruplund.dk (Postfix, from userid 1000) id 0FFCBA62D5; Tue, 15 Oct 2013 09:22:56 +0200 (CEST) From: Esben Haabendal To: Kim =?utf-8?Q?B=C3=B8ndergaard?= Subject: Re: [PATCH 13/17] libgcrypt: USE-flag defined for conf option --without-capabilities References: <06ca2e65047bcef89a4d6fa964ae03898b35c4f1.1380892944.git.kibo@prevas.dk> Date: Tue, 15 Oct 2013 09:22:56 +0200 In-Reply-To: <06ca2e65047bcef89a4d6fa964ae03898b35c4f1.1380892944.git.kibo@prevas.dk> ("Kim =?utf-8?Q?B=C3=B8ndergaard=22's?= message of "Fri, 4 Oct 2013 13:24:19 +0000") Message-ID: <87vc0zgfqn.fsf@xpc.ulstruplund.dk> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.4 (gnu/linux) MIME-Version: 1.0 Cc: dev@oe-lite.org X-BeenThere: dev@oe-lite.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: OE-lite development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dev-bounces@oe-lite.org Errors-To: dev-bounces@oe-lite.org Kim Bøndergaard writes: > --- > recipes/libgcrypt/libgcrypt.inc | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/recipes/libgcrypt/libgcrypt.inc b/recipes/libgcrypt/libgcrypt.inc > index 01634f6..6befa72 100644 > --- a/recipes/libgcrypt/libgcrypt.inc > +++ b/recipes/libgcrypt/libgcrypt.inc > @@ -8,7 +8,11 @@ DEPENDS_${PN} += "libgpg-error libcap2" > > SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-${PV}.tar.gz" > > -EXTRA_OECONF = "--without-pth --disable-asm --with-capabilities" > +RECIPE_FLAGS = "gcrypt_no_capabilities" > +DEFAULT_gcrypt_no_capabilites = "0" > + > +EXTRA_OECONF = "--without-pth --disable-asm" > +EXTRA_OECONF:>USE_gcrypt_no_capabilities = " --without-capabilities" According to "./configure --help": --with-capabilities Use linux capabilities default=no So, with your change, capabilities will always be disabled. I have changed the logic (double negation is not always too smart), and flag naming, creating a USE_libgcrypt_capabilities flag instead, which provides --with-capabilities and --without-capabilities arguments as needed. > # libgcrypt.pc is added locally and thus installed here > do_install[postfuncs] += "do_install_append" The new commit is: commit 25a141a5b922fb47dff736989764208157948dd0 Author: Esben Haabendal Date: Tue Oct 15 09:21:25 2013 +0200 libgcrypt: Add USE flag for controlling use of linux capabilities Signed-off-by: Esben Haabendal /Esben diff --git a/recipes/libgcrypt/libgcrypt.inc b/recipes/libgcrypt/libgcrypt.inc index 01634f6..7a48cf7 100644 --- a/recipes/libgcrypt/libgcrypt.inc +++ b/recipes/libgcrypt/libgcrypt.inc @@ -8,7 +8,12 @@ DEPENDS_${PN} += "libgpg-error libcap2" SRC_URI = "ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-${PV}.tar.gz" -EXTRA_OECONF = "--without-pth --disable-asm --with-capabilities" +RECIPE_FLAGS = "libgcrypt_capabilities" +DEFAULT_USE_libgcrypt_capabilities = "1" + +EXTRA_OECONF = "--without-pth --disable-asm ${EXTRA_OECONF_CAPABILITIES}" +EXTRA_OECONF_CAPABILITIES = "--without-capabilities" +EXTRA_OECONF_CAPABILITIES:USE_libgcrypt_capabilities = "--with-capabilities" # libgcrypt.pc is added locally and thus installed here do_install[postfuncs] += "do_install_append"