From patchwork Fri Mar 20 22:23:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 1259257 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.137; helo=fraxinus.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=T4tRD6Lr; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48kdbp4RPPz9sPF for ; Sat, 21 Mar 2020 09:24:06 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id DB7E085F74; Fri, 20 Mar 2020 22:24:04 +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 q6UMXJwYact4; Fri, 20 Mar 2020 22:24:04 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 3E79B85FA5; Fri, 20 Mar 2020 22:24:04 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 5AB9E1BF23B for ; Fri, 20 Mar 2020 22:24:03 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 4C29B87694 for ; Fri, 20 Mar 2020 22:24:03 +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 xdkehFzIhrbx for ; Fri, 20 Mar 2020 22:24:02 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pf1-f194.google.com (mail-pf1-f194.google.com [209.85.210.194]) by whitealder.osuosl.org (Postfix) with ESMTPS id A083F8740E for ; Fri, 20 Mar 2020 22:24:02 +0000 (UTC) Received: by mail-pf1-f194.google.com with SMTP id b72so4002899pfb.11 for ; Fri, 20 Mar 2020 15:24:02 -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:mime-version :content-transfer-encoding; bh=gFqyuLCHtzWr0wV6rCtH3M2EjdQ8hS5eHbtW1ZwuKIw=; b=T4tRD6LrhBggE7K9IwJ7jGcRkuEeWyok0MuWCdV3mXFag7X3h40+tY5M5IlY9sDJNj mwCLBEcOPkYVlI8wZyKs/tr/0QKZWfuGJG741zvC0Z+NpWpSIfhLW9pyjWpvQM3sEcvf JixniQZoVkws2ydJzW3I/msyv1jX5X9kFGrQabIKoUXW1pfnOc1GBUdYkxjd/mr2kYxy K/oN1DrkBUBRlzX4vPK1AwhYzxnLqbQU9EE0zdmgdXmOlHeheHdxf8KFUE3PP0E+9ZEP M680Rvpw3p4znQgIRhyZO5ZqpTHc5UsAg3q3ZK2vHe8e5Wix2E9J2RxKiiL3JmAWhvIr L9KA== 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=gFqyuLCHtzWr0wV6rCtH3M2EjdQ8hS5eHbtW1ZwuKIw=; b=uGirSgiHMMi3xg82canlvKc01Tersfx8H9baFE/9G0UeH+tFHnq8K1G+7g3A6ligpq OSZVq7qDRl4Tu2sDzBJVHGnM+LytupMkrHOwVlY5gzonva8Ya61cd9KhzxGc17DC4w9D 2anlOEDmBZGAhu9/AmXSGGNoVvGL5KVEnndIoXzlIZi60wy6wp/pN/3/bI3KwXONOWtJ Uk6iKL2d67B3HuF1VFAodWuTYqn86nxICdkJRFIgFa6IZb5U4pk9GStD9pti0Ak8gTmC tKkz70LnduIXqGYYGuz/umZlSuERb5GX58zyHjvjX4uiDUtq7eT8fXL+BidKLtKhyu0/ +EgA== X-Gm-Message-State: ANhLgQ1OnG0S3vjlmZw+c1zr8uQOd7BcCvMJMVYkoUoZjsTNSfbUJIyG iHoVstW27L3fu+pUcDbZIpuogMKA X-Google-Smtp-Source: ADFU+vsK6Ff4h5SGjuolGFE0S5uWkwl4P1GbOE0VJTFivSKREC2l7XnQfqegzPxXK2X6MLGjbvRuOA== X-Received: by 2002:a63:ce42:: with SMTP id r2mr11304319pgi.106.1584743041883; Fri, 20 Mar 2020 15:24:01 -0700 (PDT) Received: from localhost.localdomain ([47.149.8.172]) by smtp.gmail.com with ESMTPSA id 9sm5975319pge.65.2020.03.20.15.24.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Mar 2020 15:24:01 -0700 (PDT) From: aduskett@gmail.com To: buildroot@buildroot.org Date: Fri, 20 Mar 2020 15:23:58 -0700 Message-Id: <20200320222359.88689-1-aduskett@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/2] package/gobject-introspection/g-ir-scanner: do not set default compiler values 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: Adam Duskett Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Adam Duskett Commit 8b0aeafce2a22913e6a44818227f6a39e3225157 set 7 new variables in g-ir-scanner.in: export CPP="${CPP:-${HOST_DIR}/bin/@BASENAME_TARGET_CPP@}" export CC="${CC:-${HOST_DIR}/bin/@BASENAME_TARGET_CC@}" export CXX="${CXX:-${HOST_DIR}/bin/@BASENAME_TARGET_CXX@}" CPPFLAGS="${CPPFLAGS:-@TARGET_CPPFLAGS@}" CFLAGS="${CFLAGS:-@TARGET_CFLAGS@}" CXXFLAGS="${CXXFLAGS:-@TARGET_CXXFLAGS@}" LDFLAGS="${LDFLAGS:-@TARGET_LDFLAGS@}" However, defaulting to CPP, CC, or CXX breaks some packages because they may hard code CC to the system CC. One such package is libostree which has the line "INTROSPECTION_SCANNER_ENV = CC=gcc" in the Makefile. Because g-ir-scanner defaults CC to a predefined CC instead of explicitly overwriting it, the CC passed from the makefile is used, and linking errors occur as a result. Remove the defaults for the following and explicitly set the paths to the proper cross-toolchain binaries: CPP, CC, CXX Fixes http://autobuild.buildroot.org/results/f8a14307e6feff61acd963d6cd2aac289e6d1647 Signed-off-by: Adam Duskett --- package/gobject-introspection/g-ir-scanner.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/gobject-introspection/g-ir-scanner.in b/package/gobject-introspection/g-ir-scanner.in index 22df7be309..6fc495389e 100644 --- a/package/gobject-introspection/g-ir-scanner.in +++ b/package/gobject-introspection/g-ir-scanner.in @@ -5,9 +5,9 @@ # the variables blank (LDFLAGS, CFLAGS, and CPPFLAGS.) # Export these variables to ensure all build systems can generate .gir and # .typelib files properly. -export CPP="${CPP:-${HOST_DIR}/bin/@BASENAME_TARGET_CPP@}" -export CC="${CC:-${HOST_DIR}/bin/@BASENAME_TARGET_CC@}" -export CXX="${CXX:-${HOST_DIR}/bin/@BASENAME_TARGET_CXX@}" +export CPP="${HOST_DIR}/bin/@BASENAME_TARGET_CPP@" +export CC="${HOST_DIR}/bin/@BASENAME_TARGET_CC@" +export CXX="${HOST_DIR}/bin/@BASENAME_TARGET_CXX@" export CPPFLAGS="${CPPFLAGS:-@TARGET_CPPFLAGS@}" export CFLAGS="${CFLAGS:-@TARGET_CFLAGS@}" export CXXFLAGS="${CXXFLAGS:-@TARGET_CXXFLAGS@}" From patchwork Fri Mar 20 22:23:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Duskett X-Patchwork-Id: 1259258 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.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.a=rsa-sha256 header.s=20161025 header.b=sGy9e2ex; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48kdbw35BVz9sPF for ; Sat, 21 Mar 2020 09:24:12 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id C50B48829E; Fri, 20 Mar 2020 22:24:08 +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 Td4aiFw52bit; Fri, 20 Mar 2020 22:24:06 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 705BD8760E; Fri, 20 Mar 2020 22:24:06 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 41A801BF23B for ; Fri, 20 Mar 2020 22:24:04 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 3B56B8760E for ; Fri, 20 Mar 2020 22:24:04 +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 Wz9-tZuSpDKc for ; Fri, 20 Mar 2020 22:24:03 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pg1-f195.google.com (mail-pg1-f195.google.com [209.85.215.195]) by whitealder.osuosl.org (Postfix) with ESMTPS id BEE788740E for ; Fri, 20 Mar 2020 22:24:03 +0000 (UTC) Received: by mail-pg1-f195.google.com with SMTP id t3so3787471pgn.1 for ; Fri, 20 Mar 2020 15:24:03 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=vrw5Be9u7YSCoZJpR5EMz3hV/5iJc20FwDXOExlnVD8=; b=sGy9e2ex6Hm0jaWtw89I+mMeRbsomFpOf9dEfLE6YH+l0/QPmAjInZA1rA74x879Z9 addIaoFl6vF7Y5PiaGgi9AEKA1b/t9/O9u0yY0CoUILjQOoq7DZn+id1WdCWdRPaPlTZ lNG1CkR/wDMiwOVJuen6t/UwaJBPZdpyXAv8o3VT7tNY07OH56pc5D1N0p1P3S/2PBou VQ3ZvXncZR2Kn092DlcvyMKyTZFaeCg7lWdxSd1oKFZ5xt7ee+FPClML4MOv+Taj9CRq AdHxfulB0epXXklVTdnaqLBV94OnwQItoDhydLuUIqOBt2DAspjoDo63vF9pYGJ4V8zZ 1rMw== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=vrw5Be9u7YSCoZJpR5EMz3hV/5iJc20FwDXOExlnVD8=; b=ufipYdyow3grYnsLi7zYIwhgiBQVdsxgDAInRjNcIGehpY/Tb89N7Wb+6yJu6Bd0KM YPzx1JaBqfxqIrBE9CXpwcgnNVGDkN1Mf+jnl07b3+z6aZRbwTPQi6fIHJZ40JnNRRxb UIo9EmERGDxW9Hsyz9usgnyR49I1d+08HEu99QKAbZ01KRVhp+zCRtE07QM4QKF7YzTC puI1MUVudiVHlg7ecWUS7But8qtoqtBbk1PUCD7sF7pzHL4EWt1oSsaah0qSFjiz/G+d nSGIBF3baSFcHyT6pjzYUTEaL90NVtLYNIZYraUOS+z/9B2QKXFwdtbqSZ/JnvSVSwCS f5qQ== X-Gm-Message-State: ANhLgQ1UbXkaDSn4clFJ6HtvnuQNzm1HUH2sgQVJ3QShoZiWQKUMcZBX BgjQRaCWu7nugO6nPKR6JH3Y8bFo X-Google-Smtp-Source: ADFU+vuh0f4tA1aGJPfGfSIs9dIEsX7nem53HjH6iCocQ1SM5V3WpGov33E6JTHrPSg+cP/1IlDtug== X-Received: by 2002:a63:481e:: with SMTP id v30mr11112414pga.61.1584743043085; Fri, 20 Mar 2020 15:24:03 -0700 (PDT) Received: from localhost.localdomain ([47.149.8.172]) by smtp.gmail.com with ESMTPSA id 9sm5975319pge.65.2020.03.20.15.24.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Mar 2020 15:24:02 -0700 (PDT) From: aduskett@gmail.com To: buildroot@buildroot.org Date: Fri, 20 Mar 2020 15:23:59 -0700 Message-Id: <20200320222359.88689-2-aduskett@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200320222359.88689-1-aduskett@gmail.com> References: <20200320222359.88689-1-aduskett@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 2/2] package/libostree: add introspection support 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: Marcus Folkesson , Adam Duskett Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Adam Duskett If gobject-introspection is selected, explicitly set --enable-introspection in the configure options and add a dependency for gobject-introspection. Signed-off-by: Adam Duskett --- package/libostree/libostree.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/libostree/libostree.mk b/package/libostree/libostree.mk index bdbe6b5aba..63e6bbfde3 100644 --- a/package/libostree/libostree.mk +++ b/package/libostree/libostree.mk @@ -30,6 +30,13 @@ else LIBOSTREE_CONF_OPTS += --without-openssl endif +ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) +LIBOSTREE_CONF_OPTS += --enable-introspection +LIBOSTREE_DEPENDENCIES += gobject-introspection +else +LIBOSTREE_CONF_OPTS += --disable-introspection +endif + # Avahi support needs libavahi-client, which is built by avahi if avahi-daemon # and dbus is selected. Since there is no BR2_PACKAGE_LIBAVAHI_CLIENT config # option yet, use the avahi-daemon and dbus config symbols to check for