From patchwork Tue Aug 14 16:14:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Daniel_D=C3=ADaz?= X-Patchwork-Id: 144196 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp4552197ljj; Tue, 14 Aug 2018 09:15:19 -0700 (PDT) X-Google-Smtp-Source: AA+uWPw+Lgmk43xwGv6TCsGC2PswXeq1MEApxo6eoqNlerdRt8UZKjrt1TjN8kqn9ERu1JkKe/wN X-Received: by 2002:a17:902:1a9:: with SMTP id b38-v6mr20835833plb.89.1534263319542; Tue, 14 Aug 2018 09:15:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534263319; cv=none; d=google.com; s=arc-20160816; b=Q7+CzbQEdXUKNMX67cyTWQBhIZGVAHl01DgNg414bYVfRpqvHr1EuxWqZgMcPR9O9C xHeq+Kop6M+8t9UW+TWMWA5tasn4e2oaVmDA2nDBwzBMLCHO6Y22bon8k5XHrRfe/tWZ KdWNhtUHULwXQduvwxWq0th/iTUoZ8WTteLrTqIIsMuzVVzWpBiZoX56eoY/avdRyevT 76ATwHDu7f4L7jdUwNa62n5WgI3VR9CE16fFdb8K/PyCPI/v7ss1QHTGPeydhDT5qlB0 WAzZbAVhEnlWvWCSYVCIW8jwBEEXTNfA1MSs5j/LvgY8HlMo8snvakNkK3MuNKERbHQU rXLw== 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 :arc-authentication-results; bh=UHNPFDv4olHbtVWMieSMzJcrQWipxafLOnf9i8BhOWg=; b=iRkXAqWSby+JMRDOmNVoym6PVI78jfmtZqCnLiYh0YekEnZXmN+VKVx52dsIGQjqHx SsM4nMLrHh+E5zyizU0Mcf1LiCbshoUgIqvJaFlzDDIztNoZqANSmYEyFHiW8ghJeFl9 gIBFx8B+NNZdImxd8lVTC0a0iPsjb81WxpsWMkc/+gGv6HWYL68z7cudv6ZKpTBz+Ay3 irNsQmxLTIW88M5/bTDkRtiQlVB2HuDOapKYIMkvpVxM7iU35g/HVYxsiCv6Yf5Z3JBf fRC9K6+HsI9nZeMi0267ooFWK/6RB3tkF2pvw1AkjlR8pcY4hHayIQUtNlrKmCvt2jsO F8Vg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=f2VhA+QY; 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=linaro.org Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id y23-v6si20522430pgl.132.2018.08.14.09.15.18; Tue, 14 Aug 2018 09:15:19 -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=@linaro.org header.s=google header.b=f2VhA+QY; 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=linaro.org Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 0FDBB74572; Tue, 14 Aug 2018 16:15:15 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-oi0-f50.google.com (mail-oi0-f50.google.com [209.85.218.50]) by mail.openembedded.org (Postfix) with ESMTP id 41D346010B for ; Tue, 14 Aug 2018 16:15:13 +0000 (UTC) Received: by mail-oi0-f50.google.com with SMTP id b16-v6so34568237oic.9 for ; Tue, 14 Aug 2018 09:15:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=jAvavdTxYNq3hFQU9vpWVZjCoGvJ/3GSj2+bUIHMcwQ=; b=f2VhA+QYqczuOrkJgPn5DrNF7VdtM1stof8zCJPHN7ArDAtN/LZ58bb7ro6k33DZCk pKS6fXqEZel+wQ9D/dSlJdbC65md4ckQzmg5XpBOveAz+YKbgSI67+QLnKqYTwIyQvdp 3LoDrkrJBKH+w96qciPh8Fa0L61fczw3Xw9nQ= 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=jAvavdTxYNq3hFQU9vpWVZjCoGvJ/3GSj2+bUIHMcwQ=; b=kSRCRGaH4jUo3Iyvh2JpINI5LuBmlag4ebjkneEp7M32pbC6iTTaqXp77G6YrZ2V/B 9nfm2anN0n2xPYQt5l+ylqD6BW1W9KX7mmeTwa/UrpksdeTOceiliVmfjGVVutJhuGg6 rtzAXlw/cR0/JSRo76fJXTDAKGXImemDu37XPlLPvbV5pxiSEocyG+pr6j6pkiWtgkuq cgkb7lfCTWlJ+sqbY1yjNKHdnYusL/aXS2ItTOl/JKdXxj/I/4UVsgre5romQIbG8I1u kCNUn39qbZSRl3QSfnJD+ZPabwYYGgttvwJLgxbrncT0rT/5hz5Fa2EePsgHKNcC9Ao/ IK9w== X-Gm-Message-State: AOUpUlFVQKCqNQnNKHA2R5QIhKICpK12sVNWochffYGY6ie0HbsHmPrR FjcTDO1ihYRXWhOiWkmlTjqWZ85KOWTxmA== X-Received: by 2002:aca:f305:: with SMTP id r5-v6mr24637072oih.230.1534263313611; Tue, 14 Aug 2018 09:15:13 -0700 (PDT) Received: from aura.cortijodelrio.net (CableLink-187-161-144-121.PCs.InterCable.net. [187.161.144.121]) by smtp.googlemail.com with ESMTPSA id d191-v6sm35038343oig.16.2018.08.14.09.15.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 14 Aug 2018 09:15:12 -0700 (PDT) From: =?utf-8?q?Daniel_D=C3=ADaz?= To: openembedded-core@lists.openembedded.org Date: Tue, 14 Aug 2018 11:14:35 -0500 Message-Id: <1534263276-24467-1-git-send-email-daniel.diaz@linaro.org> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 Subject: [OE-core] [sumo][PATCH 1/2] glibc: Make bits/wordsize.h multilibbed again 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: , Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org As reported by ChenQi, leaving bits/wordsize.h out of being multilibbed introduced a problem in building the SDK for arm64: Error: Transaction check error: file /usr/include/bits/wordsize.h conflicts between attempted installs of lib32-libc6-dev-2.27-r0.armv7vet2hf_vfp and libc6-dev-2.27-r0.aarch64 This effectively reverts commit a74c77d6. (From OE-Core rev: 90ad502bf8faa233e25cf297c1eeefcb0367aea3) Signed-off-by: Daniel Díaz Signed-off-by: Richard Purdie --- meta/recipes-core/glibc/glibc-package.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc index 35f5231..c1d186a 100644 --- a/meta/recipes-core/glibc/glibc-package.inc +++ b/meta/recipes-core/glibc/glibc-package.inc @@ -137,7 +137,7 @@ do_install_append_armeb () { } do_install_armmultilib () { - oe_multilib_header bits/endian.h bits/fcntl.h bits/fenv.h bits/fp-fast.h bits/hwcap.h bits/ipc.h bits/link.h + oe_multilib_header bits/endian.h bits/fcntl.h bits/fenv.h bits/fp-fast.h bits/hwcap.h bits/ipc.h bits/link.h bits/wordsize.h oe_multilib_header bits/local_lim.h bits/mman.h bits/msq.h bits/pthreadtypes.h bits/pthreadtypes-arch.h bits/sem.h bits/semaphore.h bits/setjmp.h oe_multilib_header bits/shm.h bits/sigstack.h bits/stat.h bits/statfs.h bits/typesizes.h