Feedback-ID: ie0a040ee:Fastmail
Content-Type: multipart/mixed; boundary="------------I39OT0b332mNyH8GSUBziOau"
Message-ID: <8ade4a93-26d2-4995-94c9-ee3f8f794a24@eisentraut.org>
Date: Wed, 18 Mar 2026 12:59:51 +0100
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH] Add `headerscheck` run_target to meson
From: Peter Eisentraut <peter@eisentraut.org>
To: Bilal Yavuz <byavuz81@gmail.com>,
 =?UTF-8?Q?Mi=C5=82osz_Bieniek?= <bieniek.milosz0@gmail.com>
Cc: pgsql-hackers@lists.postgresql.org
References: 
 <CAMSWrt-PoQt4sHryWrB1ViuGBJF_PpbjoSGrWR2Ry47bHNLDqg@mail.gmail.com>
 <fd9864f9-30bf-450b-a025-5e1bba58591a@eisentraut.org>
 <CAMSWrt-A0ha0qANftNYGpa8vEbtiD_7iV+0mdP0g9V8va=K0YA@mail.gmail.com>
 <CAN55FZ1OkRkQMT==EtTWesKBFdBG28WrzhYsex3UG67F7bAQ8A@mail.gmail.com>
 <CAN55FZ2fc++9-G=Mc4D2rNV2wQdbFn6EWszMno18vQTdqnKpJw@mail.gmail.com>
 <CAMSWrt-2riJci+iGvt=Dggb4eh=2HgP3hy6+K=rZSeW=XFczAw@mail.gmail.com>
 <CAN55FZ2vFfRJ5Ewj44oo27J=qY=E9+3d8S_rcMbuGJP-Rm7yPQ@mail.gmail.com>
 <49c98509-e415-49cb-8842-475994661e04@eisentraut.org>
Content-Language: de-DE, en-US
In-Reply-To: <49c98509-e415-49cb-8842-475994661e04@eisentraut.org>
Archived-At: 
 <https://www.postgresql.org/message-id/8ade4a93-26d2-4995-94c9-ee3f8f794a24%40eisentraut.org>
Precedence: bulk

This is a multi-part message in MIME format.
--------------I39OT0b332mNyH8GSUBziOau
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit

On 18.03.26 11:56, Peter Eisentraut wrote:
> On 04.12.25 08:09, Bilal Yavuz wrote:
>> 0001 adds python_includespec and perl_includespec variables to the
>> Makefile.global of the meson build.
> 
> Committed that, with some light cosmetic ordering changes.
> 
>> 0002 adds headerscheck target to meson build like you do but with 2
>> extra changes. First one is that, I moved the headerscheck script to a
>> variable and used it in the target commands. Second one is that,
>> headerscheck script could not find the perl_includespec and
>> python_includespec variables because of the tabs in the sed command, I
>> changed them with '[:space:]' and it worked. I am not sure if that is
>> the correct fix but I just wanted to see if the script will work.
> 
> Committed that, but without the regular expression changes.  I don't 
> understand why those would be needed.  Please provide more information 
> if necessary.  It worked for me without it.

I need another tweak for the cpluspluscheck.

In meson, the distribution of the include flags between CPPFLAGS, 
CFLAGS, and CXXFLAGS ends up being a bit different, and we need to get a 
few -I options from CXXFLAGS in my case.

I have attached two different variants for how to do this.  The first 
one just gets the -D and -I flags from CXXFLAGS.  This preserves most of 
the existing behavior.  The second aligns more with how CFLAGS works and 
removes the ability to override CXXFLAGS from the command line.  This is 
probably now better since we have more support for getting correct CXX 
and CXXFLAGS in the build system.  But it might be a change for some users.

Thoughts?

--------------I39OT0b332mNyH8GSUBziOau
Content-Type: text/plain; charset=UTF-8;
 name="0001-headerscheck-Get-CXXFLAGS-variant-1.patch"
Content-Disposition: attachment;
 filename="0001-headerscheck-Get-CXXFLAGS-variant-1.patch"
Content-Transfer-Encoding: base64

