From patchwork Wed Aug 7 04:03:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 170687 Delivered-To: patch@linaro.org Received: by 2002:a92:512:0:0:0:0:0 with SMTP id q18csp6572132ile; Tue, 6 Aug 2019 21:03:39 -0700 (PDT) X-Google-Smtp-Source: APXvYqyGj+OEL3EUA6A/O/Q++DtVkSZ290DVfGpZJ88NkueQQPiosAvXgJebTB49i+l/nHnvMf1c X-Received: by 2002:a17:90a:29c5:: with SMTP id h63mr6178817pjd.83.1565150619185; Tue, 06 Aug 2019 21:03:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565150619; cv=none; d=google.com; s=arc-20160816; b=aAON5eFWvpBDvJpf7MppcNowRA8YQjNSCMoDh+tkOEQavPMjz7hv0uhSzVrTUBBaq7 AhSDJHaO/oWtBLEJEPlX4CwhurB5MwxyhvL5oSI9WY+dhPu0+P+z4AlihFVtDS7/PIhU 4n6ZNFUxJ/2okHO8qk+JIsnFj/FOolc6OdyJuf9DhYZ0MbrZ+FhhogR29gThPj41WmYU x4d6Y8Ixk1+Ozq1XkFhQl3h4whZnW9Rd/snlyC1Fv/QX56vVN4EZdLFuUzymECqX+Azl LcS66bK9+13ZdJ1rC38XHmp57DaUwm4jKBUmfkkY3kdK+S22HLm2X6Y7KmteFjuetqYH r1+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:message-id:date:to:from:dkim-signature:delivered-to; bh=lGJn1+gYg9lW6iB59oNnVp0beMNyn5ojuyRi9NtJtgQ=; b=ISdGWLrxCwYLTRUzvnV/YbXD1ybrikFRv2ii5dEch1mL/ITgz45uq207eCEZq/lbLb ELYKCTrsxyA7H2EA+duYyXrXRvJHiK6jq4ENGgbvNII5RmffbTjxHTmy1COk7k1JNMZB iQl7doYXPSJaUAlcakO84n0h6hpdVMiSXxUJUFHXXX96ZCVI0eFwy8xPNUsMw/61Jbxl pNt+JBi21YjYUjN4wKGEaZNFSadNI0VJmc4deaRsR8BO3gnDG9gufTffzlqcOX3WhkaU WtmKaT5WqTXFlMWM4uhigqmgEkhDyzwl5rw/FbkuDd+aynPB5cI3gzVgCmFHkj7dUpNG J9Fw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=oxizJCDz; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id h67si717396plb.196.2019.08.06.21.03.38; Tue, 06 Aug 2019 21:03:39 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=oxizJCDz; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id DD13C7F436; Wed, 7 Aug 2019 04:03:32 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) by mail.openembedded.org (Postfix) with ESMTP id 337187EFB8 for ; Wed, 7 Aug 2019 04:03:31 +0000 (UTC) Received: by mail-pf1-f181.google.com with SMTP id r7so42699092pfl.3 for ; Tue, 06 Aug 2019 21:03:32 -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=HJ2ycZI4SSAd/JW67bqWoq0EUrGAcwwK+mMhYPS1yKE=; b=oxizJCDz/ZP6FZ0A+e7pu8qR9Yyd7umCAG1mh0R8KpF82X33Vt0EJnGkiB5QDfo+ct l1sD26lfNMwd1jJLM2n9+Xqnro4ze0Zy618TmYS1oox9lPzmmzWR/agsnD32L9pIddhr d99yl1URS9lx+/EarblNt+tSduV4DpchBwPsoG4VipcjM72jzE4KBbH52BTvCD8xqZdH KQB3heT0dbwC5nwPsKXPLv0sLMitj0EAAaSM6b8GA9KSkLSttnzneAaI/6gGT6L3GrgA q3b8//FLegWRDgwhheqrTPxVcWKGeyf4AKXbEL7ODurOce8S02Iv5HWxDtD6rRtis9Vz 88sA== 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=HJ2ycZI4SSAd/JW67bqWoq0EUrGAcwwK+mMhYPS1yKE=; b=luGC+rPc0hjySIDeM2lpx2WBFraeu3zxebYhhK5/PjorVBkPQHEh/q80MLl2Ue2J9I rpTlD95NjuiaNvi9JSQuT7Zs5l+j8SOEfszWGkv3FewKFBZirVSepefghgmpPLm/DaBs QJkXZ2VRzCbc3MMNQC3/yehtM00MtNi9RC6/J+tVBO/a4pOB2mWNduGzwoWs03XYRFfa 4Aam8/XI6ZtKvv2w0IrBiynplVXMAzbz7aIaB9VIwosdRhnHrLuqWP12XUWIPpnPWnzE YeXiuNMi4x4xM+JvHEKWyGdSdAnu4HeGEizqi7NiegvxmuhgmpXuBHaRTBDJgw1RF/3a +lAw== X-Gm-Message-State: APjAAAU7l00Mn6Q1WQkyWjF5WALDs5PB/8WlQMqrdIHDPb4tQTRbRK+T yI9EM2i2uzACXif7Dv7a2ZzuoJLyIvA= X-Received: by 2002:a17:90a:fa12:: with SMTP id cm18mr6415349pjb.137.1565150611631; Tue, 06 Aug 2019 21:03:31 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net (c-73-71-176-3.hsd1.ca.comcast.net. [73.71.176.3]) by smtp.gmail.com with ESMTPSA id p27sm133054061pfq.136.2019.08.06.21.03.30 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 06 Aug 2019 21:03:31 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Tue, 6 Aug 2019 21:03:21 -0700 Message-Id: <20190807040323.17521-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.22.0 MIME-Version: 1.0 Subject: [oe] [meta-initramfs][PATCH 1/3] klibc: Pass -fno-builtin-bcmp with musl/clang combo X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org clang would emit bcmp built-in for musl bases system but here we do not link in musl C library, so its best to disable it Fixes git/usr/klibc/memmem.c:38: undefined reference to `bcmp' Signed-off-by: Khem Raj Cc: Andrea Adami --- meta-initramfs/recipes-devtools/klibc/klibc.inc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -- 2.22.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-initramfs/recipes-devtools/klibc/klibc.inc b/meta-initramfs/recipes-devtools/klibc/klibc.inc index 5805448671..7faf0cabbf 100644 --- a/meta-initramfs/recipes-devtools/klibc/klibc.inc +++ b/meta-initramfs/recipes-devtools/klibc/klibc.inc @@ -33,6 +33,9 @@ ARMPATCHES_arm = "file://klibc-config-eabi.patch \ S = "${WORKDIR}/git" +OPTFLAGS = "${TUNE_CCARGS} -Os" +OPTFLAGS_append_libc-musl_toolchain-clang = " -fno-builtin-bcmp" + PARALLEL_MAKE = "" EXTRA_OEMAKE = "'KLIBCARCH=${KLIBC_ARCH}' \ 'CROSS_COMPILE=${TARGET_PREFIX}' \ @@ -43,7 +46,7 @@ EXTRA_OEMAKE = "'KLIBCARCH=${KLIBC_ARCH}' \ 'INSTALLDIR=${libdir}/klibc' \ 'SHLIBDIR=${libdir}' \ '${KLIBCTHUMB}' \ - 'KLIBCOPTFLAGS=${TUNE_CCARGS} -Os' \ + 'KLIBCOPTFLAGS=${OPTFLAGS}' \ V=1 \ " From patchwork Wed Aug 7 04:03:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 170688 Delivered-To: patch@linaro.org Received: by 2002:a92:512:0:0:0:0:0 with SMTP id q18csp6572433ile; Tue, 6 Aug 2019 21:03:54 -0700 (PDT) X-Google-Smtp-Source: APXvYqyaaLq+2BSfn4vzgIl/HOlzs5jgLyFbGs+sj3P0vh4Oq+iKtKZxNA3PVFRkP0V65q7j5mUL X-Received: by 2002:a62:7890:: with SMTP id t138mr7138337pfc.238.1565150634633; Tue, 06 Aug 2019 21:03:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565150634; cv=none; d=google.com; s=arc-20160816; b=ytB6QLOLx2rhjdMFiZqONy8azHuNNX4oAcJExPCw5q+2zI6hKDel/b7i62z/wpLHwn uyzCiaAEm2VA9L39yqsgh1wqKjp+YvQk+zm7TXHRMfWyjJyEasZ47uTylbycPL4xPm2h lnxuZsxqikUkL74wOxqZPE8m6bR0jOgvG5PAdIGriKKP9OIn/TTOPnWocqIrvqd8zgS8 lB6IWNneaqrrat7JysoHR1PCkChkmWnCNhOva/N2vMeJDE4iQOHrfh9+iayB68GHDvf9 ELEqCZIFFFGiCbI3grNyTQeNt+/v63MdPbDi2FA2+abj7+m5QnGtLFvjqayxJdQk6rfy aeVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to; bh=03F2aBVHGky6WGeSrM8Ehk3Aa8+SY7M4LRnWC5gBMe8=; b=XQVu/JBhULo0yq+6oXI3CyDFP/UKm6jWFWtOIpB4K27ZXgX+GApFRrDO69Vnni9voT mfuHwIdolzZnKJKokMXrwyQfF2vT/jKWD/DLco/WSrj8+niheCETvmAXSr2gdEnU06B0 OOvcd0gvmVo3bZKAdUj3Qb8QuC/z4CzjpjpzQzKQ3vu6qI0eg0Mjl91vDwjpgzwDTpd7 vWphi66HZ0jEI8MDs14kms9mb9CQ40VS2X2BFK+7cYwYgXnKtDSIqNR77v2qUXm186FU C6rzMxJdcrkV75bl+gdca/Ah2/k75qG/t4xLAmg4oWIKWHyn2vzU7+0HS9KrMf/LOTz0 fYkg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=W+u5xxBJ; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id a17si50921231pff.195.2019.08.06.21.03.54; Tue, 06 Aug 2019 21:03:54 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=W+u5xxBJ; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 2C3C47F440; Wed, 7 Aug 2019 04:03:51 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg1-f182.google.com (mail-pg1-f182.google.com [209.85.215.182]) by mail.openembedded.org (Postfix) with ESMTP id 000847EFB8 for ; Wed, 7 Aug 2019 04:03:31 +0000 (UTC) Received: by mail-pg1-f182.google.com with SMTP id z14so5496589pga.5 for ; Tue, 06 Aug 2019 21:03:33 -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=s3+rUMZDqe5HlioTJB2ihL2vRv9k7A8ADkUlg5JL/mw=; b=W+u5xxBJbMp0TTNQ6zBcHLYKawW70NCTH3NO4D6DMjB3/nEbQC8MRnX5XS3ApPR/S2 xDPJT9qB17dZEJNOTG9rvDieB+Uene92e0H4sQSHw3UPqxKdE3nYbti51NrQPP7QLt91 7Cw7AhXNCW8qdovufgml0U4p7uiVVRlQ2NA76Cuq+pF89Z7bBEvUg0zhotkipyrJ594y 4WqXToeOY/8ZQdrV/De54MG1cs/iU5CdmU3PN9EK+ubwZOYfpJjLE/fMSK4ltyT71mEN nHbGL+7fhNy6syXGJSnyIUYAvjtrW3Wi4D/VJh+ee1rFvlGrqJOfM1AHr23szlQ3GV3Z Y45g== 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=s3+rUMZDqe5HlioTJB2ihL2vRv9k7A8ADkUlg5JL/mw=; b=a3cOVlGtwEyjHWLDuyn5JoIGqqcOanxOY8G6acA+/RzCwIAlfPRjc+dqSiTbfT3Df9 Eteru+j0hYmMYrEBSNeVnateXheiGk1vt4UuUZ0VatgZUBk3MZPcd89msqMEvH54NG79 LWBC1jUXrj1iA1Vc1RfZazrLIM2TvtL5ypE4pL0TwrdNC/8XICc8h4nPSmrqKT6HgrIZ 9gnKzUb2jQ5x4E1c72jMg1aUIeRo86/Z4lipPK/XiR7lvjnr+jU51LB2QKgatDK/n+rW s/n/1sNAFxMJIMdHLsTuTTmLBYKdXJ2/kdnaUwEADlipZlP+gHFBMILQJuaJvwQztl9X 53Kg== X-Gm-Message-State: APjAAAVrcPEDURx0sp5CJX7TX5JqIrQXpHPPdiuT7+sU3fteIH5Oz82+ iBqlQZmL/994rFIeb7ruU5EKax3IOK4= X-Received: by 2002:a65:6294:: with SMTP id f20mr6130466pgv.349.1565150612464; Tue, 06 Aug 2019 21:03:32 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net (c-73-71-176-3.hsd1.ca.comcast.net. [73.71.176.3]) by smtp.gmail.com with ESMTPSA id p27sm133054061pfq.136.2019.08.06.21.03.31 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 06 Aug 2019 21:03:31 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Tue, 6 Aug 2019 21:03:22 -0700 Message-Id: <20190807040323.17521-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190807040323.17521-1-raj.khem@gmail.com> References: <20190807040323.17521-1-raj.khem@gmail.com> MIME-Version: 1.0 Subject: [oe] [meta-oe][PATCH 2/3] graphviz: Fix build error that surfaced with latest pango X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- ...-Include-freetype-headers-explicitly.patch | 38 +++++++++++++++++++ .../graphviz/graphviz_2.40.1.bb | 1 + 2 files changed, 39 insertions(+) create mode 100644 meta-oe/recipes-graphics/graphviz/graphviz/0001-plugin-pango-Include-freetype-headers-explicitly.patch diff --git a/meta-oe/recipes-graphics/graphviz/graphviz/0001-plugin-pango-Include-freetype-headers-explicitly.patch b/meta-oe/recipes-graphics/graphviz/graphviz/0001-plugin-pango-Include-freetype-headers-explicitly.patch new file mode 100644 index 0000000000..a9b0352435 --- /dev/null +++ b/meta-oe/recipes-graphics/graphviz/graphviz/0001-plugin-pango-Include-freetype-headers-explicitly.patch @@ -0,0 +1,38 @@ +From 926d9285f3367ae1bdb9ce1dce95f7de73b3a980 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 6 Aug 2019 12:42:19 -0700 +Subject: [PATCH] plugin/pango: Include freetype headers explicitly +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Do not depend on pango automatically adding these headers +Fixes +| gvtextlayout_pango.c:140:10: error: unknown type name ‘FT_Face’ +| FT_Face face; +| ^~~~~~~ + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + plugin/pango/gvtextlayout_pango.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/plugin/pango/gvtextlayout_pango.c b/plugin/pango/gvtextlayout_pango.c +index d620b29..b0da11c 100644 +--- a/plugin/pango/gvtextlayout_pango.c ++++ b/plugin/pango/gvtextlayout_pango.c +@@ -15,6 +15,10 @@ + + #include + #include ++ ++#include ++#include FT_FREETYPE_H ++ + #include "gvplugin_render.h" + #include "agxbuf.h" + #include "utils.h" +-- +2.22.0 + diff --git a/meta-oe/recipes-graphics/graphviz/graphviz_2.40.1.bb b/meta-oe/recipes-graphics/graphviz/graphviz_2.40.1.bb index a9efffaca2..fb8ea2a5b3 100644 --- a/meta-oe/recipes-graphics/graphviz/graphviz_2.40.1.bb +++ b/meta-oe/recipes-graphics/graphviz/graphviz_2.40.1.bb @@ -26,6 +26,7 @@ inherit autotools-brokensep pkgconfig gettext # source - see https://src.fedoraproject.org/cgit/rpms/graphviz.git/tree/graphviz.spec SRC_URI = "https://gitlab.com/graphviz/graphviz/-/archive/stable_release_${PV}/graphviz-stable_release_${PV}.tar.gz \ + file://0001-plugin-pango-Include-freetype-headers-explicitly.patch \ " # Use native mkdefs SRC_URI_append_class-target = " file://0001-Use-native-mkdefs.patch" From patchwork Wed Aug 7 04:03:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 170689 Delivered-To: patch@linaro.org Received: by 2002:a92:512:0:0:0:0:0 with SMTP id q18csp6572565ile; Tue, 6 Aug 2019 21:04:01 -0700 (PDT) X-Google-Smtp-Source: APXvYqxCyYDmX8OViqMIJ34ZeUnr2jh2DEdzBWFCuHplu+lcE7Y//vvkcrxuAZrbgH2LmTgqWLof X-Received: by 2002:a17:902:b612:: with SMTP id b18mr6321208pls.8.1565150641645; Tue, 06 Aug 2019 21:04:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565150641; cv=none; d=google.com; s=arc-20160816; b=aSvXgKHrQqsAuTxG1dv1YZstk5i/3RNJclDmClzjtVxnqScOoGrcNDAf7GgACFGcxi kUJ1Tt7c5j/NGR8rbRVMjfmxcBtMq3nobm69yr/H7xy3e5nQrfPCN77u2TISPZS/He9d cFzyk2HtEwG5wQOYRI1A7OO2EAYkC5GnbQOMO1q/5EEQ0jPUXIkH6FB6Sr6nNH0R3mwY DO4BJy6fuppTPrt9CQCUZpXDiIpeDzwKd80O1MgwPw9uf/gthinNrqq3WKS0/KvidQvJ I2e8rHyiM/6dRwqRCYtNRQ/NrPmQhl4hYRoN/xE5/S5AMeqH+Jw3sbA7bnbWFlUa+x+k ToGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to; bh=qpMOIa9gDcNNK3gxf1u5c88TR/RXfnS9CXne8njc9fk=; b=MVcPfRY221efM5258K8qXdfxWKHPmwDfWclQzUIpuhZhXT4tglVWJ+T2cJcgjDO1+Q o1QzwITJX3gtBMGx3Y55/buLcjJbJ6ziGFsfLAsUphaJxX2+e6bB7DH5i00mbhzzlI/Z 6LOoM17wHebwj7hHnx/kuCfbTWBge07LrLFP13Z9m7gdlU3+5NETIdyQEeierc8Safjd TLEEdypnSWgjCo/MyAE/F0u6xLjmjli06/inaZCGQUpfvTVHqsX22Z8MFTYYvh4AK/l0 nIY3I2cpRHp2xR8+tfrKs7PO6CAY1JU18Tp6MyhGHpW7s00pdRSqkggiNE3YsDDHFFNP 3H7w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=C4vfQGpQ; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id p10si43310345plk.9.2019.08.06.21.04.01; Tue, 06 Aug 2019 21:04:01 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=C4vfQGpQ; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 36BA87F446; Wed, 7 Aug 2019 04:03:55 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by mail.openembedded.org (Postfix) with ESMTP id CD1837F387 for ; Wed, 7 Aug 2019 04:03:33 +0000 (UTC) Received: by mail-pf1-f182.google.com with SMTP id 19so42685121pfa.4 for ; Tue, 06 Aug 2019 21:03:35 -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=AdMld6xOn5g+Mwd0hJl2H7sRiUrnV3TPlR9m8OHLP/Q=; b=C4vfQGpQVVNqv3mNdxe3p87cRMBZtLGDnIsnagss9+UyaQAfN0UgOzu8typBTVIXgs llL+Kr/KXrc2AdwblCdJ9gNiohG/RyCG/vt6BJsCsI+GK98LQoEe8Ssc9DS2cZeOFouz +pzY2UI160Elrk/05iVQ6iFcxilq7xwiGFVOBC8gTxmXjRZIp3rmAqrv3efeqjBr6O0+ 9mrMbqxdyGThQxYOnw9DaLZZKiXkuRIyVUk99Aqdx7TBTmlWKIxCGjsnwDoS4PEAnzuT MoDEWvZLMXBBwxl6MmCKZkZ0epPhYkERXlCNtINBJtpPmYisVcqJplPueC75cm6pRkxM idOw== 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=AdMld6xOn5g+Mwd0hJl2H7sRiUrnV3TPlR9m8OHLP/Q=; b=mLi99LiG0GMVVhw9yniHdPvXxj8m3WIHIXMvxAOoL6ZS2Fi8xoyJwkAh0KfjlTQYWe rOQW4ZRaVutlb7gIJE3M+O5Me7BCoSVq1z0pd9kTwYaeDg8aaiyL9lgWbrXbGduaiYGJ PO6Q2cy7Cck6/3aC+MLQbWLNUwBcKb5gXkjiDzYOn1VbSst21kTSvKZ9QewGsyVAS0xs bIXMDUelD7F9fDDejwD1vr+ARF7fD42mZ43UvvxIci5ahk5bVj9KeY/Y9N6pfPCgRTDJ 5kXxTqaGDpGoXP25fe3ZdwroutVHxvbxkA/PP0X9PpxnDgnoXmACgPb3ma3xHLtr919c WMhg== X-Gm-Message-State: APjAAAVL+tBEsp8eYwjXsIy78/T9xzVuXt/mAZJ5m39xBDLZ8tCrgqD+ ftJ47xNRzHfK8+Oz1HPFpa+FGDf3K5Q= X-Received: by 2002:a17:90a:2008:: with SMTP id n8mr6360307pjc.4.1565150614298; Tue, 06 Aug 2019 21:03:34 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net (c-73-71-176-3.hsd1.ca.comcast.net. [73.71.176.3]) by smtp.gmail.com with ESMTPSA id p27sm133054061pfq.136.2019.08.06.21.03.32 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 06 Aug 2019 21:03:33 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Tue, 6 Aug 2019 21:03:23 -0700 Message-Id: <20190807040323.17521-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190807040323.17521-1-raj.khem@gmail.com> References: <20190807040323.17521-1-raj.khem@gmail.com> MIME-Version: 1.0 Subject: [oe] [meta-oe][PATCH 3/3] graphviz: Do not build tcl support for target X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org tclpkg looks for tclsh on buildhost and if we try to use the native version then it groks the paths from the native sysroot and builds and installs the target tcl packages into the same path, in the end it ends up being wrongly packaged. Therefore its best to disable tcl Secondly, package python and perl pieces into independent packages so the runtime dependencies are also set accordingly. Signed-off-by: Khem Raj --- ...o-be-empty-string-if-tcl-is-disabled.patch | 33 +++++++++++++++++++ .../graphviz/graphviz_2.40.1.bb | 19 ++++++++++- 2 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-graphics/graphviz/graphviz/0001-Set-use_tcl-to-be-empty-string-if-tcl-is-disabled.patch -- 2.22.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-graphics/graphviz/graphviz/0001-Set-use_tcl-to-be-empty-string-if-tcl-is-disabled.patch b/meta-oe/recipes-graphics/graphviz/graphviz/0001-Set-use_tcl-to-be-empty-string-if-tcl-is-disabled.patch new file mode 100644 index 0000000000..21bf1bcd5c --- /dev/null +++ b/meta-oe/recipes-graphics/graphviz/graphviz/0001-Set-use_tcl-to-be-empty-string-if-tcl-is-disabled.patch @@ -0,0 +1,33 @@ +From 564901ab78da2b2b1bed92351dc3c102dc0a8154 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 6 Aug 2019 17:51:39 -0700 +Subject: [PATCH] Set use_tcl to be empty string if tcl is disabled + +Upstream-Status: Inappropriate [Cross-compile specific] +Signed-off-by: Khem Raj +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/configure.ac ++++ b/configure.ac +@@ -1676,7 +1676,7 @@ AC_ARG_ENABLE(tcl, + [], [enable_tcl=yes]) + + if test "x$enable_tcl" != "xyes"; then +- use_tcl="No (disabled)" ++ use_tcl="" + fi + + if test "x$use_tcl" = "x"; then +--- a/Makefile.am ++++ b/Makefile.am +@@ -19,7 +19,7 @@ pkginclude_HEADERS = $(top_builddir)/gra + man_MANS = graphviz.7 + + # $(subdirs) contains the list from: AC_CONFIG_SUBDIRS +-SUBDIRS = $(subdirs) lib plugin cmd tclpkg doc contrib share graphs rtest tests ++SUBDIRS = $(subdirs) lib plugin cmd doc contrib share graphs rtest tests + + .PHONY: doxygen + doxygen: diff --git a/meta-oe/recipes-graphics/graphviz/graphviz_2.40.1.bb b/meta-oe/recipes-graphics/graphviz/graphviz_2.40.1.bb index fb8ea2a5b3..176cf4498a 100644 --- a/meta-oe/recipes-graphics/graphviz/graphviz_2.40.1.bb +++ b/meta-oe/recipes-graphics/graphviz/graphviz_2.40.1.bb @@ -29,7 +29,10 @@ SRC_URI = "https://gitlab.com/graphviz/graphviz/-/archive/stable_release_${PV}/g file://0001-plugin-pango-Include-freetype-headers-explicitly.patch \ " # Use native mkdefs -SRC_URI_append_class-target = " file://0001-Use-native-mkdefs.patch" +SRC_URI_append_class-target = "\ + file://0001-Use-native-mkdefs.patch \ + file://0001-Set-use_tcl-to-be-empty-string-if-tcl-is-disabled.patch \ +" SRC_URI[md5sum] = "2acf30ca8e6cc8b001b0334db65fd072" SRC_URI[sha256sum] = "e6c3f8dbfde1c4523055403927bef29f97f9fc12715c1042b5dcf648a2c1c62a" @@ -40,6 +43,7 @@ EXTRA_OECONF_class-target = "\ --with-expatlibdir=${STAGING_LIBDIR} \ --without-included-ltdl \ --disable-java \ + --disable-tcl \ --disable-r \ --disable-sharp \ " @@ -55,6 +59,19 @@ do_install_append_class-native() { install -m755 ${B}/lib/gvpr/mkdefs ${D}${bindir} } +PACKAGES =+ "${PN}-python ${PN}-perl ${PN}-demo" + +FILES_${PN}-python += "${libdir}/python*/site-packages/ ${libdir}/graphviz/python/" +FILES_${PN}-perl += "${libdir}/perl5/*/vendor_perl/ ${libdir}/graphviz/perl/" +FILES_${PN}-demo += "${datadir}/graphviz/demo/" + +RDEPENDS_${PN}-perl += "perl" +RDEPENDS_${PN}-python += "python" +RDEPENDS_${PN}-demo += "python perl" + +INSANE_SKIP_${PN}-perl = "dev-so" +INSANE_SKIP_${PN}-python = "dev-so" + FILES_SOLIBSDEV_append = " ${libdir}/graphviz/lib*${SOLIBSDEV}" BBCLASSEXTEND = "native"