From patchwork Sat May 2 06:04:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Hilliard X-Patchwork-Id: 1281537 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.136; helo=silver.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=c5h48OTo; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49DdrJ62C6z9sSk for ; Sat, 2 May 2020 16:05:02 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id C2EEF204E5; Sat, 2 May 2020 06:04:56 +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 GpXA1DjinAmY; Sat, 2 May 2020 06:04:52 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id A177A2049A; Sat, 2 May 2020 06:04:52 +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 74DB51BF57F for ; Sat, 2 May 2020 06:04:51 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 71851890BF for ; Sat, 2 May 2020 06:04:51 +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 KRID8DotNkt2 for ; Sat, 2 May 2020 06:04:50 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-io1-f66.google.com (mail-io1-f66.google.com [209.85.166.66]) by hemlock.osuosl.org (Postfix) with ESMTPS id 5BFB688DAE for ; Sat, 2 May 2020 06:04:50 +0000 (UTC) Received: by mail-io1-f66.google.com with SMTP id j8so2672956iog.13 for ; Fri, 01 May 2020 23:04:50 -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=tE6TY8lYiZQ5e3AQbHJiKuBjx/HT0aNHprnp5EUhhxY=; b=c5h48OToUHf+NoZ6ojANF5mR0Y3lNBe9uqdcZhntIOJNnyNjbrx+epYHNEuMEAtD2J y6wfvfrd0M443rVEdvF63neAaBbN/Egu8Tb1YXe84UjsZoX3ZNyywxlaiwpZmFtuEKIG +Q0a3kMTDupbX3SnFGlH2VjPS0JF6/iWcJuiAtj0aB9GZaEnz9O6uM4+RQVOyQuOb30V UnSbFA0WsGj7IcySA/HFnc47y5KoX0SYpwc3ILtWjkTtOoGL7u6B1kGfn/FFcPm8yB5K VAE3vG2nNrmsRMQsKmG1e8j2HlpEBSiMYgEeiTaM9zYOiW1qrLmmZy/n+1sbhRdVOggU DMew== 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=tE6TY8lYiZQ5e3AQbHJiKuBjx/HT0aNHprnp5EUhhxY=; b=rOGa5Rv9ELX5zlHOEEYvIUwbdxLoh1ZCXuvZVzohJucvTxB14D3plRmDojpamytbem iWjpHXIY653VJyFAYYMvUzhfHJDiEi8jP3PEczXdXFSB3mj9XNbgSb64sqxpO+JzVkVn Tp0Y0agEiXE/RQwqUU6kbybf7E3OuVrcN3x7QrHYjcBqEVELWneZ583Tig8HzPqul1AI Vx/gqvE8X0dbGkkdDE9v//fElb37KNUe9r+v+Q77ihDj1yI9OKKOXkLpUh4yo+0KqcjR viSe8fJvI1B4ANMrIm4FM418dW0NYY2I4tbUKAoVwI9if1YQQZWhOFCNJouYgnFjRdde rYQw== X-Gm-Message-State: AGi0PuaBtAWOUghL0teYodu/kOStF76E2Ln1vWEqQyofI5V1VQy43HqL t8luWmBxNeyK4iEDA1i0OuMt86DasHM= X-Google-Smtp-Source: APiQypIcGTOdDITbEjoUNxY7jG6SptBZjJMNGtTwL4FeNjw9PJu8+P63xVw4O8ITWZwar/nkOkrIEQ== X-Received: by 2002:a05:6602:153:: with SMTP id v19mr517066iot.127.1588399489142; Fri, 01 May 2020 23:04:49 -0700 (PDT) Received: from james-x399.localdomain (71-218-122-171.hlrn.qwest.net. [71.218.122.171]) by smtp.gmail.com with ESMTPSA id g65sm2092108ild.40.2020.05.01.23.04.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 May 2020 23:04:48 -0700 (PDT) From: James Hilliard To: buildroot@buildroot.org Date: Sat, 2 May 2020 00:04:35 -0600 Message-Id: <20200502060435.23004-1-james.hilliard1@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/gobject-introspection: fix host version of .pc file for wrapper 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: James Hilliard , Adam Duskett Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Since meson searches for gobject-introspection-1.0.pc in the host pkgconfig PKG_CONFIG_LIBDIR we need to make sure it is useable. Fixes: http://autobuild.buildroot.net/results/90a/90a422419030f9e4408f2783d9e0e5c1f8922b66/build-end.log Signed-off-by: James Hilliard --- .../gobject-introspection.mk | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/package/gobject-introspection/gobject-introspection.mk b/package/gobject-introspection/gobject-introspection.mk index eefb2c83f7..d98eaf945a 100644 --- a/package/gobject-introspection/gobject-introspection.mk +++ b/package/gobject-introspection/gobject-introspection.mk @@ -136,6 +136,36 @@ define GOBJECT_INTROSPECTION_INSTALL_WRAPPERS endef GOBJECT_INTROSPECTION_POST_INSTALL_STAGING_HOOKS += GOBJECT_INTROSPECTION_INSTALL_WRAPPERS +define HOST_GOBJECT_INTROSPECTION_INSTALL_WRAPPERS + # Set prefix to /usr because pkg-config appends the sysroot directory + $(SED) "s%^prefix=.*%prefix=\/usr%g" \ + $(HOST_DIR)/usr/lib/pkgconfig/gobject-introspection-1.0.pc + # Gobject-introspection installs Makefile.introspection in + # $(STAGING_DIR)/usr/share which is needed for autotools-based programs to + # build .gir and .typelib files. Unfortuantly, gobject-introspection-1.0.pc + # uses $(prefix)/share as the directory, which + # causes the host /usr/share being used instead of $(STAGING_DIR)/usr/share. + # Change datarootdir to $(libdir)/../share which will prefix $(STAGING_DIR) + # to the correct location. + $(SED) "s%datarootdir=.*%datarootdir=\$${libdir}/../share%g" \ + $(HOST_DIR)/usr/lib/pkgconfig/gobject-introspection-1.0.pc + + # By default, girdir and typelibdir use datadir and libdir as their prefix, + # of which pkg-config appends the sysroot directory. This results in files + # being installed in $(STAGING_DIR)/$(STAGING_DIR)/path/to/files. + # Changing the prefix to exec_prefix prevents this error. + $(SED) "s%girdir=.*%girdir=\$${exec_prefix}/share/gir-1.0%g" \ + $(HOST_DIR)/usr/lib/pkgconfig/gobject-introspection-1.0.pc + + $(SED) "s%typelibdir=.*%typelibdir=\$${exec_prefix}/lib/girepository-1.0%g" \ + $(HOST_DIR)/usr/lib/pkgconfig/gobject-introspection-1.0.pc + + # Purge host-libffi cflags + $(SED) "s%^Cflags:.*%Cflags: -I\$${includedir}/gobject-introspection-1.0 %g" \ + $(HOST_DIR)/usr/lib/pkgconfig/gobject-introspection-1.0.pc +endef +HOST_GOBJECT_INTROSPECTION_POST_INSTALL_HOOKS += HOST_GOBJECT_INTROSPECTION_INSTALL_WRAPPERS + # Only .typelib files are needed to run. define GOBJECT_INTROSPECTION_REMOVE_DEVELOPMENT_FILES find $(TARGET_DIR)/usr/share \( -iname "*.gir" -o -iname \*.rnc \) -delete