From patchwork Fri Aug 9 23:23:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 11088105 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 618AC14F7 for ; Fri, 9 Aug 2019 23:23:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4D77B205FD for ; Fri, 9 Aug 2019 23:23:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4183D21FAC; Fri, 9 Aug 2019 23:23:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,FREEMAIL_FROM, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2E24D205FD for ; Fri, 9 Aug 2019 23:23:46 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E63646EF0F; Fri, 9 Aug 2019 23:23:43 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mout.gmx.net (mout.gmx.net [212.227.17.21]) by gabe.freedesktop.org (Postfix) with ESMTPS id 828BB6EF0F for ; Fri, 9 Aug 2019 23:23:42 +0000 (UTC) X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([188.99.127.234]) by mail.gmx.com (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MvsEx-1iCfO92FuB-00srYV for ; Sat, 10 Aug 2019 01:23:38 +0200 From: Peter Seiderer To: dri-devel@lists.freedesktop.org Subject: [PATCH libdrm v1] meson: fix libdl/shared library support detection for nouveau tests Date: Sat, 10 Aug 2019 01:23:37 +0200 Message-Id: <20190809232337.22307-1-ps.report@gmx.net> X-Mailer: git-send-email 2.22.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:rvWimmy1sKIfjO7qyJPvo2LGOpeMEwZ6nLLcP81GpsJSJozkR8L 8R5fMgAm94pu0dDVAWLYy+DbPBZa4oDFaf7Gqh9Q/yOvK69NUGDJtxxFwctvnnqX1nNZyJO go3ewhZz9QBzGwxC3iHmrZIgTe9IlManeTSWg0adf1AlS3m5D3sOOJXLYswMXTdRO+DKKFe 4ALyOFmSnZz/z6rkBP34g== X-UI-Out-Filterresults: notjunk:1;V03:K0:ki2xtX8BHHA=:Mwe1Xvo+Kgt/Rqbz3yae0V WkGspiOe3JuE0usnMyXkEjXra+WesRWqGwjKdrWNGO7qXTuwKlWKhd3uQbDKi1foiGdDw3hKV +/+EH4IHBdNnYm0G4TYnLOSvHsgbGBpGjifw212phxfuwGVZbwWaeDxfZ7e33YFEs/ksWGmZE rt3GdkdHgcyE5YWRpsxrgau1hmeaP8ym0UCq+coo3ReTFWeoc4+RaokkpaYU0mhltAxnua0LP tMctu4wK9YKQci/Y5+E99hQBNSgPxZQwFcA9iVBC5IqepZifoldQ8d7nmkGCfFDcYd1CmTTw5 VMh9zVifkdj7j9N9OT+Li2Qzk3aSdybwabDhEnIszmg6OvsjYrIcLqxdw1rlg7GLJPGg7CTo0 81k5mxexynFVCNqpKKGNt90AV4CmHvNw7CNp1jzR/oX+e6DGuBqLwiGzTBkGX3Ei5wZCdUgd8 l1EakDfVMj34lq+SzVorDyivYuWCQqEMVya4oQbOllIiZdg2zTWgDsdZtHBEFY4fQiL0e+Vcn vAppF+XD1q7OBxslHvuuJVGnmqJhcekrZ3CxKzoxH0Nll/Id1Sp1fRCpR91JYE1aHzVyRtmwW yX9t27vIFS/u6SWGsGHaNvZLyDtAGPP/z4fixI0m6PBuh5q1GzvBbUdIaXjefyByqX5qORrE2 ohRu4eg8Z1cBUTCKMAz6PoENU3dMQc0aEpHFMcfOKxqitN+rJKxslJeAc452y+XFIyi2BBJx/ q5pnDJtRvfhnf/dv7Fj6k61rYPucz10w2R+/k7fIS8q8j4jTzNzGwLtBYp0yshahe0h6Mwr8j hebGWpcvJWXACg/MCeOamdvKwQyjWNBkRKPT6UXur8WOr0wpg3Qad4noKVfaYCaxR8/Fwje51 7jDtqL5CVAYRxR5ECybSTMo+PiKw79hDg5KqM2QwQzKFtTcGwLAT1q9mMvlCh5b4FjzF8dmj1 fL5ZT8KpqAeJMWoudZe0/vUOvCHxVinnTXCx11AEM6mv/Pf6p+yjNaYo+vAA1kmnHR/Xh0bVd iGmGaBDfQb5dqCQqbImtK0RDQj7Y65qhWYfm5msn6UmzYiWZwSsXcNObHsSvcB1rdIBtnSx2G 1Pwm6GY1nmvybSNJLibfu6OXO9IDgrVV1tI5mVI9BjbLcx13VP4CfRlgg== X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1565393018; bh=66KW3W48yP5Tp9fWWS7mIVjqvzUh41RPk27R/VZQhU0=; h=X-UI-Sender-Class:From:To:Subject:Date; b=YCOfviuIsCofCUxAfHnG1eamXy5ECBxYpKknzKQkW+klA877oqRZ84FRXVThpu+1w CZB59BDODwTg6vGohxzitrhmSk8HZ63zK/LF9GKX03s50WcM4WUbnuUALTetgXqAZB MdFMQmtoJUmRT1h2nq5JzDej30irAsFNwQkDHO2c= X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Some toolchains (e.g. br-arm-cortex-m4-full) provide empty libdl libraries. This fools the dynamic/static detection for tests/nouveau, so explicit check for library type instead. Fixes: ../tests/nouveau/threaded.c:24:10: fatal error: dlfcn.h: No such file or directory Signed-off-by: Peter Seiderer --- meson.build | 1 + tests/meson.build | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) -- 2.22.0 diff --git a/meson.build b/meson.build index adaaf22..b78d9e5 100644 --- a/meson.build +++ b/meson.build @@ -168,6 +168,7 @@ endif # Among others FreeBSD does not have a separate dl library. if not cc.has_function('dlsym') + # fooled in case empty libdl provided, e.g. toolchain br-arm-cortex-m4-full dep_dl = cc.find_library('dl', required : with_nouveau) else dep_dl = [] diff --git a/tests/meson.build b/tests/meson.build index 6c8ddd9..f7cb5f0 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -44,8 +44,11 @@ endif if with_etnaviv subdir('etnaviv') endif +lib_type = get_option('default_library') if with_nouveau - subdir('nouveau') + if lib_type != 'static' + subdir('nouveau') + endif endif drmsl = executable(