[{"id":3126,"web_url":"https://patchwork.libcamera.org/comment/3126/","msgid":"<7b6fd55d-8651-10aa-ecdf-68826f379f84@ideasonboard.com>","date":"2019-11-21T09:17:50","subject":"Re: [libcamera-devel] [PATCH] meson: Really define _FORTIFY_SOURCE\n\tfor optimised builds","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Laurent,\n\nOn 21/11/2019 04:19, Laurent Pinchart wrote:\n> Commit 965c5bf7fbf5 (\"meson: Define _FORTIFY_SOURCE for optimised\n> builds\") tried to define _FORTIFY_SOURCE for optimised builds with\n> clang, but updated the common_arguments after it was used. This resulted\n> in the _FORTIFY_SOURCE option not being applied. Fix it.\n> \n> Fixes: 965c5bf7fbf5 (\"meson: Define _FORTIFY_SOURCE for optimised builds\")\n> Signed-off-by: Laurent Pinchart \n> ---\n> meson.build | 7 +++++--\n> 1 file changed, 5 insertions(+), 2 deletions(-)\n> \n> diff --git a/meson.build b/meson.build\n> index 72ad7c8b493b..0a222ba96dcb 100644\n> --- a/meson.build\n> +++ b/meson.build\n> @@ -35,8 +35,8 @@ common_arguments = [\n> '-include', 'config.h',\n> ]\n> \n> -c_arguments = common_arguments\n> -cpp_arguments = common_arguments\n> +c_arguments = []\n> +cpp_arguments = []\n\nc_arguments and cpp_arguments are not used until after the code block\nbelow. Do we really need to define them as empty arrays here?\n\nI /think/ we can just move the assignment to below?\n (where you do an addition instead)\n\n> \n> if cc.get_id() == 'clang'\n> # Turn _FORTIFY_SOURCE by default on optimised builds (as it requires -O1\n> @@ -56,6 +56,9 @@ if cc.get_id() == 'clang'\n> endif\n> endif\n> \n> +c_arguments += common_arguments\n> +cpp_arguments += common_arguments\n> +> add_project_arguments(c_arguments, language : 'c')\n\nEeep - and that's so blindingly obvious when you look at 965c5bf7fbf5,\nas this line is clearly in the hunk. I'm sorry I missed it.\n\n(of course it's always easier to spot something that you know is there).\n\nWith either the empty arrays declared above if that's necessary (or just\npreferred) or directly assigned lower down if it's appropriate:\n\nReviewed-by: Kieran Bingham \n\n\n> add_project_arguments(cpp_arguments, language : 'cpp')\n> add_project_link_arguments(cpp_arguments, language : 'cpp')\n>","headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 2CC376136E\n\tfor ;\n\tThu, 21 Nov 2019 10:17:54 +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 74F0BB57;\n\tThu, 21 Nov 2019 10:17:53 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1574327873;\n\tbh=QaizFboHQ4CNHFa6TquwsjVMTrXF3kA+usa0CPz6ge0=;\n\th=Reply-To:Subject:To:References:From:Date:In-Reply-To:From;\n\tb=rslX2z3/Qs9xRUXVXGIcxStK0tU0BqMYaOOE9qdtaHq2LsUz52Yl+9v3WcZycHzYI\n\tcdUNGgxF1SQbs31mnSooKS8h4jDw5X2EqsXh0KPP21KDYAJ42H+VBi0VZ+xu9m9T+1\n\tJp0oom4A2h6J8JHuXasinbFsNBCO1qSlWTlcrrOc=","Reply-To":"kieran.bingham@ideasonboard.com","To":"Laurent Pinchart ,\n\tlibcamera-devel@lists.libcamera.org","References":"<20191121041913.16202-1-laurent.pinchart@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":"<7b6fd55d-8651-10aa-ecdf-68826f379f84@ideasonboard.com>","Date":"Thu, 21 Nov 2019 09:17:50 +0000","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101\n\tThunderbird/60.9.0","MIME-Version":"1.0","In-Reply-To":"<20191121041913.16202-1-laurent.pinchart@ideasonboard.com>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-GB","Content-Transfer-Encoding":"8bit","Subject":"Re: [libcamera-devel] [PATCH] meson: Really define _FORTIFY_SOURCE\n\tfor optimised builds","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":"Thu, 21 Nov 2019 09:17:54 -0000"}},{"id":3127,"web_url":"https://patchwork.libcamera.org/comment/3127/","msgid":"<20191121093300.GL4958@pendragon.ideasonboard.com>","date":"2019-11-21T09:33:00","subject":"Re: [libcamera-devel] [PATCH] meson: Really define _FORTIFY_SOURCE\n\tfor optimised builds","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Kieran,\n\nOn Thu, Nov 21, 2019 at 09:17:50AM +0000, Kieran Bingham wrote:\n> On 21/11/2019 04:19, Laurent Pinchart wrote:\n> > Commit 965c5bf7fbf5 (\"meson: Define _FORTIFY_SOURCE for optimised\n> > builds\") tried to define _FORTIFY_SOURCE for optimised builds with\n> > clang, but updated the common_arguments after it was used. This resulted\n> > in the _FORTIFY_SOURCE option not being applied. Fix it.\n> > \n> > Fixes: 965c5bf7fbf5 (\"meson: Define _FORTIFY_SOURCE for optimised builds\")\n> > Signed-off-by: Laurent Pinchart \n> > ---\n> > meson.build | 7 +++++--\n> > 1 file changed, 5 insertions(+), 2 deletions(-)\n> > \n> > diff --git a/meson.build b/meson.build\n> > index 72ad7c8b493b..0a222ba96dcb 100644\n> > --- a/meson.build\n> > +++ b/meson.build\n> > @@ -35,8 +35,8 @@ common_arguments = [\n> > '-include', 'config.h',\n> > ]\n> > \n> > -c_arguments = common_arguments\n> > -cpp_arguments = common_arguments\n> > +c_arguments = []\n> > +cpp_arguments = []\n> \n> c_arguments and cpp_arguments are not used until after the code block\n> below. Do we really need to define them as empty arrays here?\n> \n> I /think/ we can just move the assignment to below?\n> (where you do an addition instead)\n\nI could do that for cpp_arguments, but cpp_arguments is extended in the\nif cc.get_id() == 'clang' block. I could assign it there, but then the\n+= might complain later. I'd rather keep an empty array at the beginning\nand += everywhere to make it easily extensible and avoid future issues.\n\n> > if cc.get_id() == 'clang'\n> > # Turn _FORTIFY_SOURCE by default on optimised builds (as it requires -O1\n> > @@ -56,6 +56,9 @@ if cc.get_id() == 'clang'\n> > endif\n> > endif\n> > \n> > +c_arguments += common_arguments\n> > +cpp_arguments += common_arguments\n> > +> add_project_arguments(c_arguments, language : 'c')\n> \n> Eeep - and that's so blindingly obvious when you look at 965c5bf7fbf5,\n> as this line is clearly in the hunk. I'm sorry I missed it.\n> \n> (of course it's always easier to spot something that you know is there).\n> \n> With either the empty arrays declared above if that's necessary (or just\n> preferred) or directly assigned lower down if it's appropriate:\n> \n> Reviewed-by: Kieran Bingham \n> \n> > add_project_arguments(cpp_arguments, language : 'cpp')\n> > add_project_link_arguments(cpp_arguments, language : 'cpp')\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 D568F6136E\n\tfor ;\n\tThu, 21 Nov 2019 10:33:12 +0100 (CET)","from pendragon.ideasonboard.com (unknown [124.219.31.93])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 708E4A2B;\n\tThu, 21 Nov 2019 10:33:11 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1574328792;\n\tbh=gW4myZXYaFdrNmvmUYQaFiVWHCn65jniy0XmFIbZSkA=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=KHSrtOF8yeU26V7b00EABNmBKH9zGEfjol+r4xg3nKu8BtJzRWM6TzbeCQmHfwP0B\n\t0GA4gEMMiztDTRdWT7fJS4wZdmlLCW/ssBwVL7kh0oihHm18/3bzTl5TklT847udZ/\n\tYGq1pQ1JJcklDwI+AmU6mvIC8AtC7ShsLc/7hky8=","Date":"Thu, 21 Nov 2019 11:33:00 +0200","From":"Laurent Pinchart ","To":"Kieran Bingham ","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20191121093300.GL4958@pendragon.ideasonboard.com>","References":"<20191121041913.16202-1-laurent.pinchart@ideasonboard.com>\n\t<7b6fd55d-8651-10aa-ecdf-68826f379f84@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<7b6fd55d-8651-10aa-ecdf-68826f379f84@ideasonboard.com>","User-Agent":"Mutt/1.10.1 (2018-07-13)","Subject":"Re: [libcamera-devel] [PATCH] meson: Really define _FORTIFY_SOURCE\n\tfor optimised builds","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":"Thu, 21 Nov 2019 09:33:13 -0000"}},{"id":3128,"web_url":"https://patchwork.libcamera.org/comment/3128/","msgid":"<20191121090206.GA14949@bigcity.dyn.berto.se>","date":"2019-11-21T09:33:57","subject":"Re: [libcamera-devel] [PATCH] meson: Really define _FORTIFY_SOURCE\n\tfor optimised builds","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/people/5/","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"content":"Hi Laurent,\n\nThanks for your work.\n\nOn 2019-11-21 06:19:13 +0200, Laurent Pinchart wrote:\n> Commit 965c5bf7fbf5 (\"meson: Define _FORTIFY_SOURCE for optimised\n> builds\") tried to define _FORTIFY_SOURCE for optimised builds with\n> clang, but updated the common_arguments after it was used. This resulted\n> in the _FORTIFY_SOURCE option not being applied. Fix it.\n> \n> Fixes: 965c5bf7fbf5 (\"meson: Define _FORTIFY_SOURCE for optimised builds\")\n> Signed-off-by: Laurent Pinchart \n\nReviewed-by: Niklas Söderlund \n\n> ---\n> meson.build | 7 +++++--\n> 1 file changed, 5 insertions(+), 2 deletions(-)\n> \n> diff --git a/meson.build b/meson.build\n> index 72ad7c8b493b..0a222ba96dcb 100644\n> --- a/meson.build\n> +++ b/meson.build\n> @@ -35,8 +35,8 @@ common_arguments = [\n> '-include', 'config.h',\n> ]\n> \n> -c_arguments = common_arguments\n> -cpp_arguments = common_arguments\n> +c_arguments = []\n> +cpp_arguments = []\n> \n> if cc.get_id() == 'clang'\n> # Turn _FORTIFY_SOURCE by default on optimised builds (as it requires -O1\n> @@ -56,6 +56,9 @@ if cc.get_id() == 'clang'\n> endif\n> endif\n> \n> +c_arguments += common_arguments\n> +cpp_arguments += common_arguments\n> +\n> add_project_arguments(c_arguments, language : 'c')\n> add_project_arguments(cpp_arguments, language : 'cpp')\n> add_project_link_arguments(cpp_arguments, language : 'cpp')\n> -- \n> Regards,\n> \n> Laurent Pinchart\n> \n> _______________________________________________\n> libcamera-devel mailing list\n> libcamera-devel@lists.libcamera.org\n> https://lists.libcamera.org/listinfo/libcamera-devel","headers":{"Return-Path":"","Received":["from mail-lj1-x243.google.com (mail-lj1-x243.google.com\n\t[IPv6:2a00:1450:4864:20::243])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 91BB56136E\n\tfor ;\n\tThu, 21 Nov 2019 10:33:59 +0100 (CET)","by mail-lj1-x243.google.com with SMTP id q2so2420572ljg.7\n\tfor ;\n\tThu, 21 Nov 2019 01:33:59 -0800 (PST)","from localhost (h-93-159.A463.priv.bahnhof.se. [46.59.93.159])\n\tby smtp.gmail.com with ESMTPSA id\n\tz19sm906454ljk.66.2019.11.21.01.33.57\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tThu, 21 Nov 2019 01:33:58 -0800 (PST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=ragnatech-se.20150623.gappssmtp.com; s=20150623;\n\th=date:from:to:cc:subject:message-id:references:mime-version\n\t:content-disposition:content-transfer-encoding:in-reply-to\n\t:user-agent; bh=XW81y+ruGlmJDnsB+YnIN/if8Up9Lt4cH6O5kt+2sms=;\n\tb=fKvZU+bAoQic+Tsy4A+htcpXqvD8SNf/TsckaKY3zL+0PEg1M2o1j9/bjKsLrZzVwO\n\tvLwG2zJPAk5a47dgKjVeqXKflZdkBv7kVFLak7OB3qu9L7gQhuuY4r/1ogtwrjAyTeQp\n\tB2695qg9/HunsptpOmecQuY8MyVfMgF5zyhNuzKf2xIH5bVTfd+gfQo9EOHhbfBheIYG\n\tLiGbyIhiLufxVCrd78uW+kFrylJbsw7eOJD33v7cEGI5AWsrXsb/iSmUbiMETv0on6S5\n\tBExDJi5JAA9BwubaUE8xnPgyi5wYv91t8wdJHoWjPJI6xjnLstbv7TU3jPfjV3cCALcf\n\tXfDw==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:date:from:to:cc:subject:message-id:references\n\t:mime-version:content-disposition:content-transfer-encoding\n\t:in-reply-to:user-agent;\n\tbh=XW81y+ruGlmJDnsB+YnIN/if8Up9Lt4cH6O5kt+2sms=;\n\tb=gpR9ad1Z7cKOewBCcNlSnIbxjg7+Gbtp/50mFDRb8rN3CTjS4j/nM8mbwTY1N9wns+\n\t0PqV8Wc5BC5JVRDN5iz50EDm6mHLOFQjaFA+v7bmdi/irn8X+l7VDR+Y4p9s7q89DEQs\n\tRl76JbTm9CcM1COHY9EkunkGQ83VoWiFqpH4FbcZCnfmbiJd8H0KYnz05IIgyv1CZRjr\n\tl47qrjFM9ggrM4tz1ZlgEf3+lQTG2y0wMX37gOOGMQSD80XtrEfDMFyvgR3sh9f4kSnE\n\tUHvZflErtwdFNMbXLvzeqkypBtzb62W1BiwcnnvysjZyyVCXGb8DgeVQo1N49dhS0Lg+\n\tekuQ==","X-Gm-Message-State":"APjAAAXPtRsKGCxxs/UDLWlWwfn424sKZU87Y/iErouEPPdABtQ630Aa\n\tu7ZaPe3MoYg4TtqBLfofJHzFOqxozaA=","X-Google-Smtp-Source":"APXvYqyw1knSNozI+ZLFokJ/TtFOQmWyBZSCcw7OK71uayXPqnCMihc94Y0VU7SU6eAcU87BRu2c7g==","X-Received":"by 2002:a2e:3311:: with SMTP id\n\td17mr6612010ljc.237.1574328838872; \n\tThu, 21 Nov 2019 01:33:58 -0800 (PST)","Date":"Thu, 21 Nov 2019 10:33:57 +0100","From":"Niklas =?iso-8859-1?q?S=F6derlund?= ","To":"Laurent Pinchart ","Cc":"libcamera-devel@lists.libcamera.org","Message-ID":"<20191121090206.GA14949@bigcity.dyn.berto.se>","References":"<20191121041913.16202-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=iso-8859-1","Content-Disposition":"inline","Content-Transfer-Encoding":"8bit","In-Reply-To":"<20191121041913.16202-1-laurent.pinchart@ideasonboard.com>","User-Agent":"Mutt/1.12.1 (2019-06-15)","Subject":"Re: [libcamera-devel] [PATCH] meson: Really define _FORTIFY_SOURCE\n\tfor optimised builds","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":"Thu, 21 Nov 2019 09:33:59 -0000"}},{"id":3129,"web_url":"https://patchwork.libcamera.org/comment/3129/","msgid":"<7ed7f94f-3b9e-a641-ae7e-f412fe4fcb66@ideasonboard.com>","date":"2019-11-21T09:36:27","subject":"Re: [libcamera-devel] [PATCH] meson: Really define _FORTIFY_SOURCE\n\tfor optimised builds","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Laurent,\n\nOn 21/11/2019 09:33, Laurent Pinchart wrote:\n> Hi Kieran,\n> \n> On Thu, Nov 21, 2019 at 09:17:50AM +0000, Kieran Bingham wrote:\n>> On 21/11/2019 04:19, Laurent Pinchart wrote:\n>>> Commit 965c5bf7fbf5 (\"meson: Define _FORTIFY_SOURCE for optimised\n>>> builds\") tried to define _FORTIFY_SOURCE for optimised builds with\n>>> clang, but updated the common_arguments after it was used. This resulted\n>>> in the _FORTIFY_SOURCE option not being applied. Fix it.\n>>>\n>>> Fixes: 965c5bf7fbf5 (\"meson: Define _FORTIFY_SOURCE for optimised builds\")\n>>> Signed-off-by: Laurent Pinchart \n>>> ---\n>>> meson.build | 7 +++++--\n>>> 1 file changed, 5 insertions(+), 2 deletions(-)\n>>>\n>>> diff --git a/meson.build b/meson.build\n>>> index 72ad7c8b493b..0a222ba96dcb 100644\n>>> --- a/meson.build\n>>> +++ b/meson.build\n>>> @@ -35,8 +35,8 @@ common_arguments = [\n>>> '-include', 'config.h',\n>>> ]\n>>> \n>>> -c_arguments = common_arguments\n>>> -cpp_arguments = common_arguments\n>>> +c_arguments = []\n>>> +cpp_arguments = []\n>>\n>> c_arguments and cpp_arguments are not used until after the code block\n>> below. Do we really need to define them as empty arrays here?\n>>\n>> I /think/ we can just move the assignment to below?\n>> (where you do an addition instead)\n> \n> I could do that for cpp_arguments, but cpp_arguments is extended in the\n> if cc.get_id() == 'clang' block. I could assign it there, but then the\n> += might complain later. I'd rather keep an empty array at the beginning\n> and += everywhere to make it easily extensible and avoid future issues.\n\nDeclaring early is good.\n\nLooks like it can be pushed :D\n\n--\nKieran\n\n\n> \n>>> if cc.get_id() == 'clang'\n>>> # Turn _FORTIFY_SOURCE by default on optimised builds (as it requires -O1\n>>> @@ -56,6 +56,9 @@ if cc.get_id() == 'clang'\n>>> endif\n>>> endif\n>>> \n>>> +c_arguments += common_arguments\n>>> +cpp_arguments += common_arguments\n>>> +> add_project_arguments(c_arguments, language : 'c')\n>>\n>> Eeep - and that's so blindingly obvious when you look at 965c5bf7fbf5,\n>> as this line is clearly in the hunk. I'm sorry I missed it.\n>>\n>> (of course it's always easier to spot something that you know is there).\n>>\n>> With either the empty arrays declared above if that's necessary (or just\n>> preferred) or directly assigned lower down if it's appropriate:\n>>\n>> Reviewed-by: Kieran Bingham \n>>\n>>> add_project_arguments(cpp_arguments, language : 'cpp')\n>>> add_project_link_arguments(cpp_arguments, language : 'cpp')\n>>>\n>","headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 7ED0F6136E\n\tfor ;\n\tThu, 21 Nov 2019 10:36:30 +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 DF08EA2B;\n\tThu, 21 Nov 2019 10:36:29 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1574328990;\n\tbh=ck4qYh94QNiq+TE4Id4N4pOkKEYveJMA/L8BfTOCLXo=;\n\th=Reply-To:Subject:To:Cc:References:From:Date:In-Reply-To:From;\n\tb=hMPaxyM6P1hUGEVcT6tW3Azv1NoeiZCK7GoR9Bm8xu/HbaFYAWDjhDwz7ZTL46BB9\n\tioN6FoE+Lhmb8cKJNIBmPjkK5V2+mAsjVEVjymXzBQuqCYfe7kuwm0mIJOackmc4c8\n\tYnSDXwlOnFKH69BIjyCM6SCflz03zKN7/+j28ius=","Reply-To":"kieran.bingham@ideasonboard.com","To":"Laurent Pinchart ","Cc":"libcamera-devel@lists.libcamera.org","References":"<20191121041913.16202-1-laurent.pinchart@ideasonboard.com>\n\t<7b6fd55d-8651-10aa-ecdf-68826f379f84@ideasonboard.com>\n\t<20191121093300.GL4958@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":"<7ed7f94f-3b9e-a641-ae7e-f412fe4fcb66@ideasonboard.com>","Date":"Thu, 21 Nov 2019 09:36:27 +0000","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101\n\tThunderbird/60.9.0","MIME-Version":"1.0","In-Reply-To":"<20191121093300.GL4958@pendragon.ideasonboard.com>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-GB","Content-Transfer-Encoding":"7bit","Subject":"Re: [libcamera-devel] [PATCH] meson: Really define _FORTIFY_SOURCE\n\tfor optimised builds","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":"Thu, 21 Nov 2019 09:36:30 -0000"}}]