From patchwork Wed Feb 26 18:52:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 1245286 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.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.a=rsa-sha256 header.s=20161025 header.b=ByvlxeU3; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48SQ140fVLz9sNg for ; Thu, 27 Feb 2020 05:53:11 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 86FC687BA6; Wed, 26 Feb 2020 18:53:09 +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 Nou5Mq+lxHgT; Wed, 26 Feb 2020 18:53:09 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id E60D787BB8; Wed, 26 Feb 2020 18:53:08 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 668491BF41D for ; Wed, 26 Feb 2020 18:53:07 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 6044F221D9 for ; Wed, 26 Feb 2020 18:53:07 +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 ei7q+JLekzPE for ; Wed, 26 Feb 2020 18:53:06 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) by silver.osuosl.org (Postfix) with ESMTPS id 5EF31221D2 for ; Wed, 26 Feb 2020 18:53:06 +0000 (UTC) Received: by mail-pf1-f174.google.com with SMTP id y5so211000pfb.11 for ; Wed, 26 Feb 2020 10:53:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=P7yvL8hmfAxbDx7FP6Z1KRpucgtBWE2YTpi16X/zc/U=; b=ByvlxeU3roelra7KdgPAS8y05wHJZ5ectwUQ0vr0E8z1K1ZY+cIIest9oy4JVdukyK AkdjAc2hx0Ic/Z2HnYTaIj/mUInOxzgI5wr2EOmFTZxny+AyqxscWSMnAdYk1jJ6CLXT LeDUy3h8We9H4yPK/pENZojNEqtrcn2FmeuMQcV8s2n0YhkvTKVUnRqxy9wZrjvwQb1d M1yoVbFiNw4nfT+t91xBz4WerHamI9yTxCiDCK7Ox9cYnWzy19sjruALafQJhXrv6iAr 37umOp9U+zSiFXN1UO5b9zlxk6H2so/9DbqWy9bYSAyMzkHfA749uJfpb8RrXXHQNpxG 9JYA== 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:mime-version :content-transfer-encoding; bh=P7yvL8hmfAxbDx7FP6Z1KRpucgtBWE2YTpi16X/zc/U=; b=o6944QjZmvHlTugSOE8wANAp4aDjrDFOtE3vcX+m8bD7q3uTZGJkO270skLvRCSYnp r8Y8Cw3T/hoiu01M2rV/D833+bZHl09li9XuUmUwjqyzDlUKcCVglxiPaEgvJ7efwLAG bRqeSE8pGG8qyhUREfRacJaZjq8N90V3U3c54tdaFvV07wNVnLZVxtji2d1mT1/tQRf6 tE/fWnR7ojy6apqabKnxI6XBllGFK30mrEUGKBUe4cNXY1XZLY4IjBKvOHWK8KopMq6n Xut9BMrKSl55GBpV5/lGlymdx3ROOKlQsfYkkjw00L1Ky2x4u6bboTFvlIQJ4GjO9Obc PB6Q== X-Gm-Message-State: APjAAAU5/boCaHawpm2Hw/lBSSWEoU0h6ymlD4L1vit8nj8lCnAjVSY1 /EVpH8KQe57j2D3X9Rzj8mOK2Od/rKk= X-Google-Smtp-Source: APXvYqw0xh5+uHyrG6YvD/+jpOt15VswIBifm5qdG3AV3VdTMeCGHsIarbhSPlesXBmuElWzisoyaw== X-Received: by 2002:a65:645a:: with SMTP id s26mr226641pgv.135.1582743185424; Wed, 26 Feb 2020 10:53:05 -0800 (PST) Received: from localhost.localdomain ([12.220.142.98]) by smtp.gmail.com with ESMTPSA id o10sm3357269pgq.68.2020.02.26.10.53.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 26 Feb 2020 10:53:04 -0800 (PST) From: aduskett@gmail.com To: buildroot@buildroot.org Date: Wed, 26 Feb 2020 10:52:42 -0800 Message-Id: <20200226185244.31556-1-aduskett@gmail.com> X-Mailer: git-send-email 2.21.1 (Apple Git-122.3) MIME-Version: 1.0 Subject: [Buildroot] [PATCH/next v3 1/3] package/gobject-introspection: fix host-linking X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eric Le Bihan , Adam Duskett Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Adam Duskett When building, gobject-introspection uses g-ir-scanner to build several .gir files. g-ir-scanner does not use LDPATH, so LD_LIBRARY_PATH must be used in order to ensure that g-ir-scanner does not use the host library path. This fix has the added benefit of allowing the host gobject-introspection to build the host .gir, .rnc, and .typelib files, which some packages may require. Signed-off-by: Adam Duskett --- Changes v1 -> v2: - Provide better documentation as to why this is needed. (Yann) package/gobject-introspection/gobject-introspection.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package/gobject-introspection/gobject-introspection.mk b/package/gobject-introspection/gobject-introspection.mk index 67e5e37dee..e28748be2e 100644 --- a/package/gobject-introspection/gobject-introspection.mk +++ b/package/gobject-introspection/gobject-introspection.mk @@ -33,11 +33,11 @@ HOST_GOBJECT_INTROSPECTION_DEPENDENCIES = \ GOBJECT_INTROSPECTION_NINJA_ENV += \ CC="$(TARGET_CC)" -# Disable introspection data on the host, as it is not needed and -# the package will attempt to use the systems libglib2 which will fail -# if the systems libglib2 version is older than 2.60. -HOST_GOBJECT_INTROSPECTION_CONF_OPTS = \ - -Denable-introspection-data=false +# When building, gobject-introspection uses g-ir-scanner to build several .gir +# files. g-ir-scanner does not use LDPATH, so LD_LIBRARY_PATH must be used in +# order to ensure that g-ir-scanner does not use the host library path. +HOST_GOBJECT_INTROSPECTION_NINJA_ENV += \ + LD_LIBRARY_PATH="$(HOST_DIR)/lib" # Use the host gi-scanner to prevent the scanner from generating incorrect # elf classes.