RnJvbSBlYzFkYTgyNjU5MDhiNmQ2NzYxOTczZmRhNTRhYTAwMDhkZDAzM2M1IE1vbiBTZXAg
MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBQZXRlciBFaXNlbnRyYXV0IDxwZXRlckBlaXNlbnRy
YXV0Lm9yZz4KRGF0ZTogV2VkLCAxOCBNYXIgMjAyNiAxMjo1ODo0NyArMDEwMApTdWJqZWN0
OiBbUEFUQ0hdIGhlYWRlcnNjaGVjazogR2V0IENYWEZMQUdTICh2YXJpYW50IDEpCgotLS0K
IHNyYy90b29scy9wZ2luY2x1ZGUvaGVhZGVyc2NoZWNrIHwgNSArKystLQogMSBmaWxlIGNo
YW5nZWQsIDMgaW5zZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9z
cmMvdG9vbHMvcGdpbmNsdWRlL2hlYWRlcnNjaGVjayBiL3NyYy90b29scy9wZ2luY2x1ZGUv
aGVhZGVyc2NoZWNrCmluZGV4IDNkM2UzNzFhOGUxLi40YTY2YTE5NGI0NiAxMDA3NTUKLS0t
IGEvc3JjL3Rvb2xzL3BnaW5jbHVkZS9oZWFkZXJzY2hlY2sKKysrIGIvc3JjL3Rvb2xzL3Bn
aW5jbHVkZS9oZWFkZXJzY2hlY2sKQEAgLTQ0LDYgKzQ0LDcgQEAgQ1hYRkxBR1M9JHtDWFhG
TEFHUzotIC1mc3ludGF4LW9ubHkgLVdhbGx9CiBNR0xPQj0iJGJ1aWxkZGlyL3NyYy9NYWtl
ZmlsZS5nbG9iYWwiCiBDUFBGTEFHUz1gc2VkIC1uICdzL15DUFBGTEFHU1sgCV0qPVsgCV0q
Ly9wJyAiJE1HTE9CImAKIENGTEFHUz1gc2VkIC1uICdzL15DRkxBR1NbIAldKj1bIAldKi8v
cCcgIiRNR0xPQiJgCitfQ1hYRkxBR1M9YHNlZCAtbiAncy9eQ1hYRkxBR1NbIAldKj1bIAld
Ki8vcCcgIiRNR0xPQiJgCiBJQ1VfQ0ZMQUdTPWBzZWQgLW4gJ3MvXklDVV9DRkxBR1NbIAld
Kj1bIAldKi8vcCcgIiRNR0xPQiJgCiBMTFZNX0NQUEZMQUdTPWBzZWQgLW4gJ3MvXkxMVk1f
Q1BQRkxBR1NbIAldKj1bIAldKi8vcCcgIiRNR0xPQiJgCiBDQz1gc2VkIC1uICdzL15DQ1sg
CV0qPVsgCV0qLy9wJyAiJE1HTE9CImAKQEAgLTYwLDggKzYxLDggQEAgQ1BQRkxBR1M9YGVj
aG8gIiRDUFBGTEFHUyIgfCBzZWQgInN8XFxcJChQR19TWVNST09UKXwkUEdfU1lTUk9PVHxn
ImAKIGlmICRjcGx1c3BsdXM7IHRoZW4KIAlleHQ9Y3BwCiAJQ09NUElMRVI9JHtDWFg6LWcr
K30KLQkjIEV4dHJhY3QgYW55IC1JIGFuZCAtRCBzd2l0Y2hlcyBmcm9tIENQUEZMQUdTLgot
CWZvciBmbGFnIGluICRDUFBGTEFHUzsgZG8KKwkjIEV4dHJhY3QgYW55IC1JIGFuZCAtRCBz
d2l0Y2hlcyBmcm9tIENQUEZMQUdTIGFuZCBDWFhGTEFHUyBmcm9tIE1ha2VmaWxlLmdsb2Jh
bC4KKwlmb3IgZmxhZyBpbiAkQ1BQRkxBR1MgJF9DWFhGTEFHUzsgZG8KIAkgIGNhc2UgJGZs
YWcgaW4KIAkgICAgLUkqfC1EKikgQ1hYUFBGTEFHUz0iJENYWFBQRkxBR1MgJGZsYWciOzsK
IAkgIGVzYWMKLS0gCjIuNTMuMAoK
--------------I39OT0b332mNyH8GSUBziOau
Content-Type: text/plain; charset=UTF-8;
 name="0001-headerscheck-Get-CXXFLAGS-variant-2.patch"
