Feedback-ID: i131946ab:Fastmail
Content-Type: multipart/mixed; boundary="------------gQGs5hj5n6xUOxWY0gJuF62Z"
Message-ID: <a6a6de12-f705-2b33-2fd9-9743277deb08@enterprisedb.com>
Date: Wed, 4 Jan 2023 23:17:30 +0100
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0)
 Gecko/20100101 Thunderbird/102.6.0
Subject: Re: meson oddities
Content-Language: en-US
To: Andres Freund <andres@anarazel.de>
Cc: Tom Lane <tgl@sss.pgh.pa.us>, Andrew Dunstan <andrew@dunslane.net>,
 PostgreSQL Hackers <pgsql-hackers@lists.postgresql.org>
References: <cecbf387-6008-8596-1d9a-c1f96afc9416@dunslane.net>
 <20221115190425.uapepwpzmemyokqi@awork3.anarazel.de>
 <91b563cc-fa78-0011-5efc-ce61d277d64f@dunslane.net>
 <1197537.1668546515@sss.pgh.pa.us>
 <20221115234042.zkxyxzv5wgewit33@awork3.anarazel.de>
 <030d04cc-d4f3-cd28-5bcb-b2b5d00f0015@enterprisedb.com>
 <20221116164010.uxsrhsqiqhftvkfp@awork3.anarazel.de>
 <1360237.1668617650@sss.pgh.pa.us>
 <20221116170747.zpaijt6zz7lgkffd@awork3.anarazel.de>
 <8efbb197-c55a-0947-35ba-6b8403d9baff@enterprisedb.com>
 <20230104193502.ax5gmgt6yqznolvm@awork3.anarazel.de>
From: Peter Eisentraut <peter.eisentraut@enterprisedb.com>
In-Reply-To: <20230104193502.ax5gmgt6yqznolvm@awork3.anarazel.de>
Archived-At: <https://www.postgresql.org/message-id/a6a6de12-f705-2b33-2fd9-9743277deb08%40enterprisedb.com>
Precedence: bulk

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

On 04.01.23 20:35, Andres Freund wrote:
>> Unless someone comes up with a proposal to address the above broader issues,
>> also taking into account current packaging practices etc., then I think we
>> should do a short-term solution to either port the subdir-appending to the
>> meson scripts or remove it from the makefiles (or maybe a bit of both).
> Just to be clear, with 'subdir-appending' you mean libdir defaulting to
> 'lib/x86_64-linux-gnu' (or similar)? Or do you mean adding 'postgresql' into
> various dirs when the path doesn't already contain postgres?
> 
> I did try to mirror the 'postgresql' adding bit in the meson build.

I meant the latter, which I see is already in there, but it doesn't 
actually fully work.  It only looks at the subdirectory (like "lib"), 
not the whole path (like "/usr/local/pgsql/lib").  With the attached 
patch I have it working and I get the same installation layout from both 
build systems.
--------------gQGs5hj5n6xUOxWY0gJuF62Z
Content-Type: text/plain; charset=UTF-8;
 name="0001-meson-Fix-installation-path-computation.patch"
Content-Disposition: attachment;
 filename="0001-meson-Fix-installation-path-computation.patch"
Content-Transfer-Encoding: base64

