From patchwork Thu Jun 23 12:17:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Volk X-Patchwork-Id: 9541 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9FB80C43334 for ; Thu, 23 Jun 2022 12:18:08 +0000 (UTC) Received: from mailout04.t-online.de (mailout04.t-online.de [194.25.134.18]) by mx.groups.io with SMTP id smtpd.web10.6630.1655986679294255887 for ; Thu, 23 Jun 2022 05:17:59 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=SPF record not found (domain: t-online.de, ip: 194.25.134.18, mailfrom: f_l_k@t-online.de) Received: from fwd78.dcpf.telekom.de (fwd78.aul.t-online.de [10.223.144.104]) by mailout04.t-online.de (Postfix) with SMTP id A50206B5A for ; Thu, 23 Jun 2022 14:17:56 +0200 (CEST) Received: from flk-MS-7C91.fritz.box ([84.163.42.157]) by fwd78.t-online.de with (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384 encrypted) esmtp id 1o4LmV-0bom250; Thu, 23 Jun 2022 14:17:55 +0200 From: Markus Volk To: openembedded-core@lists.openembedded.org Cc: Markus Volk Subject: [oe-core][PATCHv2] llvm: install optviewer if available Date: Thu, 23 Jun 2022 14:17:45 +0200 Message-Id: <20220623121745.146809-1-f_l_k@t-online.de> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1655986675-0143C329-C8057F42/0/0 CLEAN NORMAL X-TOI-MSGID: 5c503712-f1ff-4826-8f21-fd3270c75a47 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 23 Jun 2022 12:18:08 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167268 Signed-off-by: Markus Volk --- meta/recipes-devtools/llvm/llvm_git.bb | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/meta/recipes-devtools/llvm/llvm_git.bb b/meta/recipes-devtools/llvm/llvm_git.bb index 0d7b042958..f9d124e387 100644 --- a/meta/recipes-devtools/llvm/llvm_git.bb +++ b/meta/recipes-devtools/llvm/llvm_git.bb @@ -112,9 +112,8 @@ do_install() { # llvm harcodes usr/lib as install path, so this corrects it to actual libdir mv -T -n ${D}/${prefix}/lib ${D}/${libdir} || true - # Remove opt-viewer: https://llvm.org/docs/Remarks.html - rm -rf ${D}${datadir}/opt-viewer - rmdir ${D}${datadir} + # Remove opt-viewer: https://llvm.org/docs/Remarks.html if disabled + ${@bb.utils.contains('PACKAGECONFIG', 'optviewer', '', 'rm -rf ${D}${datadir}', d)} # reproducibility sed -i -e 's,${WORKDIR},,g' ${D}/${libdir}/cmake/llvm/LLVMConfig.cmake @@ -125,7 +124,7 @@ do_install:class-native() { install -D -m 0755 ${B}/bin/llvm-config ${D}${bindir}/llvm-config${PV} } -PACKAGES =+ "${PN}-bugpointpasses ${PN}-llvmhello ${PN}-libllvm ${PN}-liboptremarks ${PN}-liblto" +PACKAGES =+ "${PN}-bugpointpasses ${PN}-llvmhello ${PN}-libllvm ${PN}-liboptremarks ${PN}-optviewer ${PN}-liblto" RRECOMMENDS:${PN}-dev += "${PN}-bugpointpasses ${PN}-llvmhello ${PN}-liboptremarks" @@ -149,6 +148,10 @@ FILES:${PN}-llvmhello = "\ ${libdir}/LLVMHello.so \ " +FILES:${PN}-optviewer += "\ + ${datadir}/opt-viewer \ +" + FILES:${PN}-dev += " \ ${libdir}/llvm-config \ ${libdir}/libRemarks.so \