Content-Disposition: attachment;
 filename="0001-headerscheck-Get-CXXFLAGS-variant-2.patch"
Content-Transfer-Encoding: base64

RnJvbSA2NGE0ZDI2ZWFhZmY2NTA5ZmJiM2ZlYTBmYjdlMDk5Nzc0MWFjZWMxIE1vbiBTZXAg
MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBQZXRlciBFaXNlbnRyYXV0IDxwZXRlckBlaXNlbnRy
YXV0Lm9yZz4KRGF0ZTogV2VkLCAxOCBNYXIgMjAyNiAxMjo1ODo1OSArMDEwMApTdWJqZWN0
OiBbUEFUQ0hdIGhlYWRlcnNjaGVjazogR2V0IENYWEZMQUdTICh2YXJpYW50IDIpCgotLS0K
IHNyYy90b29scy9wZ2luY2x1ZGUvaGVhZGVyc2NoZWNrIHwgNCArLS0tCiAxIGZpbGUgY2hh
bmdlZCwgMSBpbnNlcnRpb24oKyksIDMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvc3Jj
L3Rvb2xzL3BnaW5jbHVkZS9oZWFkZXJzY2hlY2sgYi9zcmMvdG9vbHMvcGdpbmNsdWRlL2hl
YWRlcnNjaGVjawppbmRleCAzZDNlMzcxYThlMS4uNzI1MDNjMGNkODkgMTAwNzU1Ci0tLSBh
L3NyYy90b29scy9wZ2luY2x1ZGUvaGVhZGVyc2NoZWNrCisrKyBiL3NyYy90b29scy9wZ2lu
Y2x1ZGUvaGVhZGVyc2NoZWNrCkBAIC0zNywxMyArMzcsMTEgQEAgZmkKIAogbWU9YGJhc2Vu
YW1lICQwYAogCi0jIFRoZXNlIHN3aXRjaGVzIGFyZSBnKysgc3BlY2lmaWMsIHlvdSBtYXkg
b3ZlcnJpZGUgaWYgbmVjZXNzYXJ5LgotQ1hYRkxBR1M9JHtDWFhGTEFHUzotIC1mc3ludGF4
LW9ubHkgLVdhbGx9Ci0KICMgUHVsbCBzb21lIGluZm8gZnJvbSBjb25maWd1cmUncyByZXN1
bHRzLgogTUdMT0I9IiRidWlsZGRpci9zcmMvTWFrZWZpbGUuZ2xvYmFsIgogQ1BQRkxBR1M9
YHNlZCAtbiAncy9eQ1BQRkxBR1NbIAldKj1bIAldKi8vcCcgIiRNR0xPQiJgCiBDRkxBR1M9
YHNlZCAtbiAncy9eQ0ZMQUdTWyAJXSo9WyAJXSovL3AnICIkTUdMT0IiYAorQ1hYRkxBR1M9
YHNlZCAtbiAncy9eQ1hYRkxBR1NbIAldKj1bIAldKi8vcCcgIiRNR0xPQiJgCiBJQ1VfQ0ZM
QUdTPWBzZWQgLW4gJ3MvXklDVV9DRkxBR1NbIAldKj1bIAldKi8vcCcgIiRNR0xPQiJgCiBM
TFZNX0NQUEZMQUdTPWBzZWQgLW4gJ3MvXkxMVk1fQ1BQRkxBR1NbIAldKj1bIAldKi8vcCcg
IiRNR0xPQiJgCiBDQz1gc2VkIC1uICdzL15DQ1sgCV0qPVsgCV0qLy9wJyAiJE1HTE9CImAK
LS0gCjIuNTMuMAoK

--------------I39OT0b332mNyH8GSUBziOau--