From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 89389C433F5 for ; Tue, 16 Nov 2021 20:33:40 +0000 (UTC) Received: from smtp3.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 mail.kernel.org (Postfix) with ESMTPS id 3830A61AFD for ; Tue, 16 Nov 2021 20:33:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 3830A61AFD Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=mind.be Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=buildroot.org Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id DD31D60800; Tue, 16 Nov 2021 20:33:39 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id D79rIb7fmuaH; Tue, 16 Nov 2021 20:33:39 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id 35F37607FD; Tue, 16 Nov 2021 20:33:38 +0000 (UTC) Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 2C3321BF3D1 for ; Tue, 16 Nov 2021 20:33:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 26C946070B for ; Tue, 16 Nov 2021 20:33:12 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id scS5-AxQGVhF for ; Tue, 16 Nov 2021 20:33:11 +0000 (UTC) Received: from busybox.osuosl.org (busybox.osuosl.org [140.211.167.122]) by smtp3.osuosl.org (Postfix) with ESMTP id 44C0C607FE for ; Tue, 16 Nov 2021 20:33:11 +0000 (UTC) Received: by busybox.osuosl.org (Postfix, from userid 4052) id 99E158D43E; Tue, 16 Nov 2021 20:28:59 +0000 (UTC) From: Arnout Vandecappelle (Essensium/Mind) To: buildroot@buildroot.org Date: Tue, 16 Nov 2021 21:02:01 +0100 X-Git-Refname: refs/heads/master X-Git-Oldrev: b86d9c661d76044f4fc74ca2e879c6c532aebf17 X-Git-Newrev: b094f88a4d501101bfba9b65491209e6a0fe0397 X-Patchwork-Hint: ignore Message-Id: <20211116202859.99E158D43E@busybox.osuosl.org> Subject: [Buildroot] [git commit] package/libglib2: add girdir to glib-2.0.pc X-BeenThere: buildroot@buildroot.org 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: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" commit: https://git.buildroot.net/buildroot/commit/?id=b094f88a4d501101bfba9b65491209e6a0fe0397 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master Add girdir to glib-2.0.pc to fix the following build failure with atk, gcr or harfbuzz: /home/giuliobenetti/autobuild/run/instance-1/output-1/host/riscv32-buildroot-linux-gnu/sysroot/usr/bin/g-ir-compiler atk/Atk-1.0.gir --output atk/Atk-1.0.typelib --includedir=/usr/share/gir-1.0 Could not find GIR file 'GObject-2.0.gir'; check XDG_DATA_DIRS or use --includedir This build failure could also be fixed by removing our update of girdir in gobject-introspection.mk but this will have side effects as gir files won't be installed in the correct directory. So patch glib-2.0.pc instead. Note: autotools-based packages have already been fixed by https://git.buildroot.net/buildroot/commit/?id=8dda79970661090f202e1f20e5982ba53fdaeb95 Fixes: - http://autobuild.buildroot.org/results/2716929db638977e6bf665352a08bd580e1dd0ae - http://autobuild.buildroot.org/results/67a47386019c2a700df348ad6846064e0950e87b - http://autobuild.buildroot.org/results/2c6a4470542af574f9407fa5867f0408ec2b4880 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...lib-meson.build-add-girdir-to-glib.2.0.pc.patch | 33 ++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/package/libglib2/0004-glib-meson.build-add-girdir-to-glib.2.0.pc.patch b/package/libglib2/0004-glib-meson.build-add-girdir-to-glib.2.0.pc.patch new file mode 100644 index 0000000000..7eeecbe336 --- /dev/null +++ b/package/libglib2/0004-glib-meson.build-add-girdir-to-glib.2.0.pc.patch @@ -0,0 +1,33 @@ +From 04bdfff007c91fc620ed0b7cd02fd2e1e83bdefc Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 12 Nov 2021 18:01:05 +0100 +Subject: [PATCH] glib/meson.build: add girdir to glib.2.0.pc + +Add girdir to glib-2.0.pc to fix the following build failure with atk: + +/home/giuliobenetti/autobuild/run/instance-1/output-1/host/riscv32-buildroot-linux-gnu/sysroot/usr/bin/g-ir-compiler atk/Atk-1.0.gir --output atk/Atk-1.0.typelib --includedir=/usr/share/gir-1.0 +Could not find GIR file 'GObject-2.0.gir'; check XDG_DATA_DIRS or use --includedir + +Fixes: + - http://autobuild.buildroot.org/results/2716929db638977e6bf665352a08bd580e1dd0ae + +Signed-off-by: Fabrice Fontaine +--- + glib/meson.build | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/glib/meson.build b/glib/meson.build +index f78f32969..6c5486699 100644 +--- a/glib/meson.build ++++ b/glib/meson.build +@@ -377,6 +377,7 @@ pkg.generate(libglib, + subdirs : ['glib-2.0'], + extra_cflags : ['-I${libdir}/glib-2.0/include'] + win32_cflags, + variables : ['bindir=' + join_paths('${prefix}', get_option('bindir')), ++ 'girdir=' + join_paths('${libdir}', '../share/gir-1.0'), + 'glib_genmarshal=' + join_paths('${bindir}', 'glib-genmarshal'), + 'gobject_query=' + join_paths('${bindir}', 'gobject-query'), + 'glib_mkenums=' + join_paths('${bindir}', 'glib-mkenums')], +-- +2.33.0 + _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot