From patchwork Tue Mar 26 12:01:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 161207 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp5124117jan; Tue, 26 Mar 2019 05:02:05 -0700 (PDT) X-Google-Smtp-Source: APXvYqx3xFxiMySnyx4go1nMjDgKPmJWBSogcz6wssblVVUsiLakB74zwss2DjAq1vra/MH6WWee X-Received: by 2002:a17:902:2888:: with SMTP id f8mr31255405plb.244.1553601725907; Tue, 26 Mar 2019 05:02:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553601725; cv=none; d=google.com; s=arc-20160816; b=zlpqqV62LOyeTZ+VCgehsYJHdTTh3ebVJCWjzVtRu1pQtNiUsGVkuJftL78NtTA2pt nFdZe4BQe1pShRFLTaX1igivpf+bNAs2/ZDXW21Z9ZZRHDWj7YhwN4sRfWtLQBdycPKr WbqVSnzgd8Q5sPZFjmOyhbewQrgBQ5ydXYDGreVIKy3wtviwzROurBfIUdQptcS1X6ai ko6uLm8PWHVcf3sEpPp4M4f1bPYLVDWAPNcAPvIP/xRGoI89bpa4hY1hJiShETmXUO0G dODiOU/AiRvih1KoUVP8hLuH7Q4ExoqtBRBM4CeNsXdsLs33a66YWMhZIR3fFO8PyEI1 OwYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to; bh=kttokWfLoxY1WnrztPGoUkpWUHbkEUTILTE6juedJ0I=; b=Wu3R5jDL61nld6hlPpzm0eGcdVX5Hkz2ux7wfZUGnMzrUQgNMdMIjLpszJEIaFtb/n 8JBCZLpiUD/S9pSiZgnayC/DbNdnPDVX0J0+4SAU03kdJPWNKBl/PvyBXKUKH4/joIZK m7O/fWgxAXo3QTfRQPIpdp7lGaBM9jjrVsP4udz3b0f47+UfYXo1mArfLklg4oswT6mi CZWqL7p9jlyH2TkwjUjsTSHFljJ2q9SsSxLRxNFNbZbCjZSNx/Bdgc9L5PX2+3Ul1yV3 lcKyZVijyPNR1Xtt7ZQkcuR+rR0npMGoEtg+2qo/j3DAME/XK3SZUPMi21Rm6Tl/+aND FUGg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=C1qIcJOn; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id 24si15749966pgl.359.2019.03.26.05.02.04; Tue, 26 Mar 2019 05:02:05 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-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=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=C1qIcJOn; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.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 62DF67D075; Tue, 26 Mar 2019 12:02:01 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by mail.openembedded.org (Postfix) with ESMTP id 131356011C for ; Tue, 26 Mar 2019 12:01:59 +0000 (UTC) Received: by mail-wm1-f48.google.com with SMTP id h18so12624995wml.1 for ; Tue, 26 Mar 2019 05:02:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id; bh=583+lgY5CD7TlpjJRDI6/jmzBYbwlGLd2VjL+EZLYo0=; b=C1qIcJOn9rjo2KGV+ej7/mAkEx9uKM5NZO3cXQoMIqxJX+PpkI3w9zQjC18WhjamSF UQ/OFTMhXgnW+YTIknaS2NjKS3Ujdsx3Sq0/Ev1iYk6KBYAFKvxXFjHwgJXM8YhpjZK5 qSJkzvCGqZEsp0O6HSjLvR5qbYnyJeIQCofogONDLnV6rzEc+BN0BDHBnyvPEF+3CPSl XSXkzmUQZHsDtmA05LUB0NMNRMAO4RvNC8MTr760bYp5Cwcku7emBwM8zubz5n9XPS9A v12EO7Sit9Pvcl3EVH5GRNB4FPr8mxjsGhZXjpHzwsLfVa/3IGEraQ0/uu7pPH7vZNIt zhew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=583+lgY5CD7TlpjJRDI6/jmzBYbwlGLd2VjL+EZLYo0=; b=RPIuk8A/PZIWbXa3vPIGZZhdqZmqUSdC2zx/f7poymc88mRM0Pg1JeXle9NJ3+Cbnc KQx8pCbnWwDHnvmjEYzL2E3Ui6q5pZPq0lHIxLr8ALBKjK1BGatu9pH0aLU09EmDXRGz dDOU2PvQDaz/H0zVZUbMIUgeLPIemjo4yibxWdAg67W/4XUT9cj+zibEZ8ArV73A4er8 dJhg71cMq2fLoCwO8woRrZTTecXmXFlHXVuD4fZISy2R5SLM06assQeVENReAh+pSIVG M2b9gCs/z81qUQ2O/0r3hec/2+3eQ55fHA6a4vwBPSqk2gRJkmBpQ8u6GScug+w6lh+t YNyQ== X-Gm-Message-State: APjAAAUtiepcOAJuZwaRvf+wW3AWSGjcv2QMOHCw3YQzRFi3QB0O2e7+ eR2o9+dwN+9/epWCpER8XSRGNgnfe3Q= X-Received: by 2002:a1c:e90f:: with SMTP id q15mr8515387wmc.112.1553601720589; Tue, 26 Mar 2019 05:02:00 -0700 (PDT) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id z20sm20630201wma.9.2019.03.26.05.01.59 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Mar 2019 05:01:59 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Tue, 26 Mar 2019 12:01:57 +0000 Message-Id: <20190326120157.4397-1-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 Subject: [OE-core] [PATCH] glib: set glib-specific cross properties X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org GLib wants to execute code to identify several properties of the system, for example is vsprintf() broken and what direction does the stack grow. In cross-compiled environments these fallback to the default values which are not always correct (our vsprintf() is fine, but the test assumes it isn't) so set these properties explicitly. Ideally this happens magically by meson.bbclass using the same logic as siteinfo.bbclass, but we need to fix glib now. Signed-off-by: Ross Burton --- meta/recipes-core/glib-2.0/glib-2.0/glib-meson.cross | 6 ++++++ meta/recipes-core/glib-2.0/glib-2.0_2.58.3.bb | 1 + meta/recipes-core/glib-2.0/glib.inc | 1 + 3 files changed, 8 insertions(+) create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/glib-meson.cross -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-core/glib-2.0/glib-2.0/glib-meson.cross b/meta/recipes-core/glib-2.0/glib-2.0/glib-meson.cross new file mode 100644 index 00000000000..8420f9874e1 --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0/glib-meson.cross @@ -0,0 +1,6 @@ +[properties] +have_c99_vsnprintf = true +have_c99_snprintf = true +have_unix98_printf = true +va_val_copy = true +growing_stack = false diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.58.3.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.58.3.bb index 2de2affa51a..c872c749202 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.58.3.bb +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.58.3.bb @@ -16,6 +16,7 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ file://0001-Set-host_machine-correctly-when-building-with-mingw3.patch \ file://0001-Do-not-write-bindir-into-pkg-config-files.patch \ file://0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch \ + file://glib-meson.cross \ " SRC_URI_append_class-native = " file://relocate-modules.patch" diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc index 6f0ec1ad2e9..574bb38557b 100644 --- a/meta/recipes-core/glib-2.0/glib.inc +++ b/meta/recipes-core/glib-2.0/glib.inc @@ -53,6 +53,7 @@ PACKAGECONFIG[libelf] = ",,elfutils" PACKAGECONFIG[tests] = "-Dinstalled_tests=true,-Dinstalled_tests=false,dbus" EXTRA_OEMESON = "-Ddtrace=false -Dfam=false -Dsystemtap=false -Dselinux=false" +EXTRA_OEMESON_append_class-target = " --cross-file ${WORKDIR}/glib-meson.cross" do_configure_prepend() { sed -i -e '1s,#!.*,#!${USRBINPATH}/env python3,' ${S}/gio/gdbus-2.0/codegen/gdbus-codegen.in