From patchwork Fri Jul 27 19:40:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcus Folkesson X-Patchwork-Id: 950310 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="f7slSxCM"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41cfSx3YfJz9ryt for ; Sat, 28 Jul 2018 05:40:33 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 5E08188FF6; Fri, 27 Jul 2018 19:40:31 +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 6SqDlCZjoL1x; Fri, 27 Jul 2018 19:40:30 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 77D7788FCA; Fri, 27 Jul 2018 19:40:30 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 191881CEF86 for ; Fri, 27 Jul 2018 19:40:29 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 15C0A8945C for ; Fri, 27 Jul 2018 19:40:29 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id YboJSdbiBD7R for ; Fri, 27 Jul 2018 19:40:28 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lj1-f193.google.com (mail-lj1-f193.google.com [209.85.208.193]) by hemlock.osuosl.org (Postfix) with ESMTPS id 1866D89456 for ; Fri, 27 Jul 2018 19:40:28 +0000 (UTC) Received: by mail-lj1-f193.google.com with SMTP id r13-v6so5360035ljg.10 for ; Fri, 27 Jul 2018 12:40:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=qiPhd4dHjlpugkD2W1uOnFWjqprldv3ydV48BMxVhK4=; b=f7slSxCMsjRBuyM8I+fsT4U9OfBMOwBnrf7e+OFjeA+cFF6gCr4x3HKBBIHZp2fbmU IF45KE5Vf5untLrMJY107inWlOV9Zx+1pGdecMMGtAVNdS0V4OJzLFjUSNQHxFq2IjpK nB6t1VE74Em+IhA2L2/MAMXkJeYOkItdt1msmzUCK4dPNdGlbeGLX2o4JokjmuDfn1X0 lC4E4PUt5QfLEF8wWgaMYhQL8kPj0u66lKjcs/QBw7qBgadUQ5fLgIT090XfW3RbTjYZ +HqPvKdMyzUtTTLzO5IL+K4xkSz3DUTQG32nAf90bYsHxjRvgb95tUg4s5OAximssHk4 lBeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=qiPhd4dHjlpugkD2W1uOnFWjqprldv3ydV48BMxVhK4=; b=iuJHf16MPErdkYnXr7TqeS3p9rWchSMHpF8FUaJxlsKVqUn4KWqvmUU2QFwYrdMJWT EYuyLdeUYlfZSOo+fYpcb5Q4XyPbs3DL+/0r9P8LnPh6p+R/eoS7l016ZUcpicv3sOKW a34dHfT7z9DlILTv04cK1GfkJEaRZodNdTTM3px6C286X37SuHz4x9cirZPZ+gtaiftw 6ro0vI/c6CYMRAa0QcaAqL/FH/O8PXKvSRrXCkZ5NZ1LrR8/cWT4Uph5C2AH0TEQ4Yo8 OtiK0dN+qmnxt4mwMhPn6Wj/tqN2LVAI0ia0hr+/zTCuFtLxtzFGVhaeRLUZiHT/4T/v mKhw== X-Gm-Message-State: AOUpUlEwSkwc1K7+bV8m4lOIuMxTHjshcie2TIehPSU8DjFY9ip/lOJT 8NznKUh2wMm5c/LEikT323o/NgPb X-Google-Smtp-Source: AAOMgpef60MvM9yxFHDETBIbWKoXLn2ccYlfLqHegMNyJZLyw+vGprXvNiK4FaF6d2/+3DHL7mSHSw== X-Received: by 2002:a2e:5c07:: with SMTP id q7-v6mr5670561ljb.119.1532720425780; Fri, 27 Jul 2018 12:40:25 -0700 (PDT) Received: from localhost.localdomain (c-2ec2f9f0-74736162.cust.telenor.se. [46.194.249.240]) by smtp.gmail.com with ESMTPSA id e41-v6sm796012lji.37.2018.07.27.12.40.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 27 Jul 2018 12:40:24 -0700 (PDT) From: Marcus Folkesson To: buildroot@buildroot.org Date: Fri, 27 Jul 2018 21:40:32 +0200 Message-Id: <20180727194032.12451-1-marcus.folkesson@gmail.com> X-Mailer: git-send-email 2.18.0 Subject: [Buildroot] [PATCH v3] libostree: override path to gpg-error-config X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Marcus Folkesson MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" libostree has begun to use `gpg-error-config` in their configuration script. Point out gpg-error-config in staging dir to avoid using the one installed on the host system. Fixes: http://autobuild.buildroot.net/results/447b96e449e881cf1bd9644cda0f386aa4c75724 Signed-off-by: Marcus Folkesson --- Notes: v2: - override GPG_ERROR_CONFIG instead of ac_cv_path_GPG_ERROR_CONFIG v3: - depend on libgpg-error package/libostree/Config.in | 5 +++-- package/libostree/libostree.mk | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/libostree/Config.in b/package/libostree/Config.in index b62f4ea0a1..4a6ab5464f 100644 --- a/package/libostree/Config.in +++ b/package/libostree/Config.in @@ -1,15 +1,16 @@ config BR2_PACKAGE_LIBOSTREE bool "libostree" - depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgpgme + depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgpgme, libgpg-error depends on !BR2_STATIC_LIBS # libfuse depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 depends on BR2_USE_WCHAR # libglib2 - depends on BR2_USE_MMU # e2fsprogs, libfuse,libglib2, libgpgme + depends on BR2_USE_MMU # e2fsprogs, libfuse, libglib2, libgpgme # doesn't build with musl due to lack of TEMP_FAILURE_RETRY() depends on !BR2_TOOLCHAIN_USES_MUSL select BR2_PACKAGE_E2FSPROGS select BR2_PACKAGE_LIBFUSE select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_LIBGPG_ERROR select BR2_PACKAGE_LIBGPGME select BR2_PACKAGE_XZ help diff --git a/package/libostree/libostree.mk b/package/libostree/libostree.mk index 24eda0d1db..48eff74574 100644 --- a/package/libostree/libostree.mk +++ b/package/libostree/libostree.mk @@ -10,8 +10,9 @@ LIBOSTREE_SITE = https://github.com/ostreedev/ostree/releases/download/v$(LIBOST LIBOSTREE_LICENSE = LGPL-2.0+ LIBOSTREE_LICENSE_FILES = COPYING -LIBOSTREE_DEPENDENCIES = e2fsprogs host-bison host-pkgconf libfuse libglib2 libgpgme xz +LIBOSTREE_DEPENDENCIES = e2fsprogs host-bison host-pkgconf libfuse libglib2 libgpg-error libgpgme xz LIBOSTREE_INSTALL_STAGING = YES +LIBOSTREE_CONF_ENV = GPG_ERROR_CONFIG=$(STAGING_DIR)/usr/bin/gpg-error-config LIBOSTREE_CONF_OPTS += \ --with-gpgme-prefix=$(STAGING_DIR)/usr \