From patchwork Wed May 9 16:15:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Denys Dmytriyenko X-Patchwork-Id: 135304 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp5830517lji; Wed, 9 May 2018 09:15:37 -0700 (PDT) X-Google-Smtp-Source: AB8JxZofNs6PNYp0loMxWv7AeyqnskzZmgb1nnD/EICdsAPyL5v7J9+y/5ZbaZ0EPNiPGgB/HiJq X-Received: by 2002:a17:902:5502:: with SMTP id f2-v6mr46017807pli.108.1525882536972; Wed, 09 May 2018 09:15:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525882536; cv=none; d=google.com; s=arc-20160816; b=Q07cgeh/76+nteXZvlqVwGMh8KxwYHJAgT7ZgZXi/MRKQiEklCCOwXq5Y+KsOOrrqn wvIAyIyQYUkYDXuPm7v6tQaVWqaAbkRZvsvlPSuulGg9NSLNN85jqqMBHTYHQHQ5/d6y P6wjYSH0C9o6EqYkxMHs1gWeOwUpnYAKVx6b91r6vNq8VhYIj25JknPV2b6gFLVGt7JE z8flgREbTbM7y7ThZxvyD64K/HendHELevwQrUZZmTJH1pqyKqtWvIiQum15RlfnfgAG oLY3mU/iINNs3qLD3CMwL0StmTlpRoQ5KvMRlXeblHTdGiClYmUyEbeKR84Ofttx0AAV f+9g== 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:cc:message-id:date:to:from:delivered-to :arc-authentication-results; bh=ta+4VmAo9TLbCBqZmQ1Npk+v7qA9HXfURkVawjBKWjM=; b=QVsIXgw6zdXDgn1xunOzjmFWjaz3/+pUXwbTIrOua8/G3UhYVH6XrcVKvKjduFC00U Q11OUijEsld4W5gVNqZ5KsMYJchylHKlLiYwatCUwm9qYqrkEZfbJKBgwHL//NgtKAOv 0M+95qApCSURCt/bUVPrPHf24ewFoKl5OBSJxjLhUOg8L5bN6WJzXJ3B50jOaQ9d7Vqe DPtjZeuEShQGRvULvd8RUxhiXkRwMd/rp5dwHDb9olOs/9z6QmkLyVXLKkK6SZ+fMxw5 Yk7uQNyDfhZ2OHNCVFdsG9DQkV1JzaQ8w0pyO4FXJ8GDqX2P/GweyxqMSbOzeuC3Y/+p sQNQ== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id n6-v6si26549713pla.12.2018.05.09.09.15.36; Wed, 09 May 2018 09:15:36 -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; 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 Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 0B54374F74; Wed, 9 May 2018 16:15:33 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mailout4.zoneedit.com (mailout4.zoneedit.com [64.68.198.17]) by mail.openembedded.org (Postfix) with ESMTP id 9080474F4D for ; Wed, 9 May 2018 16:15:32 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mailout4.zoneedit.com (Postfix) with ESMTP id 37D7720AF1; Wed, 9 May 2018 16:15:33 +0000 (UTC) Received: from mailout4.zoneedit.com ([127.0.0.1]) by localhost (zmo03-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id d4BrHAHY_h-1; Wed, 9 May 2018 16:15:33 +0000 (UTC) Received: from mail.denix.org (pool-100-15-85-143.washdc.fios.verizon.net [100.15.85.143]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mailout4.zoneedit.com (Postfix) with ESMTPSA id 141C32079D; Wed, 9 May 2018 16:15:32 +0000 (UTC) Received: from gimli.denix (gimli [192.168.0.6]) by mail.denix.org (Postfix) with ESMTP id 75E5C163459; Wed, 9 May 2018 12:15:31 -0400 (EDT) From: Denys Dmytriyenko To: openembedded-core@lists.openembedded.org Date: Wed, 9 May 2018 12:15:30 -0400 Message-Id: <1525882530-55742-1-git-send-email-denis@denix.org> X-Mailer: git-send-email 2.7.4 Cc: Denys Dmytriyenko Subject: [OE-core] [PATCH] mesa: ensure all libwayland-egl* files are removed 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 From: Denys Dmytriyenko Wayland 1.15+ now ships libwayland-egl by itself, so Mesa should remove its instance. Previous commit 6e5952fcfc13ff4b63c9376bd41a1dbba957f425 only removed .so libraries, but left .la, which resulted in conflict. Signed-off-by: Denys Dmytriyenko --- meta/recipes-graphics/mesa/mesa.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.7.4 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 354271e..314d327 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -135,7 +135,7 @@ do_install_append () { chrpath --delete ${D}${libdir}/dri/*_dri.so || true # libwayland-egl has been moved to wayland 1.15+ - rm -f ${D}${libdir}/libwayland-egl.so* + rm -f ${D}${libdir}/libwayland-egl* rm -f ${D}${libdir}/pkgconfig/wayland-egl.pc }