[{"id":3836,"web_url":"https://patchwork.libcamera.org/comment/3836/","msgid":"<20200222104218.GD4846@pendragon.ideasonboard.com>","date":"2020-02-22T10:42:18","subject":"Re: [libcamera-devel] [PATCH v4 5/6] libcamera: ipa_manager: Search\n\tfor IPA libraries in build tree","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Kieran,\n\nThank you for the patch.\n\nOn Fri, Feb 21, 2020 at 04:31:29PM +0000, Kieran Bingham wrote:\n> When libcamera is built and tested (or used at all) before installing to\n> the configured prefix path, it will be unable to locate the IPA\n> binaries, or IPA binaries previously installed in the system paths may\n> be incorrect to load.\n> \n> Utilise the build_rpath dynamic tag which is stripped out by meson at\n> install time to determine at runtime if the library currently executing\n> has been installed or not.\n> \n> When not installed and running from a build tree, identify the location\n> of that tree by finding the path of the active libcamera.so itself, and\n> from that point add a relative path to be able to load the most recently\n> built IPA modules.\n> \n> Signed-off-by: Kieran Bingham \n> \n> ---\n> v2:\n> - Move get_runpath to ipa_manager.c : libcamera::elfRunPath()\n> - Minor fixes\n> - Squash elfRunPath() into this patch\n> \n> v3:\n> - Full rework. It's just all different :-)\n> - Maybe this one is going to cut it ...\n> \n> v4:\n> - rebase and cleanup\n> ---\n> src/libcamera/ipa_manager.cpp | 52 ++++++++++++++++++++++++++++++++++-\n> src/libcamera/meson.build | 6 ++++\n> 2 files changed, 57 insertions(+), 1 deletion(-)\n> \n> diff --git a/src/libcamera/ipa_manager.cpp b/src/libcamera/ipa_manager.cpp\n> index de99a0bc3ce1..a5f2707f6788 100644\n> --- a/src/libcamera/ipa_manager.cpp\n> +++ b/src/libcamera/ipa_manager.cpp\n> @@ -9,6 +9,9 @@\n> \n> #include \n> #include \n> +#include \n> +#include \n> +#include \n> #include \n> #include \n> \n> @@ -24,6 +27,35 @@\n> * \\brief Image Processing Algorithm module manager\n> */\n> \n> +static bool isLibcameraInstalled()\n> +{\n> +\t/* musl doesn't declare _DYNAMIC in link.h, declare it manually. */\n> +\textern ElfW(Dyn) _DYNAMIC[];\n> +\n> +\t/*\n> +\t * DT_RUNPATH (DT_RPATH when the linker uses old dtags) is removed on\n> +\t * install.\n> +\t */\n> +\tfor (const ElfW(Dyn) *dyn = _DYNAMIC; dyn->d_tag != DT_NULL; ++dyn) {\n> +\t\tif (dyn->d_tag == DT_RUNPATH || dyn->d_tag == DT_RPATH)\n> +\t\t\treturn false;\n> +\t}\n> +\n> +\treturn true;\n> +}\n> +\n> +static const char *libcameraPath()\n> +{\n> +\tDl_info info;\n> +\n> +\t/* Look up our own symbol. */\n> +\tint ret = dladdr(reinterpret_cast(libcameraPath), &info);\n> +\tif (ret == 0)\n> +\t\treturn nullptr;\n> +\n> +\treturn info.dli_fname;\n\nYou're returning a pointer to a local stack variable. I'm surprised that\ncompilers don't warn us. The easiest fix is to turn the function into\n\nstatic std::string libcameraPath()\n\nReviewed-by: Laurent Pinchart \n\n> +}\n> +\n> namespace libcamera {\n> \n> LOG_DEFINE_CATEGORY(IPAManager)\n> @@ -112,7 +144,25 @@ IPAManager::IPAManager()\n> \t\t\t\t<< \"No IPA found in '\" << modulePaths << \"'\";\n> \t}\n> \n> -\t/* Load IPAs from the installed system path. */\n> +\t/*\n> +\t * When libcamera is used before it is installed, load IPAs from the\n> +\t * same build directory as the libcamera library itself. This requires\n> +\t * identifying the path of the libcamera.so, and referencing a relative\n> +\t * path for the IPA from that point. We need to recurse one level of\n> +\t * sub-directories to match the build tree.\n> +\t */\n> +\tif (!isLibcameraInstalled()) {\n> +\t\tstd::string ipaBuildPath = utils::dirname(libcameraPath()) + \"/../ipa\";\n> +\t\tconstexpr int maxDepth = 1;\n> +\n> +\t\tLOG(IPAManager, Info)\n> +\t\t\t<< \"libcamera is not installed. Adding '\"\n> +\t\t\t<< ipaBuildPath << \"' to the IPA search path\";\n> +\n> +\t\tipaCount += addDir(ipaBuildPath.c_str(), maxDepth);\n> +\t}\n> +\n> +\t/* Finally try to load IPAs from the installed system path. */\n> \tipaCount += addDir(IPA_MODULE_DIR);\n> \n> \tif (!ipaCount)\n> diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build\n> index 1e5b54b34078..88658ac563f7 100644\n> --- a/src/libcamera/meson.build\n> +++ b/src/libcamera/meson.build\n> @@ -107,11 +107,17 @@ if get_option('android')\n> libcamera_link_with += android_camera_metadata\n> endif\n> \n> +# We add '/' to the build_rpath as a 'safe' path to act as a boolean flag.\n> +# The build_rpath is stripped at install time by meson, so we determine at\n> +# runtime if the library is running from an installed location by checking\n> +# for the presence or abscence of the dynamic tag.\n> +\n> libcamera = shared_library('camera',\n> libcamera_sources,\n> install : true,\n> link_with : libcamera_link_with,\n> include_directories : includes,\n> + build_rpath : '/',\n> dependencies : libcamera_deps)\n> \n> libcamera_dep = declare_dependency(sources : [libcamera_api, libcamera_ipa_api, libcamera_h],","headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id CF22760430\n\tfor ;\n\tSat, 22 Feb 2020 11:42:38 +0100 (CET)","from pendragon.ideasonboard.com (81-175-216-236.bb.dnainternet.fi\n\t[81.175.216.236])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 3CCEC33E;\n\tSat, 22 Feb 2020 11:42:38 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1582368158;\n\tbh=uT0s+t7wNHj0Pn0uYg8fvJRyrSc997v9a9G23eWH0Ys=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=l+yIeDyMCG+tHjhy2QBnx6sjQ7o6aRBHeE4Cr7jQ9PjfeZ0O878vs6mWuJnbmJrzg\n\tusdyFqrNC68c1dkwh69QnqLPg41l5aCCm+cPhkqFpElu0PZTrmnaRTN3rg5KwUiyHq\n\tzVSxsOGb2bplp2bVBwnvaQS7g002kiTXpRdhjoqA=","Date":"Sat, 22 Feb 2020 12:42:18 +0200","From":"Laurent Pinchart ","To":"Kieran Bingham ","Cc":"libcamera devel ","Message-ID":"<20200222104218.GD4846@pendragon.ideasonboard.com>","References":"<20200221163130.4791-1-kieran.bingham@ideasonboard.com>\n\t<20200221163130.4791-6-kieran.bingham@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20200221163130.4791-6-kieran.bingham@ideasonboard.com>","User-Agent":"Mutt/1.10.1 (2018-07-13)","Subject":"Re: [libcamera-devel] [PATCH v4 5/6] libcamera: ipa_manager: Search\n\tfor IPA libraries in build tree","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Sat, 22 Feb 2020 10:42:39 -0000"}},{"id":3838,"web_url":"https://patchwork.libcamera.org/comment/3838/","msgid":"<2d59354c-90e0-6df7-5172-7877a1f7fd6c@ideasonboard.com>","date":"2020-02-24T09:44:39","subject":"Re: [libcamera-devel] [PATCH v4 5/6] libcamera: ipa_manager: Search\n\tfor IPA libraries in build tree","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Laurent,\n\nOn 22/02/2020 10:42, Laurent Pinchart wrote:\n> Hi Kieran,\n> \n> Thank you for the patch.\n> \n> On Fri, Feb 21, 2020 at 04:31:29PM +0000, Kieran Bingham wrote:\n>> When libcamera is built and tested (or used at all) before installing to\n>> the configured prefix path, it will be unable to locate the IPA\n>> binaries, or IPA binaries previously installed in the system paths may\n>> be incorrect to load.\n>>\n>> Utilise the build_rpath dynamic tag which is stripped out by meson at\n>> install time to determine at runtime if the library currently executing\n>> has been installed or not.\n>>\n>> When not installed and running from a build tree, identify the location\n>> of that tree by finding the path of the active libcamera.so itself, and\n>> from that point add a relative path to be able to load the most recently\n>> built IPA modules.\n>>\n>> Signed-off-by: Kieran Bingham \n>>\n>> ---\n>> v2:\n>> - Move get_runpath to ipa_manager.c : libcamera::elfRunPath()\n>> - Minor fixes\n>> - Squash elfRunPath() into this patch\n>>\n>> v3:\n>> - Full rework. It's just all different :-)\n>> - Maybe this one is going to cut it ...\n>>\n>> v4:\n>> - rebase and cleanup\n>> ---\n>> src/libcamera/ipa_manager.cpp | 52 ++++++++++++++++++++++++++++++++++-\n>> src/libcamera/meson.build | 6 ++++\n>> 2 files changed, 57 insertions(+), 1 deletion(-)\n>>\n>> diff --git a/src/libcamera/ipa_manager.cpp b/src/libcamera/ipa_manager.cpp\n>> index de99a0bc3ce1..a5f2707f6788 100644\n>> --- a/src/libcamera/ipa_manager.cpp\n>> +++ b/src/libcamera/ipa_manager.cpp\n>> @@ -9,6 +9,9 @@\n>> \n>> #include \n>> #include \n>> +#include \n>> +#include \n>> +#include \n>> #include \n>> #include \n>> \n>> @@ -24,6 +27,35 @@\n>> * \\brief Image Processing Algorithm module manager\n>> */\n>> \n>> +static bool isLibcameraInstalled()\n>> +{\n>> +\t/* musl doesn't declare _DYNAMIC in link.h, declare it manually. */\n>> +\textern ElfW(Dyn) _DYNAMIC[];\n>> +\n>> +\t/*\n>> +\t * DT_RUNPATH (DT_RPATH when the linker uses old dtags) is removed on\n>> +\t * install.\n>> +\t */\n>> +\tfor (const ElfW(Dyn) *dyn = _DYNAMIC; dyn->d_tag != DT_NULL; ++dyn) {\n>> +\t\tif (dyn->d_tag == DT_RUNPATH || dyn->d_tag == DT_RPATH)\n>> +\t\t\treturn false;\n>> +\t}\n>> +\n>> +\treturn true;\n>> +}\n>> +\n>> +static const char *libcameraPath()\n>> +{\n>> +\tDl_info info;\n>> +\n>> +\t/* Look up our own symbol. */\n>> +\tint ret = dladdr(reinterpret_cast(libcameraPath), &info);\n>> +\tif (ret == 0)\n>> +\t\treturn nullptr;\n>> +\n>> +\treturn info.dli_fname;\n> \n> You're returning a pointer to a local stack variable. I'm surprised that\n> compilers don't warn us. The easiest fix is to turn the function into\n> \n> static std::string libcameraPath()\n\nDl_info is a:\n\ntypedef struct\n{\n const char *dli_fname;\t/* File name of defining object. */\n void *dli_fbase;\t\t/* Load address of that object. */\n const char *dli_sname;\t/* Name of nearest symbol. */\n void *dli_saddr;\t\t/* Exact value of nearest symbol. */\n} Dl_info;\n\nThus I understood that info.dli_fname was a pointer to some constant\nlinker load time memory location, as it certainly can't go out of scope\njust because the Dl_info structure goes out of scope ...\n\nI'm fine returning a std::string though, as it's only used in string\nparsing anyway..\n\n\n> Reviewed-by: Laurent Pinchart \n\n\nHappy to convert to a std::string all the same and grab that tag...\n--\nKieran\n\n\n> \n>> +}\n>> +\n>> namespace libcamera {\n>> \n>> LOG_DEFINE_CATEGORY(IPAManager)\n>> @@ -112,7 +144,25 @@ IPAManager::IPAManager()\n>> \t\t\t\t<< \"No IPA found in '\" << modulePaths << \"'\";\n>> \t}\n>> \n>> -\t/* Load IPAs from the installed system path. */\n>> +\t/*\n>> +\t * When libcamera is used before it is installed, load IPAs from the\n>> +\t * same build directory as the libcamera library itself. This requires\n>> +\t * identifying the path of the libcamera.so, and referencing a relative\n>> +\t * path for the IPA from that point. We need to recurse one level of\n>> +\t * sub-directories to match the build tree.\n>> +\t */\n>> +\tif (!isLibcameraInstalled()) {\n>> +\t\tstd::string ipaBuildPath = utils::dirname(libcameraPath()) + \"/../ipa\";\n>> +\t\tconstexpr int maxDepth = 1;\n>> +\n>> +\t\tLOG(IPAManager, Info)\n>> +\t\t\t<< \"libcamera is not installed. Adding '\"\n>> +\t\t\t<< ipaBuildPath << \"' to the IPA search path\";\n>> +\n>> +\t\tipaCount += addDir(ipaBuildPath.c_str(), maxDepth);\n>> +\t}\n>> +\n>> +\t/* Finally try to load IPAs from the installed system path. */\n>> \tipaCount += addDir(IPA_MODULE_DIR);\n>> \n>> \tif (!ipaCount)\n>> diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build\n>> index 1e5b54b34078..88658ac563f7 100644\n>> --- a/src/libcamera/meson.build\n>> +++ b/src/libcamera/meson.build\n>> @@ -107,11 +107,17 @@ if get_option('android')\n>> libcamera_link_with += android_camera_metadata\n>> endif\n>> \n>> +# We add '/' to the build_rpath as a 'safe' path to act as a boolean flag.\n>> +# The build_rpath is stripped at install time by meson, so we determine at\n>> +# runtime if the library is running from an installed location by checking\n>> +# for the presence or abscence of the dynamic tag.\n>> +\n>> libcamera = shared_library('camera',\n>> libcamera_sources,\n>> install : true,\n>> link_with : libcamera_link_with,\n>> include_directories : includes,\n>> + build_rpath : '/',\n>> dependencies : libcamera_deps)\n>> \n>> libcamera_dep = declare_dependency(sources : [libcamera_api, libcamera_ipa_api, libcamera_h],\n>","headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id EE4DD6042E\n\tfor ;\n\tMon, 24 Feb 2020 10:44:43 +0100 (CET)","from [192.168.0.20]\n\t(cpc89242-aztw30-2-0-cust488.18-1.cable.virginm.net [86.31.129.233])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 3843E33E;\n\tMon, 24 Feb 2020 10:44:43 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1582537483;\n\tbh=pHvDzY34J+YpyK9IjSxz7TdWNaFchgDMcpvr+xTij/M=;\n\th=Reply-To:Subject:To:Cc:References:From:Date:In-Reply-To:From;\n\tb=Zflv3SVg36KnsF9Fnyjmpn86NEgOd8M2j27XTwmBOy6gzueX2o06ClgE+3IBQDtG6\n\t2ZgW629O02uEvFvGmy1dj9IM1gIeuGA9oWI1Z2VFie4cFG1cjvOqspeJviO9Pgqmo6\n\tImot9UK0l7NmeCR/q7//fFD54F84FbfNqBZNKwTQ=","Reply-To":"kieran.bingham@ideasonboard.com","To":"Laurent Pinchart ","Cc":"libcamera devel ","References":"<20200221163130.4791-1-kieran.bingham@ideasonboard.com>\n\t<20200221163130.4791-6-kieran.bingham@ideasonboard.com>\n\t<20200222104218.GD4846@pendragon.ideasonboard.com>","From":"Kieran Bingham ","Openpgp":"preference=signencrypt","Autocrypt":"addr=kieran.bingham@ideasonboard.com; keydata=\n\t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\n\tWZw01QYHU/GUV/zHJSFk","Organization":"Ideas on Board","Message-ID":"<2d59354c-90e0-6df7-5172-7877a1f7fd6c@ideasonboard.com>","Date":"Mon, 24 Feb 2020 09:44:39 +0000","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101\n\tThunderbird/60.9.1","MIME-Version":"1.0","In-Reply-To":"<20200222104218.GD4846@pendragon.ideasonboard.com>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-GB","Content-Transfer-Encoding":"8bit","Subject":"Re: [libcamera-devel] [PATCH v4 5/6] libcamera: ipa_manager: Search\n\tfor IPA libraries in build tree","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Mon, 24 Feb 2020 09:44:44 -0000"}},{"id":3839,"web_url":"https://patchwork.libcamera.org/comment/3839/","msgid":"<20200224114421.GA4827@pendragon.ideasonboard.com>","date":"2020-02-24T11:44:21","subject":"Re: [libcamera-devel] [PATCH v4 5/6] libcamera: ipa_manager: Search\n\tfor IPA libraries in build tree","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Kieran,\n\nOn Mon, Feb 24, 2020 at 09:44:39AM +0000, Kieran Bingham wrote:\n> On 22/02/2020 10:42, Laurent Pinchart wrote:\n> > On Fri, Feb 21, 2020 at 04:31:29PM +0000, Kieran Bingham wrote:\n> >> When libcamera is built and tested (or used at all) before installing to\n> >> the configured prefix path, it will be unable to locate the IPA\n> >> binaries, or IPA binaries previously installed in the system paths may\n> >> be incorrect to load.\n> >>\n> >> Utilise the build_rpath dynamic tag which is stripped out by meson at\n> >> install time to determine at runtime if the library currently executing\n> >> has been installed or not.\n> >>\n> >> When not installed and running from a build tree, identify the location\n> >> of that tree by finding the path of the active libcamera.so itself, and\n> >> from that point add a relative path to be able to load the most recently\n> >> built IPA modules.\n> >>\n> >> Signed-off-by: Kieran Bingham \n> >>\n> >> ---\n> >> v2:\n> >> - Move get_runpath to ipa_manager.c : libcamera::elfRunPath()\n> >> - Minor fixes\n> >> - Squash elfRunPath() into this patch\n> >>\n> >> v3:\n> >> - Full rework. It's just all different :-)\n> >> - Maybe this one is going to cut it ...\n> >>\n> >> v4:\n> >> - rebase and cleanup\n> >> ---\n> >> src/libcamera/ipa_manager.cpp | 52 ++++++++++++++++++++++++++++++++++-\n> >> src/libcamera/meson.build | 6 ++++\n> >> 2 files changed, 57 insertions(+), 1 deletion(-)\n> >>\n> >> diff --git a/src/libcamera/ipa_manager.cpp b/src/libcamera/ipa_manager.cpp\n> >> index de99a0bc3ce1..a5f2707f6788 100644\n> >> --- a/src/libcamera/ipa_manager.cpp\n> >> +++ b/src/libcamera/ipa_manager.cpp\n> >> @@ -9,6 +9,9 @@\n> >> \n> >> #include \n> >> #include \n> >> +#include \n> >> +#include \n> >> +#include \n> >> #include \n> >> #include \n> >> \n> >> @@ -24,6 +27,35 @@\n> >> * \\brief Image Processing Algorithm module manager\n> >> */\n> >> \n> >> +static bool isLibcameraInstalled()\n> >> +{\n> >> +\t/* musl doesn't declare _DYNAMIC in link.h, declare it manually. */\n> >> +\textern ElfW(Dyn) _DYNAMIC[];\n> >> +\n> >> +\t/*\n> >> +\t * DT_RUNPATH (DT_RPATH when the linker uses old dtags) is removed on\n> >> +\t * install.\n> >> +\t */\n> >> +\tfor (const ElfW(Dyn) *dyn = _DYNAMIC; dyn->d_tag != DT_NULL; ++dyn) {\n> >> +\t\tif (dyn->d_tag == DT_RUNPATH || dyn->d_tag == DT_RPATH)\n> >> +\t\t\treturn false;\n> >> +\t}\n> >> +\n> >> +\treturn true;\n> >> +}\n> >> +\n> >> +static const char *libcameraPath()\n> >> +{\n> >> +\tDl_info info;\n> >> +\n> >> +\t/* Look up our own symbol. */\n> >> +\tint ret = dladdr(reinterpret_cast(libcameraPath), &info);\n> >> +\tif (ret == 0)\n> >> +\t\treturn nullptr;\n> >> +\n> >> +\treturn info.dli_fname;\n> > \n> > You're returning a pointer to a local stack variable. I'm surprised that\n> > compilers don't warn us. The easiest fix is to turn the function into\n> > \n> > static std::string libcameraPath()\n> \n> Dl_info is a:\n> \n> typedef struct\n> {\n> const char *dli_fname;\t/* File name of defining object. */\n> void *dli_fbase;\t\t/* Load address of that object. */\n> const char *dli_sname;\t/* Name of nearest symbol. */\n> void *dli_saddr;\t\t/* Exact value of nearest symbol. */\n> } Dl_info;\n> \n> Thus I understood that info.dli_fname was a pointer to some constant\n> linker load time memory location, as it certainly can't go out of scope\n> just because the Dl_info structure goes out of scope ...\n\nYou're right, my bad.\n\n> I'm fine returning a std::string though, as it's only used in string\n> parsing anyway..\n\nAnd the only user of libcameraPath() passes the return value to a\nfunction that takes an std::string, so there's a conversion anyway :-)\n\n> > Reviewed-by: Laurent Pinchart \n> \n> Happy to convert to a std::string all the same and grab that tag...\n> \n> >> +}\n> >> +\n> >> namespace libcamera {\n> >> \n> >> LOG_DEFINE_CATEGORY(IPAManager)\n> >> @@ -112,7 +144,25 @@ IPAManager::IPAManager()\n> >> \t\t\t\t<< \"No IPA found in '\" << modulePaths << \"'\";\n> >> \t}\n> >> \n> >> -\t/* Load IPAs from the installed system path. */\n> >> +\t/*\n> >> +\t * When libcamera is used before it is installed, load IPAs from the\n> >> +\t * same build directory as the libcamera library itself. This requires\n> >> +\t * identifying the path of the libcamera.so, and referencing a relative\n> >> +\t * path for the IPA from that point. We need to recurse one level of\n> >> +\t * sub-directories to match the build tree.\n> >> +\t */\n> >> +\tif (!isLibcameraInstalled()) {\n> >> +\t\tstd::string ipaBuildPath = utils::dirname(libcameraPath()) + \"/../ipa\";\n> >> +\t\tconstexpr int maxDepth = 1;\n> >> +\n> >> +\t\tLOG(IPAManager, Info)\n> >> +\t\t\t<< \"libcamera is not installed. Adding '\"\n> >> +\t\t\t<< ipaBuildPath << \"' to the IPA search path\";\n> >> +\n> >> +\t\tipaCount += addDir(ipaBuildPath.c_str(), maxDepth);\n> >> +\t}\n> >> +\n> >> +\t/* Finally try to load IPAs from the installed system path. */\n> >> \tipaCount += addDir(IPA_MODULE_DIR);\n> >> \n> >> \tif (!ipaCount)\n> >> diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build\n> >> index 1e5b54b34078..88658ac563f7 100644\n> >> --- a/src/libcamera/meson.build\n> >> +++ b/src/libcamera/meson.build\n> >> @@ -107,11 +107,17 @@ if get_option('android')\n> >> libcamera_link_with += android_camera_metadata\n> >> endif\n> >> \n> >> +# We add '/' to the build_rpath as a 'safe' path to act as a boolean flag.\n> >> +# The build_rpath is stripped at install time by meson, so we determine at\n> >> +# runtime if the library is running from an installed location by checking\n> >> +# for the presence or abscence of the dynamic tag.\n> >> +\n> >> libcamera = shared_library('camera',\n> >> libcamera_sources,\n> >> install : true,\n> >> link_with : libcamera_link_with,\n> >> include_directories : includes,\n> >> + build_rpath : '/',\n> >> dependencies : libcamera_deps)\n> >> \n> >> libcamera_dep = declare_dependency(sources : [libcamera_api, libcamera_ipa_api, libcamera_h],","headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 7582B60430\n\tfor ;\n\tMon, 24 Feb 2020 12:44:44 +0100 (CET)","from pendragon.ideasonboard.com (81-175-216-236.bb.dnainternet.fi\n\t[81.175.216.236])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 796C5E89;\n\tMon, 24 Feb 2020 12:44:43 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1582544684;\n\tbh=+CE02s9mrcOsuWWoJK2ahQRTvi5jOYT1Fff/zpPP6v4=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=Cvcn99iTbzLYlSABTblNH4E8sEOuwRGEM3J9d0qcBsXCGL087BvuyUTdP73gxRdzq\n\t96JWS6co15u0wLlbkd+XodvuXyx1OVy68dIm3PDLs+GH8zLJRWORZvEWDCI9V5Z9ZZ\n\t3gEp2DC2wFNG78+hQW/uTJymc67pevMt0QGGmiUY=","Date":"Mon, 24 Feb 2020 13:44:21 +0200","From":"Laurent Pinchart ","To":"Kieran Bingham ","Cc":"libcamera devel ","Message-ID":"<20200224114421.GA4827@pendragon.ideasonboard.com>","References":"<20200221163130.4791-1-kieran.bingham@ideasonboard.com>\n\t<20200221163130.4791-6-kieran.bingham@ideasonboard.com>\n\t<20200222104218.GD4846@pendragon.ideasonboard.com>\n\t<2d59354c-90e0-6df7-5172-7877a1f7fd6c@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<2d59354c-90e0-6df7-5172-7877a1f7fd6c@ideasonboard.com>","User-Agent":"Mutt/1.10.1 (2018-07-13)","Subject":"Re: [libcamera-devel] [PATCH v4 5/6] libcamera: ipa_manager: Search\n\tfor IPA libraries in build tree","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Mon, 24 Feb 2020 11:44:44 -0000"}}]