From patchwork Thu Sep 24 19:06:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1370820 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=KEEhls+R; 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 4By4K421vqz9sS8 for ; Fri, 25 Sep 2020 05:06:31 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 29AFA86F8D; Thu, 24 Sep 2020 19:06:30 +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 V-a9NHQLLhXh; Thu, 24 Sep 2020 19:06:29 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 2366186DD6; Thu, 24 Sep 2020 19:06:29 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 54CEB1BF3C6 for ; Thu, 24 Sep 2020 19:06:28 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 5129286A95 for ; Thu, 24 Sep 2020 19:06:28 +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 8U21evgewbR6 for ; Thu, 24 Sep 2020 19:06:27 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 69DA186A72 for ; Thu, 24 Sep 2020 19:06:27 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id z1so378689wrt.3 for ; Thu, 24 Sep 2020 12:06:27 -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=6kU9pYA+2EK9wqx/8UXZIQJH6YpNh+i2yCg/H9ZLilE=; b=KEEhls+R8CRfOZsijfrd74AMdnO4+n+khOUMaajkwTjZJqhuVSY3v51Ba4+DFZICh4 AVlxULStiMymGnGKMr3YcubWAdi0IXbY9JGXZiFsHdm5Ki/9H2ZTYzXcPhuvEr4dSO0a wgJSiaW6RqxvcjXGl7eWW8PL9j4jssztA2YceJQqp/Rv5YCTQoVbn4IPJu0PJjf8meAd eQt1Zjm/eKQG2WEMEE3eNv4tlt296Nob/IJb7V7bomQOaLqq1usdoR/ev4F9lXmKK8nz PtVI4kBbSFqlCwtds9nwy2gBs5KtZy8CpzVnM90121FOpRxYpteG1S7n+swh/0olGPv8 nBiQ== 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=6kU9pYA+2EK9wqx/8UXZIQJH6YpNh+i2yCg/H9ZLilE=; b=TJulvpbRIvhVPkrTjQxZU01b2hAOTUgV0wGJr01aAxpOYkiBaBhVJvvzHAzELro18u 1QHekG9eaWSv5nt+xJ65d9310vKmmSLsFinNdjmB8smWnObqV5Q23CUghw28F7XbxShm nt56CnOeMRc35hV152/g/q2iBUcNj8bPswJ7RDhi0eZrKs3gMKaTwyEukln7a7bsa5eF x0q11HYa68xLOby5fT2g24vilbnT7kY/Om32cr5NYY/lj3/T/UppjjicYA0tTbu3pyhz 16GAKm/1ntfOQ2rmxw2bVY9sRoMnxOlazSWzotJKAdY2AmynFKNN08MU9rargBvDANDP LwCw== X-Gm-Message-State: AOAM530CdTX7cHdybppfTmUZIQwpc3QU8W+x/i1nV4T11f2XuwuNDLDw oQOmo9q25+T4uvUwiAKHj30U6hywRKs= X-Google-Smtp-Source: ABdhPJzSLwmTe7s9NnKsDahx3limO1hFdJQAWJ+/ylpPazkffE5XQuTtO1xewcGV3xgdYEC0cJ8dwA== X-Received: by 2002:a5d:6283:: with SMTP id k3mr373531wru.191.1600974385405; Thu, 24 Sep 2020 12:06:25 -0700 (PDT) Received: from kali.home (2a01cb0881b76d0062c55ff6bf2a37aa.ipv6.abo.wanadoo.fr. [2a01:cb08:81b7:6d00:62c5:5ff6:bf2a:37aa]) by smtp.gmail.com with ESMTPSA id f23sm359502wmc.3.2020.09.24.12.06.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Sep 2020 12:06:24 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Thu, 24 Sep 2020 21:06:14 +0200 Message-Id: <20200924190614.1409319-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/harfbuzz: 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: Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Add introspection support to harfbuzz otherwise activation of introspection in pango 1.46.1 will fail on: Couldn't find include 'HarfBuzz-0.0.gir' (search path: '['/home/naourr/work/instance-2/output-1/host/aarch64-buildroot-linux-gnu/sysroot/usr/bin/../share/gir-1.0', '/home/naourr/work/instance-2/output-1/host/share/gir-1.0', '/home/naourr/work/instance-2/output-1/host/share', '/home/naourr/.local/share/flatpak/exports/share/gir-1.0', '/var/lib/flatpak/exports/share/gir-1.0', '/usr/local/share/gir-1.0', '/usr/share/gir-1.0', '/home/naourr/work/instance-2/output-1/host/share/gir-1.0', '/usr/share/gir-1.0']') Fixes: - http://autobuild.buildroot.org/results/3357225ee2d8392bfd57af91cde04a1113e03493 Signed-off-by: Fabrice Fontaine --- ...allow-introspection-when-cross-compi.patch | 33 +++++++++++++++++++ package/harfbuzz/harfbuzz.mk | 13 ++++++-- 2 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 package/harfbuzz/0001-src-meson.build-allow-introspection-when-cross-compi.patch diff --git a/package/harfbuzz/0001-src-meson.build-allow-introspection-when-cross-compi.patch b/package/harfbuzz/0001-src-meson.build-allow-introspection-when-cross-compi.patch new file mode 100644 index 0000000000..700f6f85e4 --- /dev/null +++ b/package/harfbuzz/0001-src-meson.build-allow-introspection-when-cross-compi.patch @@ -0,0 +1,33 @@ +From 432dfd0a1d8fe0a8df89e7ce828c520c7758f10c Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Thu, 24 Sep 2020 21:00:34 +0200 +Subject: [PATCH] src/meson.build: allow introspection when cross-compiling + +introspection can be enabled when cross-compiling on certains conditions +(for example it is supported by buildroot) + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/harfbuzz/harfbuzz/pull/2692] +--- + src/meson.build | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/src/meson.build b/src/meson.build +index 19290245..7db43508 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -637,11 +637,6 @@ if have_gobject + gir = find_program('g-ir-scanner', required: get_option('introspection')) + build_gir = gir.found() + +- build_gir = build_gir and not meson.is_cross_build() +- if not build_gir and get_option('introspection').enabled() +- error('Introspection support is requested but it isn\'t available in cross builds') +- endif +- + build_gir = build_gir and get_option('default_library') != 'static' + if not build_gir and get_option('introspection').enabled() + error('Introspection support is requested but the default library option should be shared or both') +-- +2.28.0 + diff --git a/package/harfbuzz/harfbuzz.mk b/package/harfbuzz/harfbuzz.mk index 6d35e8b65e..fae9278b7c 100644 --- a/package/harfbuzz/harfbuzz.mk +++ b/package/harfbuzz/harfbuzz.mk @@ -11,13 +11,11 @@ HARFBUZZ_LICENSE = MIT, ISC (ucdn library) HARFBUZZ_LICENSE_FILES = COPYING HARFBUZZ_INSTALL_STAGING = YES HARFBUZZ_CONF_OPTS = \ - -Dgobject=disabled \ -Dfontconfig=disabled \ -Dgdi=disabled \ -Ddirectwrite=disabled \ -Dcoretext=disabled \ -Dtests=disabled \ - -Dintrospection=disabled \ -Ddocs=disabled \ -Dbenchmark=disabled \ -Dicu_builtin=false \ @@ -61,6 +59,17 @@ else HARFBUZZ_CONF_OPTS += -Dfreetype=disabled endif +ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y) +HARFBUZZ_DEPENDENCIES += gobject-introspection +HARFBUZZ_CONF_OPTS += \ + -Dgobject=enabled \ + -Dintrospection=enabled +else +HARFBUZZ_CONF_OPTS += \ + -Dgobject=disabled \ + -Dintrospection=disabled +endif + ifeq ($(BR2_PACKAGE_GRAPHITE2),y) HARFBUZZ_DEPENDENCIES += graphite2 HARFBUZZ_CONF_OPTS += -Dgraphite=enabled