RnJvbSA1Nzk0MTFiNWM0NDNjZTRjNmY0NWYzMDYyN2JiZjg5MWE1M2M4Zjc3IE1vbiBTZXAg
MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBQZXRlciBFaXNlbnRyYXV0IDxwZXRlckBlaXNlbnRy
YXV0Lm9yZz4KRGF0ZTogV2VkLCA0IEphbiAyMDIzIDIzOjE0OjEwICswMTAwClN1YmplY3Q6
IFtQQVRDSF0gbWVzb246IEZpeCBpbnN0YWxsYXRpb24gcGF0aCBjb21wdXRhdGlvbgoKLS0t
CiBtZXNvbi5idWlsZCB8IDggKysrKy0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA0IGluc2VydGlv
bnMoKyksIDQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvbWVzb24uYnVpbGQgYi9tZXNv
bi5idWlsZAppbmRleCA4OTk5MTcwYjRkLi42MzRkYzdkMTY3IDEwMDY0NAotLS0gYS9tZXNv
bi5idWlsZAorKysgYi9tZXNvbi5idWlsZApAQCAtNDY3LDE5ICs0NjcsMTkgQEAgZGlyX3By
ZWZpeCA9IGdldF9vcHRpb24oJ3ByZWZpeCcpCiBkaXJfYmluID0gZ2V0X29wdGlvbignYmlu
ZGlyJykKIAogZGlyX2RhdGEgPSBnZXRfb3B0aW9uKCdkYXRhZGlyJykKLWlmIG5vdCAoZGly
X2RhdGEuY29udGFpbnMoJ3Bnc3FsJykgb3IgZGlyX2RhdGEuY29udGFpbnMoJ3Bvc3RncmVz
JykpCitpZiBub3QgKChkaXJfcHJlZml4L2Rpcl9kYXRhKS5jb250YWlucygncGdzcWwnKSBv
ciAoZGlyX3ByZWZpeC9kaXJfZGF0YSkuY29udGFpbnMoJ3Bvc3RncmVzJykpCiAgIGRpcl9k
YXRhID0gZGlyX2RhdGEgLyBwa2cKIGVuZGlmCiAKIGRpcl9zeXNjb25mID0gZ2V0X29wdGlv
bignc3lzY29uZmRpcicpCi1pZiBub3QgKGRpcl9zeXNjb25mLmNvbnRhaW5zKCdwZ3NxbCcp
IG9yIGRpcl9zeXNjb25mLmNvbnRhaW5zKCdwb3N0Z3JlcycpKQoraWYgbm90ICgoZGlyX3By
ZWZpeC9kaXJfc3lzY29uZikuY29udGFpbnMoJ3Bnc3FsJykgb3IgKGRpcl9wcmVmaXgvZGly
X3N5c2NvbmYpLmNvbnRhaW5zKCdwb3N0Z3JlcycpKQogICBkaXJfc3lzY29uZiA9IGRpcl9z
eXNjb25mIC8gcGtnCiBlbmRpZgogCiBkaXJfbGliID0gZ2V0X29wdGlvbignbGliZGlyJykK
IAogZGlyX2xpYl9wa2cgPSBkaXJfbGliCi1pZiBub3QgKGRpcl9saWJfcGtnLmNvbnRhaW5z
KCdwZ3NxbCcpIG9yIGRpcl9saWJfcGtnLmNvbnRhaW5zKCdwb3N0Z3JlcycpKQoraWYgbm90
ICgoZGlyX3ByZWZpeC9kaXJfbGliX3BrZykuY29udGFpbnMoJ3Bnc3FsJykgb3IgKGRpcl9w
cmVmaXgvZGlyX2xpYl9wa2cpLmNvbnRhaW5zKCdwb3N0Z3JlcycpKQogICBkaXJfbGliX3Br
ZyA9IGRpcl9saWJfcGtnIC8gcGtnCiBlbmRpZgogCkBAIC00ODksNyArNDg5LDcgQEAgZGly
X2luY2x1ZGUgPSBnZXRfb3B0aW9uKCdpbmNsdWRlZGlyJykKIAogZGlyX2luY2x1ZGVfcGtn
ID0gZGlyX2luY2x1ZGUKIGRpcl9pbmNsdWRlX3BrZ19yZWwgPSAnJwotaWYgbm90IChkaXJf
aW5jbHVkZV9wa2cuY29udGFpbnMoJ3Bnc3FsJykgb3IgZGlyX2luY2x1ZGVfcGtnLmNvbnRh
aW5zKCdwb3N0Z3JlcycpKQoraWYgbm90ICgoZGlyX3ByZWZpeC9kaXJfaW5jbHVkZV9wa2cp
LmNvbnRhaW5zKCdwZ3NxbCcpIG9yIChkaXJfcHJlZml4L2Rpcl9pbmNsdWRlX3BrZykuY29u
dGFpbnMoJ3Bvc3RncmVzJykpCiAgIGRpcl9pbmNsdWRlX3BrZyA9IGRpcl9pbmNsdWRlX3Br
ZyAvIHBrZwogICBkaXJfaW5jbHVkZV9wa2dfcmVsID0gcGtnCiBlbmRpZgotLSAKMi4zOS4w
Cgo=

--------------gQGs5hj5n6xUOxWY0gJuF62Z--