From patchwork Fri Dec 2 21:08:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Rauch X-Patchwork-Id: 17941 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id A914ABE08B for ; Fri, 2 Dec 2022 21:08:23 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 106C16333F; Fri, 2 Dec 2022 22:08:23 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1670015303; bh=Enswq83KrHuBmap7IrvlsXN9UGMn1ClNfiYlbJg0rGA=; h=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=ugSeBpghdm5P2pi0OltCcVoD+Ll+DR+EvB08pXlsGIiC8tIWSasSg2XSWGYgaqL7Z jgmkkd6hdhUDA3uPIC8hzxIIP82j6QUivbZhdgmPcWVtbb9975S+v0HgUZlQObidTW hS/RkOShvnDCP1VWORNg7N7TauwlyhMA2tagEYrRmL/jkwafma52/eWJVfHbXAMEKD 43NxaBVqL7q0hcdJthdb92ZXBuONyIN3mjvX9sEVEa7ePJTqog1p8BEXjMpiwp3Pnw Ch/ujc6HurX0ptxOl+/MpPubI6PPe7MXmyCjsnxQzFXA1Oz7ytoIbH9BdwAWbC7zco uX7JkdF+co9mQ== Received: from mout.gmx.net (mout.gmx.net [212.227.15.19]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id BCDC160483 for ; Fri, 2 Dec 2022 22:08:21 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=gmx.de header.i=@gmx.de header.b="IQSTh7WT"; dkim-atps=neutral DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.de; s=s31663417; t=1670015301; bh=Enswq83KrHuBmap7IrvlsXN9UGMn1ClNfiYlbJg0rGA=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=IQSTh7WTQ60uF6l/NteWe5JfQiFZREvhkDDf0KV+2PETfbEvk97ltnn8sVg4OMd90 PapPrDWcHOvyuX7E0lU89G8yacS9zzaRiznqsDxFTOi1tMDaFQIWQPlmdZ3sRJU5M/ +k4/BwWphRDo1KgQpKg4hE7jSws9iC2mU2VMRRFKHpfAYDZptxErBKlkM6vG7Jagho wiKvRiFfIYaXZH32zo3Sg8sxkE/ia9IDBpF68dEGtoZVg4BiZBRXLPkeVOPmjz2fSK hcSAMFOtiFi/OMO0W+l4hkPT0tseA1y7OUWBGUgd+A7Wap+XFRxoXeNlWkBF2wzhIW rzcn/OjZcFFAg== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from voyager ([88.152.184.103]) by mail.gmx.net (mrgmx004 [212.227.17.190]) with ESMTPSA (Nemesis) id 1MtfNl-1oiIyQ10mt-00v68m; Fri, 02 Dec 2022 22:08:21 +0100 To: libcamera-devel@lists.libcamera.org Date: Fri, 2 Dec 2022 22:08:18 +0100 Message-Id: <20221202210818.343046-1-Rauch.Christian@gmx.de> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Provags-ID: V03:K1:/4mNyiK/EPEV0U04TaAVZdpposuLzycXLCXtusf44sPk31pyIHK dbGRlTA+Un7316D7H/rrDIXTk2NfM45f0SEXQ0IM8o0whHkmuZbl3rcR45F0AgiBi6tk3rJ jlVWOCvuLRt96DmWRyMhr9n2+Rxh09yyUEKcTmkF+Kiq/B3N98VhzXbu4FW1ZBZTbGuE1hs 8gG2lsYh8FVAaYXOtFt2A== X-Spam-Flag: NO UI-OutboundReport: notjunk:1; M01:P0:orwB6IP7CP0=; cumQb5kDKwbZv+cqd83pnxSquL6 S9r1bZgJM4f84SkI9+AbfEWz36R6z9agXTyUs2RvHew91sJ7jFBAjx1eczkvWFrhH4QJMXqXa DS4i0bjZhGegwVoGI8/t0k/KtnH8NMGF0As3/0GhoWjAjVQc4z8Iesq3sT2uwQeyA3Fwa3oOa UKIbZOOiBuCkWdEWUN5v3+yrkfbDQPreu/YQBMjwBSHAE7EZbGkUVv/YmHS0MWa6mabtPq8Ln CMziPBCuyJaZR/aT1zYI7QxzBYkWos+yhwC+mpiW5ypigp5QCFo5Z3wdyR8VQzzXPQpbl1+oI ELG951kaBH0OKKlT1EL5hm4FdTYMfFmZa9YghJnRQQVthEHte2JhSGdNsNFdFxdzmCQ98Xl1h +OfBswLdG2tQiEugXCI6AVW25RlzKkL+PqjaODNTL9AiCXtoMkWcNbYtxXMYP4Fx5ZdFKI80O cTl52iPsnrep12Uek4uHgUo892EaV+1D6wPNml1thLWe170HYkbMHfJvOS27CwQb3T3MqxBAw FoXgvXWmTdGan7k1BZCWyjMN7Zz5LTRgZQMTceFnmEbbNJCEEAr22i2PF1kFSgb+aJ91fyPFZ C6gw/xAOiiy6N30PyPavlk5lIGfX+XcY6+Ugu5/1wK6kVE0Y+Mu9zwqVtZqkdlGe28V1h2DIT 5KMaD9cnfa5D2OOygp46/PCUZvrLGHl9FSYNrx3adwojn5TM0VijHDroIbMxJf05CA+RU0Ln3 hrlkedeVSap/jS0C5h1hbm315w4hyPmxZTc0sCy9l7DFPZqkQEb9uZ74qkhyubMXcrRkGULrz 2xDSVZUDnNj+6poEIPYMBK5DOnBsjgjhFfntVe3ZgOjk/Lgvbsyn4C99ZCLntisb4uJaBR/DP 4oYf9lXoYmrzrm50EBnsbZ+p4NTfeg/UL+IhvziSzOfl+pSBZ/U9SVXqgUgRWeF2Ac5U+VDeK StRowA== Subject: [libcamera-devel] [PATCH v2] meson: Use library() in order to let user chose the library type X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Christian Rauch via libcamera-devel From: Christian Rauch Reply-To: Christian Rauch Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Defining libraries via shared_library() prevents compiling libcamera as static library. The meson project recommends using library() instead of shared_library(), static_library() or both_libraries(): https://mesonbuild.com/Reference-manual_functions.html#library Signed-off-by: Christian Rauch --- src/libcamera/base/meson.build | 18 +++++++++--------- src/libcamera/meson.build | 18 +++++++++--------- 2 files changed, 18 insertions(+), 18 deletions(-) -- 2.34.1 diff --git a/src/libcamera/base/meson.build b/src/libcamera/base/meson.build index 7a7fd7e4..91dc1e71 100644 --- a/src/libcamera/base/meson.build +++ b/src/libcamera/base/meson.build @@ -48,15 +48,15 @@ libcamera_base_deps = [ # the use of headers which must not be exposed to the libcamera public api. libcamera_base_args = [ '-DLIBCAMERA_BASE_PRIVATE' ] -libcamera_base_lib = shared_library('libcamera-base', - [libcamera_base_sources, libcamera_base_headers], - version : libcamera_version, - soversion : libcamera_soversion, - name_prefix : '', - install : true, - cpp_args : libcamera_base_args, - include_directories : libcamera_includes, - dependencies : libcamera_base_deps) +libcamera_base_lib = library('libcamera-base', + [libcamera_base_sources, libcamera_base_headers], + version : libcamera_version, + soversion : libcamera_soversion, + name_prefix : '', + install : true, + cpp_args : libcamera_base_args, + include_directories : libcamera_includes, + dependencies : libcamera_base_deps) libcamera_base = declare_dependency(sources : [ libcamera_base_headers, diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build index 0494e808..cd1bf4ed 100644 --- a/src/libcamera/meson.build +++ b/src/libcamera/meson.build @@ -163,15 +163,15 @@ libcamera_deps = [ # runtime if the library is running from an installed location by checking # for the presence or abscence of the dynamic tag. -libcamera = shared_library('libcamera', - libcamera_sources, - version : libcamera_version, - soversion : libcamera_soversion, - name_prefix : '', - install : true, - include_directories : includes, - build_rpath : '/', - dependencies : libcamera_deps) +libcamera = library('libcamera', + libcamera_sources, + version : libcamera_version, + soversion : libcamera_soversion, + name_prefix : '', + install : true, + include_directories : includes, + build_rpath : '/', + dependencies : libcamera_deps) libcamera_public = declare_dependency(sources : [ libcamera_ipa_headers,