Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1rlSWm-002YGm-Sv for pgsql-hackers@arkaria.postgresql.org; Sat, 16 Mar 2024 11:48:42 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.94.2) (envelope-from ) id 1rlSWj-00FSfW-TC for pgsql-hackers@arkaria.postgresql.org; Sat, 16 Mar 2024 11:48:38 +0000 Received: from magus.postgresql.org ([2a02:c0:301:0:ffff::29]) by malur.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1rlSWj-00FSfN-5r for pgsql-hackers@lists.postgresql.org; Sat, 16 Mar 2024 11:48:38 +0000 Received: from dd25110.kasserver.com ([85.13.146.49]) by magus.postgresql.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1rlSWg-004qT1-O1 for pgsql-hackers@lists.postgresql.org; Sat, 16 Mar 2024 11:48:37 +0000 Received: from [192.168.0.101] (ip-037-201-153-175.um10.pools.vodafone-ip.de [37.201.153.175]) by dd25110.kasserver.com (Postfix) with ESMTPSA id 92F78E1A0175 for ; Sat, 16 Mar 2024 12:48:32 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=technowledgy.de; s=kas202308201259; t=1710589712; bh=VxcFWPfogUxBX1VyiatRn1SVNtCGTfYxkBiH4VeayiI=; h=Date:From:Subject:To:From; b=uSaEU6ghX86wOUSWeLt+TKbGOcomYyPWkih75kIUDEG/+G7v1cp/+fA3zC4dgTxIs qvnWZG1TsKBYMQn3tYK5bBzbB+e7EwLtqaJhyEcCTfuy7IReLqhda6xQO6qO5ZWbJU 8qfPO8xCCmAJYeZ6xLE0FbPacCEDoJ4ZtG2S4y6OTVRpMaFDCUT0lQDFy+VgdP9Ydi Zy9xhvoBKrs+bGU/2IbdaxSKKabGjcUEmcPFkcwhvS2e7wUcFjxtZhvrJiL8TATT+A rQHMBRGFATPz0KLVm0wxCUEbC6lPdqrzzoVkc/FY/3QF5GXnzugAOOEi+eyNyxNUuW baU1QeSOac8qw== Content-Type: multipart/mixed; boundary="------------f08XwVg5QLChaKGeeQmGRlQz" Message-ID: Date: Sat, 16 Mar 2024 12:48:31 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US From: Wolfgang Walther Subject: Building with meson on NixOS/nixpkgs To: PostgreSQL Hackers X-Spamd-Bar: / List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Archived-At: Precedence: bulk This is a multi-part message in MIME format. --------------f08XwVg5QLChaKGeeQmGRlQz Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit To build on NixOS/nixpkgs I came up with a few small patches to meson.build. All of this works fine with Autoconf/Make already. --------------f08XwVg5QLChaKGeeQmGRlQz Content-Type: text/x-patch; charset=UTF-8; name="0001-Fallback-to-uuid-for-ossp-uuid-with-meson.patch" Content-Disposition: attachment; filename="0001-Fallback-to-uuid-for-ossp-uuid-with-meson.patch" Content-Transfer-Encoding: base64 RnJvbSAyNGFlNzJiOWIwYWRjNTc4YzY3MjllZmY1OWM5MDM4ZTZiNGFjNTE3IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBXb2xmZ2FuZyBXYWx0aGVyIDx3YWx0aGVyQHRlY2hu b3dsZWRneS5kZT4KRGF0ZTogU2F0LCAyIE1hciAyMDI0IDE3OjE4OjM4ICswMTAwClN1Ympl Y3Q6IFtQQVRDSCAxLzNdIEZhbGxiYWNrIHRvIHV1aWQgZm9yIG9zc3AtdXVpZCB3aXRoIG1l c29uCgpUaGUgdXBzdHJlYW0gbmFtZSBmb3IgdGhlIG9zc3AtdXVpZCBwYWNrYWdlIC8gcGtn LWNvbmZpZyBmaWxlIGlzICJ1dWlkIi4gTWFueQpkaXN0cmlidXRpb25zIGNoYW5nZSB0aGlz IHRvIGJlICJvc3NwLXV1aWQiIHRvIG5vdCBjb25mbGljdCB3aXRoIGUyZnNwcm9ncy4KClRo aXMgbG9va3VwIGZhaWxzIG9uIGRpc3RyaWJ1dGlvbnMgd2hpY2ggZG9uJ3QgY2hhbmdlIHRo aXMgbmFtZSwgZm9yIGV4YW1wbGUKTml4T1MgLyBuaXhwa2dzLiBCb3RoICJvc3NwLXV1aWQi IGFuZCAidXVpZCIgYXJlIGFsc28gY2hlY2tlZCBpbiBjb25maWd1cmUuYWMuCi0tLQogbWVz b24uYnVpbGQgfCAyICstCiAxIGZpbGUgY2hhbmdlZCwgMSBpbnNlcnRpb24oKyksIDEgZGVs ZXRpb24oLSkKCmRpZmYgLS1naXQgYS9tZXNvbi5idWlsZCBiL21lc29uLmJ1aWxkCmluZGV4 IGM4ZmRmZWIwZWMzLi5kOWFkMWNlOTAyZiAxMDA2NDQKLS0tIGEvbWVzb24uYnVpbGQKKysr IGIvbWVzb24uYnVpbGQKQEAgLTEzNDYsNyArMTM0Niw3IEBAIGlmIHV1aWRvcHQgIT0gJ25v bmUnCiAgICAgdXVpZGZ1bmMgPSAndXVpZF90b19zdHJpbmcnCiAgICAgdXVpZGhlYWRlciA9 ICd1dWlkLmgnCiAgIGVsaWYgdXVpZG9wdCA9PSAnb3NzcCcKLSAgICB1dWlkID0gZGVwZW5k ZW5jeSgnb3NzcC11dWlkJywgcmVxdWlyZWQ6IHRydWUpCisgICAgdXVpZCA9IGRlcGVuZGVu Y3koJ29zc3AtdXVpZCcsICd1dWlkJywgcmVxdWlyZWQ6IHRydWUpCiAgICAgdXVpZGZ1bmMg PSAndXVpZF9leHBvcnQnCiAgICAgdXVpZGhlYWRlciA9ICd1dWlkLmgnCiAgIGVsc2UKLS0g CjIuNDQuMAoK --------------f08XwVg5QLChaKGeeQmGRlQz Content-Type: text/x-patch; charset=UTF-8; name="0002-Fallback-to-clang-in-PATH-with-meson.patch" Content-Disposition: attachment; filename="0002-Fallback-to-clang-in-PATH-with-meson.patch" Content-Transfer-Encoding: base64 RnJvbSA1NmUwYWJiY2MzYjk1MGI2ZTkzZWRkYzZlZGU0NTNjZTUyOTQyM2VhIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBXb2xmZ2FuZyBXYWx0aGVyIDx3YWx0aGVyQHRlY2hu b3dsZWRneS5kZT4KRGF0ZTogU2F0LCAyIE1hciAyMDI0IDIyOjA2OjI1ICswMTAwClN1Ympl Y3Q6IFtQQVRDSCAyLzNdIEZhbGxiYWNrIHRvIGNsYW5nIGluIFBBVEggd2l0aCBtZXNvbgoK U29tZSBkaXN0cmlidXRpb25zIHB1dCBjbGFuZyBpbnRvIGEgZGlmZmVyZW50IHBhdGggdGhh biB0aGUgbGx2bSBiaW5hcnkgcGF0aC4KCkZvciBleGFtcGxlLCB0aGlzIGlzIHRoZSBjYXNl IG9uIE5peE9TIC8gbml4cGtncywgd2hpY2ggZmFpbGVkIHRvIGZpbmQgY2xhbmcKd2l0aCBt ZXNvbiBiZWZvcmUgdGhpcyBwYXRjaC4KLS0tCiBtZXNvbi5idWlsZCB8IDIgKy0KIDEgZmls ZSBjaGFuZ2VkLCAxIGluc2VydGlvbigrKSwgMSBkZWxldGlvbigtKQoKZGlmZiAtLWdpdCBh L21lc29uLmJ1aWxkIGIvbWVzb24uYnVpbGQKaW5kZXggZDlhZDFjZTkwMmYuLjdjNjRmYjA0 ZWE1IDEwMDY0NAotLS0gYS9tZXNvbi5idWlsZAorKysgYi9tZXNvbi5idWlsZApAQCAtNzU5 LDcgKzc1OSw3IEBAIGlmIGFkZF9sYW5ndWFnZXMoJ2NwcCcsIHJlcXVpcmVkOiBsbHZtb3B0 LCBuYXRpdmU6IGZhbHNlKQogICAgIGxsdm1fYmlucGF0aCA9IGxsdm0uZ2V0X3ZhcmlhYmxl KGNvbmZpZ3Rvb2w6ICdiaW5kaXInKQogCiAgICAgY2NhY2hlID0gZmluZF9wcm9ncmFtKCdj Y2FjaGUnLCBuYXRpdmU6IHRydWUsIHJlcXVpcmVkOiBmYWxzZSkKLSAgICBjbGFuZyA9IGZp bmRfcHJvZ3JhbShsbHZtX2JpbnBhdGggLyAnY2xhbmcnLCByZXF1aXJlZDogdHJ1ZSkKKyAg ICBjbGFuZyA9IGZpbmRfcHJvZ3JhbShsbHZtX2JpbnBhdGggLyAnY2xhbmcnLCAnY2xhbmcn LCByZXF1aXJlZDogdHJ1ZSkKICAgZW5kaWYKIGVsaWYgbGx2bW9wdC5hdXRvKCkKICAgbWVz c2FnZSgnbGx2bSByZXF1aXJlcyBhIEMrKyBjb21waWxlcicpCi0tIAoyLjQ0LjAKCg== --------------f08XwVg5QLChaKGeeQmGRlQz Content-Type: text/x-patch; charset=UTF-8; name="0003-Support-absolute-bindir-libdir-in-regression-tests-w.patch" Content-Disposition: attachment; filename*0="0003-Support-absolute-bindir-libdir-in-regression-tests-w.pa"; filename*1="tch" Content-Transfer-Encoding: base64 RnJvbSA2MmYxMDY4OWQ4NDMyMjdmY2E2ZDU0ZTg2NDYyZDBiZTVjNGY0MzRmIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBXb2xmZ2FuZyBXYWx0aGVyIDx3YWx0aGVyQHRlY2hu b3dsZWRneS5kZT4KRGF0ZTogTW9uLCAxMSBNYXIgMjAyNCAxOTo1NDo0MSArMDEwMApTdWJq ZWN0OiBbUEFUQ0ggMy8zXSBTdXBwb3J0IGFic29sdXRlIGJpbmRpci9saWJkaXIgaW4gcmVn cmVzc2lvbiB0ZXN0cyB3aXRoCiBtZXNvbgoKUGFzc2luZyBhbiBhYnNvbHV0ZSBiaW5kaXIv bGliZGlyIHdpbGwgaW5zdGFsbCB0aGUgYmluYXJpZXMgYW5kIGxpYnJhcmllcyB0bwo8YnVp bGQ+L3RtcF9pbnN0YWxsLzxiaW5kaXI+IGFuZCA8YnVpbGQ+L3RtcF9pbnN0YWxsLzxsaWJk aXI+IHJlc3BlY3RpdmVseS4KClRoaXMgaXMgcGF0aCBpcyBjb3JyZWN0bHkgcGFzc2VkIHRv IHRoZSByZWdyZXNzaW9uIHRlc3Qgc3VpdGUgdmlhIGNvbmZpZ3VyZS9tYWtlLApidXQgbm90 IHZpYSBtZXNvbiwgeWV0LiBUaGlzIGlzIGJlY2F1c2UgdGhlICIvIiBvcGVyYXRvciBpbiB0 aGUgZm9sbG93aW5nIGV4cHJlc3Npb24KdGhyb3dzIGF3YXkgdGhlIHdob2xlIGxlZnQgc2lk ZSB3aGVuIHRoZSByaWdodCBzaWRlIGlzIGFuIGFic29sdXRlIHBhdGg6CgogIHRlc3RfaW5z dGFsbF9sb2NhdGlvbiAvIGdldF9vcHRpb24oJ2xpYmRpcicpCgpUaGlzIHdhcyBhbHJlYWR5 IGNvcnJlY3RseSBoYW5kbGVkIGZvciBkaXJfcHJlZml4LCB3aGljaCBpcyBsaWtlbHkgYWJz b2x1dGUgYXMgd2VsbC4KVGhpcyBwYXRjaCBoYW5kbGVzIGJvdGggYmluZGlyIGFuZCBsaWJk aXIgaW4gdGhlIHNhbWUgd2F5IC0gcHJlZml4aW5nIGFic29sdXRlIHBhdGhzCndpdGggdGhl IHRtcF9pbnN0YWxsIHBhdGggY29ycmVjdGx5LgotLS0KIG1lc29uLmJ1aWxkIHwgMTEgKysr KysrLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA2IGluc2VydGlvbnMoKyksIDUgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvbWVzb24uYnVpbGQgYi9tZXNvbi5idWlsZAppbmRleCA3YzY0 ZmIwNGVhNS4uZTg0MzgyMDkwNTggMTAwNjQ0Ci0tLSBhL21lc29uLmJ1aWxkCisrKyBiL21l c29uLmJ1aWxkCkBAIC0zMDQ0LDE1ICszMDQ0LDE3IEBAIHRlc3RfaW5zdGFsbF9kZXN0ZGly ID0gbWVzb24uYnVpbGRfcm9vdCgpIC8gJ3RtcF9pbnN0YWxsLycKIGlmIGJ1aWxkX3N5c3Rl bSAhPSAnd2luZG93cycKICAgIyBPbiB1bml4b2lkIHN5c3RlbXMgdGhpcyBpcyB0cml2aWFs LCB3ZSBqdXN0IHByZXBlbmQgdGhlIGRlc3RkaXIKICAgYXNzZXJ0KGRpcl9wcmVmaXguc3Rh cnRzd2l0aCgnLycpKSAjIGVuZm9yY2VkIGJ5IG1lc29uCi0gIHRlc3RfaW5zdGFsbF9sb2Nh dGlvbiA9ICdAMEBAMUAnLmZvcm1hdCh0ZXN0X2luc3RhbGxfZGVzdGRpciwgZGlyX3ByZWZp eCkKKyAgdGVtcF9pbnN0YWxsX2JpbmRpciA9ICdAMEBAMUAnLmZvcm1hdCh0ZXN0X2luc3Rh bGxfZGVzdGRpciwgZGlyX3ByZWZpeCAvIGRpcl9iaW4pCisgIHRlbXBfaW5zdGFsbF9saWJk aXIgPSAnQDBAQDFAJy5mb3JtYXQodGVzdF9pbnN0YWxsX2Rlc3RkaXIsIGRpcl9wcmVmaXgg LyBkaXJfbGliKQogZWxzZQogICAjIGRyaXZlcywgZHJpdmUtcmVsYXRpdmUgcGF0aHMsIGV0 YyBtYWtlIHRoaXMgY29tcGxpY2F0ZWQgb24gd2luZG93cywgY2FsbAogICAjIGludG8gYSBj b3B5IG9mIG1lc29uJ3MgbG9naWMgZm9yIGl0CiAgIGNvbW1hbmQgPSBbCiAgICAgcHl0aG9u LCAnLWMnLAogICAgICdpbXBvcnQgc3lzOyBmcm9tIHBhdGhsaWIgaW1wb3J0IFB1cmVQYXRo OyBkMT1zeXMuYXJndlsxXTsgZDI9c3lzLmFyZ3ZbMl07IHByaW50KHN0cihQdXJlUGF0aChk MSwgKlB1cmVQYXRoKGQyKS5wYXJ0c1sxOl0pKSknLAotICAgIHRlc3RfaW5zdGFsbF9kZXN0 ZGlyLCBkaXJfcHJlZml4XQotICB0ZXN0X2luc3RhbGxfbG9jYXRpb24gPSBydW5fY29tbWFu ZChjb21tYW5kLCBjaGVjazogdHJ1ZSkuc3Rkb3V0KCkuc3RyaXAoKQorICAgIHRlc3RfaW5z dGFsbF9kZXN0ZGlyXQorICB0ZW1wX2luc3RhbGxfYmluZGlyID0gcnVuX2NvbW1hbmQoY29t bWFuZCwgZGlyX3ByZWZpeCAvIGRpcl9iaW4sIGNoZWNrOiB0cnVlKS5zdGRvdXQoKS5zdHJp cCgpCisgIHRlbXBfaW5zdGFsbF9saWJkaXIgPSBydW5fY29tbWFuZChjb21tYW5kLCBkaXJf cHJlZml4IC8gZGlyX2xpYiwgY2hlY2s6IHRydWUpLnN0ZG91dCgpLnN0cmlwKCkKIGVuZGlm CiAKIG1lc29uX2luc3RhbGxfYXJncyA9IG1lc29uX2FyZ3MgKyBbJ2luc3RhbGwnXSArIHsK QEAgLTMwODksNyArMzA5MSw2IEBAIHRlc3Rwb3J0ID0gNDAwMDAKIAogdGVzdF9lbnYgPSBl bnZpcm9ubWVudCgpCiAKLXRlbXBfaW5zdGFsbF9iaW5kaXIgPSB0ZXN0X2luc3RhbGxfbG9j YXRpb24gLyBnZXRfb3B0aW9uKCdiaW5kaXInKQogdGVzdF9pbml0ZGJfdGVtcGxhdGUgPSBt ZXNvbi5idWlsZF9yb290KCkgLyAndG1wX2luc3RhbGwnIC8gJ2luaXRkYi10ZW1wbGF0ZScK IHRlc3RfZW52LnNldCgnUEdfUkVHUkVTUycsIHBnX3JlZ3Jlc3MuZnVsbF9wYXRoKCkpCiB0 ZXN0X2Vudi5zZXQoJ1JFR1JFU1NfU0hMSUInLCByZWdyZXNzX21vZHVsZS5mdWxsX3BhdGgo KSkKQEAgLTMxMDQsNyArMzEwNSw3IEBAIHRlc3RfZW52LnNldCgnUEdfVEVTVF9FWFRSQScs IGdldF9vcHRpb24oJ1BHX1RFU1RfRVhUUkEnKSkKICMgdGhhdCB3b3JrcyAoZXZlcnl0aGlu ZyBidXQgd2luZG93cywgYmFzaWNhbGx5KS4gT24gd2luZG93cyBldmVyeXRoaW5nCiAjIGxp YnJhcnktbGlrZSBnZXRzIGluc3RhbGxlZCBpbnRvIGJpbmRpciwgc29sdmluZyB0aGF0IGlz c3VlLgogaWYgbGlicmFyeV9wYXRoX3ZhciAhPSAnJwotICB0ZXN0X2Vudi5wcmVwZW5kKGxp YnJhcnlfcGF0aF92YXIsIHRlc3RfaW5zdGFsbF9sb2NhdGlvbiAvIGdldF9vcHRpb24oJ2xp YmRpcicpKQorICB0ZXN0X2Vudi5wcmVwZW5kKGxpYnJhcnlfcGF0aF92YXIsIHRlbXBfaW5z dGFsbF9saWJkaXIpCiBlbmRpZgogCiAKLS0gCjIuNDQuMAoK --------------f08XwVg5QLChaKGeeQmGRlQz--