Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oOJRM-0002Fi-Jq for pgsql-hackers@arkaria.postgresql.org; Wed, 17 Aug 2022 13:50:37 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.92) (envelope-from ) id 1oOJRL-0003DZ-Gk for pgsql-hackers@arkaria.postgresql.org; Wed, 17 Aug 2022 13:50:35 +0000 Received: from makus.postgresql.org ([2001:4800:3e1:1::229]) by malur.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oOJRK-0003DQ-Ch for pgsql-hackers@lists.postgresql.org; Wed, 17 Aug 2022 13:50:35 +0000 Received: from wout2-smtp.messagingengine.com ([64.147.123.25]) by makus.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oOJRG-0004gP-2e for pgsql-hackers@postgresql.org; Wed, 17 Aug 2022 13:50:33 +0000 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.west.internal (Postfix) with ESMTP id EFE1C3200935; Wed, 17 Aug 2022 09:50:26 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Wed, 17 Aug 2022 09:50:27 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:date:feedback-id :feedback-id:from:from:in-reply-to:in-reply-to:message-id :mime-version:references:reply-to:sender:subject:subject:to:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; t=1660744226; x=1660830626; bh=yjBHyVuA4+/+PLgfKYAFmiOgN0ky h26jAZS2NvFe+us=; b=nRW00fJfY6/IFfbkpt0xcamjT+4TDvj40np27bSxoIC4 KHRQS/DDrx4tXZ2YDbx4o8I0UPn5iawN1vJeL1oIBylh5TixIylhC/VGX8YgKZaL 1ze0e+UxluZZgdr9nK4zg9rNhSyG1AXLl8W/P3LTEBGq0Sfa2NVJrAVZt3Q/NFR8 taL2xn9Ld+80VJNous4iVDSsC/ALg03/rGfuvDAacgrqjfyvDjMuIkFcMEmp2mDq ZznM1GtmVb+U2pMGsvTOohAK3eZASiFPDC8XRrtGtzIaWWuVwmrlbkTrwuxv7qc4 wmaLZSAhp5Nn39tt46E9rosS4wppTXBDIwV0tw48cA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvfedrvdehiedgieelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurheptgfkffggfgfuvfhfhfgjsehmtderredtfeejnecuhfhrohhmpefrvghtvghr ucfgihhsvghnthhrrghuthcuoehpvghtvghrrdgvihhsvghnthhrrghuthesvghnthgvrh hprhhishgvuggsrdgtohhmqeenucggtffrrghtthgvrhhnpefhveektddvgeelvdduteek ueejteeuueeikeejjeekgfdvhffhgeejfeffteffjeenucffohhmrghinhepgigtohguvg drrghpphenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhm pehpvghtvghrrdgvihhsvghnthhrrghuthesvghnthgvrhhprhhishgvuggsrdgtohhm X-ME-Proxy: Feedback-ID: i131946ab:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 17 Aug 2022 09:50:25 -0400 (EDT) Content-Type: multipart/mixed; boundary="------------y710EczIDC5WyXhRrAkVC0T4" Message-ID: Date: Wed, 17 Aug 2022 15:50:23 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:91.0) Gecko/20100101 Thunderbird/91.12.0 Subject: Re: [RFC] building postgres with meson - v11 Content-Language: en-US To: Andres Freund , pgsql-hackers@postgresql.org, samay sharma , Nazir Bilal Yavuz , Andrew Dunstan References: <20211012083721.hvixq4pnh2pixr3j@alap3.anarazel.de> <20220811002012.ju3rrz47i2e5tdha@awork3.anarazel.de> From: Peter Eisentraut In-Reply-To: <20220811002012.ju3rrz47i2e5tdha@awork3.anarazel.de> 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. --------------y710EczIDC5WyXhRrAkVC0T4 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 11.08.22 02:20, Andres Freund wrote: > Attached is a new version of the meson patchset. Plenty changes: I have various bits of comments on this. - There are various references to "pch" (pre-compiled headers). Is there more discussion anywhere about this? I don't know what this would entail or whether there are any drawbacks to be aware of. The new *_pch.h files don't have any comments. Maybe this should be a separate patch later. - About relativize_shared_library_references: We have had several patches over the years for working around SIP stuff, and some of them did essentially this, but we decided not to go ahead with them. We could revisit that, but it should be a separate patch, not mixed in with this. - postgresql-extension.pc: Similarly, this ought to be a separate patch. If we want people to use this, we'll need it in the makefile build system anyway. - -DFRONTEND is used somewhat differently from the makefiles. For example, meson sets -DFRONTEND for pg_controldata, but the makefiles don't. Conversely, the makefiles set -DFRONTEND for ecpglib, but meson does not. This should be checked again to make sure it all matches up. - Option name spelling should be make consistent about underscores versus hyphens. Built-in meson options use underscores, so we should make the user-defined ones like that as well (some already do). (wal-blocksize krb-srvnam system-tzdata tap-tests bsd-auth) - I have found the variable name "cdata" for configuration_data() to be less than clear. I see some GNOME projects to it that way, is that where it's from? systemd uses "conf", maybe that's better. - In the top-level meson.build, the "renaming" of the Windows system name host_system = host_machine.system() == 'windows' ? 'win32' : host_machine.system() build_system = build_machine.system() == 'windows' ? 'win32' : build_machine.system() seems unnecessary to me. Why not stick with the provided names? - The c99_test ought to be not needed if the c_std project option is used. Was there a problem with that? - Is there a way to split up the top-level meson.build somehow? Maybe just throw some stuff into included files? This might get out of hand at some point. - The PG_SYSROOT detection gives different results. On my system, configure produces /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX12.3.sdk, meson produces /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk. src/template/darwin goes out of its way to get a version-specific result, so we need to carry that over somehow. (The difference does result in differences in the built binaries.) Then, some patches from me: 0001-Change-shared-library-installation-naming-on-macOS.patch This changes the makefiles to make the shared library file naming on macOS match what meson produces. I don't know what the situation is on other platforms. 0002-meson-Fix-installation-name-of-libpgfeutils.patch This was presumably an accidental mistake. 0003-meson-Libraries-need-to-be-built-with-DSO_MAJOR_VERS.patch This is needed to make NLS work for the libraries. 0004-meson-Add-darwin_versions-argument-for-libraries.patch This is to make the output match what Makefile.shlib produces. 0005-meson-Fix-link-order-of-support-libraries.patch 0006-meson-Make-link-order-of-external-libraries-match-ma.patch 0007-WIP-meson-Make-link-order-of-object-files-match-make.patch I have analyzed the produced binaries between both build systems to make sure they match. If we link the files and libraries in different orders, that becomes difficult. So this fixes this up a bit. 0005 is needed for correctness in general, I think. 0006 is mostly cosmetic. You probably wanted to make the library order alphabetical in the meson files, which I'd support, but then we should change the makefiles to match. Similarly, 0007, which is clearly a bit messy at the moment, but we should try to sort that out either in the old or the new build files. And finally some comments on your patches: meson: prereq: Don't add HAVE_LDAP_H HAVE_WINLDAP_H to pg_config.h. This can go ahead. meson: prereq: fix warning compat_informix/rnull.pgc with msvc - $float f = 3.71; + $float f = (float) 3.71; This could use float literals like + $float f = 3.71f; --------------y710EczIDC5WyXhRrAkVC0T4 Content-Type: text/plain; charset=UTF-8; name="0001-Change-shared-library-installation-naming-on-macOS.patch" Content-Disposition: attachment; filename*0="0001-Change-shared-library-installation-naming-on-macOS.patc"; filename*1="h" Content-Transfer-Encoding: base64 RnJvbSAwNTRiMjRlOWFlNWZjODU5ZjEzYzA1ZDgxNTBlZjExNjhhNDc3Y2U0IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBQZXRlciBFaXNlbnRyYXV0IDxwZXRlckBlaXNlbnRy YXV0Lm9yZz4KRGF0ZTogV2VkLCAxNyBBdWcgMjAyMiAxNDoxODo1MiArMDIwMApTdWJqZWN0 OiBbUEFUQ0ggMS83XSBDaGFuZ2Ugc2hhcmVkIGxpYnJhcnkgaW5zdGFsbGF0aW9uIG5hbWlu ZyBvbiBtYWNPUwoKSXQgaXMgbm90IGN1c3RvbWFyeSB0byBpbnN0YWxsIGEgc2hhcmVkIGxp YnJhcnkgd2l0aCBhIG1pbm9yIHZlcnNpb24KbnVtYmVyIChsaWJwcS41LjE2LmR5bGliKSBv biBtYWNPUy4gIFdlIGp1c3QgbmVlZCB0aGUgZmlsZSB3aXRoIHRoZQptYWpvciB2ZXJzaW9u IG51bWJlciAobGlicHEuNS5keWxpYikgYW5kIHRoZSBvbmUgd2l0aG91dCB2ZXJzaW9uCm51 bWJlciAobGlicHEuZHlsaWIpLiAgVGhpcyBhbHNvIG1hdGNoZXMgdGhlIGluc3RhbGxhdGlv biBsYXlvdXQgdXNlZApieSBNZXNvbi4KLS0tCiBzcmMvTWFrZWZpbGUuc2hsaWIgfCAyICst CiAxIGZpbGUgY2hhbmdlZCwgMSBpbnNlcnRpb24oKyksIDEgZGVsZXRpb24oLSkKCmRpZmYg LS1naXQgYS9zcmMvTWFrZWZpbGUuc2hsaWIgYi9zcmMvTWFrZWZpbGUuc2hsaWIKaW5kZXgg MmFmNjE5MmYwZi4uZTQ2NTgzMjBmOCAxMDA2NDQKLS0tIGEvc3JjL01ha2VmaWxlLnNobGli CisrKyBiL3NyYy9NYWtlZmlsZS5zaGxpYgpAQCAtMTIyLDcgKzEyMiw3IEBAIGlmZXEgKCQo UE9SVE5BTUUpLCBkYXJ3aW4pCiAgICAgICB2ZXJzaW9uX2xpbmsJPSAtY29tcGF0aWJpbGl0 eV92ZXJzaW9uICQoU09fTUFKT1JfVkVSU0lPTikgLWN1cnJlbnRfdmVyc2lvbiAkKFNPX01B Sk9SX1ZFUlNJT04pLiQoU09fTUlOT1JfVkVSU0lPTikKICAgICBlbmRpZgogICAgIExJTksu c2hhcmVkCQk9ICQoQ09NUElMRVIpIC1keW5hbWljbGliIC1pbnN0YWxsX25hbWUgJyQobGli ZGlyKS9saWIkKE5BTUUpLiQoU09fTUFKT1JfVkVSU0lPTikkKERMU1VGRklYKScgJCh2ZXJz aW9uX2xpbmspICQoZXhwb3J0ZWRfc3ltYm9sc19saXN0KSAtbXVsdGlwbHlfZGVmaW5lZCBz dXBwcmVzcwotICAgIHNobGliCQk9IGxpYiQoTkFNRSkuJChTT19NQUpPUl9WRVJTSU9OKS4k KFNPX01JTk9SX1ZFUlNJT04pJChETFNVRkZJWCkKKyAgICBzaGxpYgkJPSBsaWIkKE5BTUUp LiQoU09fTUFKT1JfVkVSU0lPTikkKERMU1VGRklYKQogICAgIHNobGliX21ham9yCQk9IGxp YiQoTkFNRSkuJChTT19NQUpPUl9WRVJTSU9OKSQoRExTVUZGSVgpCiAgIGVsc2UKICAgICAj IGxvYWRhYmxlIG1vZHVsZQotLSAKMi4zNy4xCgo= --------------y710EczIDC5WyXhRrAkVC0T4 Content-Type: text/plain; charset=UTF-8; name="0002-meson-Fix-installation-name-of-libpgfeutils.patch" Content-Disposition: attachment; filename="0002-meson-Fix-installation-name-of-libpgfeutils.patch" Content-Transfer-Encoding: base64 RnJvbSA0MzQ0Njc5Yjk4NmQ5OTE1MjdjNTkwMDNkMzQ1MjgzNzdlY2U4ODEzIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBQZXRlciBFaXNlbnRyYXV0IDxwZXRlckBlaXNlbnRy YXV0Lm9yZz4KRGF0ZTogV2VkLCAxNyBBdWcgMjAyMiAxNDoyMDoyNCArMDIwMApTdWJqZWN0 OiBbUEFUQ0ggMi83XSBtZXNvbjogRml4IGluc3RhbGxhdGlvbiBuYW1lIG9mIGxpYnBnZmV1 dGlscwoKLS0tCiBzcmMvZmVfdXRpbHMvbWVzb24uYnVpbGQgfCAyICstCiAxIGZpbGUgY2hh bmdlZCwgMSBpbnNlcnRpb24oKyksIDEgZGVsZXRpb24oLSkKCmRpZmYgLS1naXQgYS9zcmMv ZmVfdXRpbHMvbWVzb24uYnVpbGQgYi9zcmMvZmVfdXRpbHMvbWVzb24uYnVpbGQKaW5kZXgg YmVkM2VkNzhiNS4uYWFmNDhkMmUwNSAxMDA2NDQKLS0tIGEvc3JjL2ZlX3V0aWxzL21lc29u LmJ1aWxkCisrKyBiL3NyYy9mZV91dGlscy9tZXNvbi5idWlsZApAQCAtMjEsNyArMjEsNyBA QCBwc3Fsc2NhbiA9IGN1c3RvbV90YXJnZXQoJ3BzcWxzY2FuJywKIGdlbmVyYXRlZF9zb3Vy Y2VzICs9IHBzcWxzY2FuCiBmZV91dGlsc19zb3VyY2VzICs9IHBzcWxzY2FuCiAKLWZlX3V0 aWxzID0gc3RhdGljX2xpYnJhcnkoJ3BnZmV1dGlscycsCitmZV91dGlscyA9IHN0YXRpY19s aWJyYXJ5KCdsaWJwZ2ZldXRpbHMnLAogICBmZV91dGlsc19zb3VyY2VzICsgZ2VuZXJhdGVk X2hlYWRlcnMsCiAgIGNfcGNoOiBwY2hfY19oLAogICBpbmNsdWRlX2RpcmVjdG9yaWVzIDog IFtwb3N0Z3Jlc19pbmMsIGxpYnBxX2luY10sCi0tIAoyLjM3LjEKCg== --------------y710EczIDC5WyXhRrAkVC0T4 Content-Type: text/plain; charset=UTF-8; name="0003-meson-Libraries-need-to-be-built-with-DSO_MAJOR_VERS.patch" Content-Disposition: attachment; filename*0="0003-meson-Libraries-need-to-be-built-with-DSO_MAJOR_VERS.pa"; filename*1="tch" Content-Transfer-Encoding: base64 RnJvbSBlNGQxYzFkZGE1MjNhYzUyY2VmYWZmNTNiOGE5NjhiNTA4ZGJmYTllIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBQZXRlciBFaXNlbnRyYXV0IDxwZXRlckBlaXNlbnRy YXV0Lm9yZz4KRGF0ZTogV2VkLCAxNyBBdWcgMjAyMiAxNDoyMTo0MSArMDIwMApTdWJqZWN0 OiBbUEFUQ0ggMy83XSBtZXNvbjogTGlicmFyaWVzIG5lZWQgdG8gYmUgYnVpbHQgd2l0aAog LURTT19NQUpPUl9WRVJTSU9OPU4KClRoaXMgaXMgdXNlZCBieSBOTFMgdG8gbG9jYXRlIHRo ZSByaWdodCBjYXRhbG9nIGZpbGUuCi0tLQogc3JjL2ludGVyZmFjZXMvZWNwZy9jb21wYXRs aWIvbWVzb24uYnVpbGQgIHwgMSArCiBzcmMvaW50ZXJmYWNlcy9lY3BnL2VjcGdsaWIvbWVz b24uYnVpbGQgICAgfCAxICsKIHNyYy9pbnRlcmZhY2VzL2VjcGcvcGd0eXBlc2xpYi9tZXNv bi5idWlsZCB8IDEgKwogc3JjL2ludGVyZmFjZXMvbGlicHEvbWVzb24uYnVpbGQgICAgICAg ICAgIHwgMiArLQogNCBmaWxlcyBjaGFuZ2VkLCA0IGluc2VydGlvbnMoKyksIDEgZGVsZXRp b24oLSkKCmRpZmYgLS1naXQgYS9zcmMvaW50ZXJmYWNlcy9lY3BnL2NvbXBhdGxpYi9tZXNv bi5idWlsZCBiL3NyYy9pbnRlcmZhY2VzL2VjcGcvY29tcGF0bGliL21lc29uLmJ1aWxkCmlu ZGV4IDMyOGYzM2U1ZGUuLjIwMjJkZWM1NzEgMTAwNjQ0Ci0tLSBhL3NyYy9pbnRlcmZhY2Vz L2VjcGcvY29tcGF0bGliL21lc29uLmJ1aWxkCisrKyBiL3NyYy9pbnRlcmZhY2VzL2VjcGcv Y29tcGF0bGliL21lc29uLmJ1aWxkCkBAIC0zLDYgKzMsNyBAQCBleHBvcnRfZmlsZSA9IGN1 c3RvbV90YXJnZXQoJ2xpYnBxLmV4cG9ydHMnLCBrd2FyZ3M6IGdlbl9leHBvcnRfa3dhcmdz KQogZWNwZ19jb21wYXQgPSBib3RoX2xpYnJhcmllcygnbGliZWNwZ19jb21wYXQnLAogICAn aW5mb3JtaXguYycsCiAgIGluY2x1ZGVfZGlyZWN0b3JpZXMgOiBbJy4nLCBlY3BnX2luYywg cG9zdGdyZXNfaW5jLCBsaWJwcV9pbmNdLAorICBjX2FyZ3M6IFsnLURTT19NQUpPUl9WRVJT SU9OPTMnXSwKICAgZGVwZW5kZW5jaWVzOiBbZnJvbnRlbmRfc2hsaWJfY29kZSwgdGhyZWFk X2RlcF0sCiAgIGxpbmtfd2l0aDogW2VjcGdsaWIsIGVjcGdfcGd0eXBlc10sCiAgIHNvdmVy c2lvbjogaG9zdF9zeXN0ZW0gIT0gJ3dpbjMyJyA/ICczJyA6ICcnLApkaWZmIC0tZ2l0IGEv c3JjL2ludGVyZmFjZXMvZWNwZy9lY3BnbGliL21lc29uLmJ1aWxkIGIvc3JjL2ludGVyZmFj ZXMvZWNwZy9lY3BnbGliL21lc29uLmJ1aWxkCmluZGV4IDk5MTRhYTkzNmQuLjE4MzAwZjNl ZjAgMTAwNjQ0Ci0tLSBhL3NyYy9pbnRlcmZhY2VzL2VjcGcvZWNwZ2xpYi9tZXNvbi5idWls ZAorKysgYi9zcmMvaW50ZXJmYWNlcy9lY3BnL2VjcGdsaWIvbWVzb24uYnVpbGQKQEAgLTE2 LDYgKzE2LDcgQEAgZXhwb3J0X2ZpbGUgPSBjdXN0b21fdGFyZ2V0KCdsaWJwcS5leHBvcnRz Jywga3dhcmdzOiBnZW5fZXhwb3J0X2t3YXJncykKIGVjcGdsaWIgPSBib3RoX2xpYnJhcmll cygnbGliZWNwZycsCiAgIGVjcGdsaWJfc291cmNlcywKICAgaW5jbHVkZV9kaXJlY3Rvcmll cyA6IFsnLicsIGVjcGdfaW5jLCBwb3N0Z3Jlc19pbmNdLAorICBjX2FyZ3M6IFsnLURTT19N QUpPUl9WRVJTSU9OPTYnXSwKICAgZGVwZW5kZW5jaWVzOiBbZnJvbnRlbmRfc2hsaWJfY29k ZSwgbGlicHEsIHRocmVhZF9kZXBdLAogICBsaW5rX3dpdGg6IFtlY3BnX3BndHlwZXNdLAog ICBzb3ZlcnNpb246IGhvc3Rfc3lzdGVtICE9ICd3aW4zMicgPyAnNicgOiAnJywKZGlmZiAt LWdpdCBhL3NyYy9pbnRlcmZhY2VzL2VjcGcvcGd0eXBlc2xpYi9tZXNvbi5idWlsZCBiL3Ny Yy9pbnRlcmZhY2VzL2VjcGcvcGd0eXBlc2xpYi9tZXNvbi5idWlsZAppbmRleCAyOGM0ZTcz MTRiLi5hMzNkYjE0NGU2IDEwMDY0NAotLS0gYS9zcmMvaW50ZXJmYWNlcy9lY3BnL3BndHlw ZXNsaWIvbWVzb24uYnVpbGQKKysrIGIvc3JjL2ludGVyZmFjZXMvZWNwZy9wZ3R5cGVzbGli L21lc29uLmJ1aWxkCkBAIC0xMiw2ICsxMiw3IEBAIGV4cG9ydF9maWxlID0gY3VzdG9tX3Rh cmdldCgnbGlicHEuZXhwb3J0cycsIGt3YXJnczogZ2VuX2V4cG9ydF9rd2FyZ3MpCiBlY3Bn X3BndHlwZXMgPSBib3RoX2xpYnJhcmllcygnbGlicGd0eXBlcycsCiAgIGVjcGdfcGd0eXBl c19zb3VyY2VzLAogICBpbmNsdWRlX2RpcmVjdG9yaWVzIDogWycuJywgZWNwZ19pbmMsIHBv c3RncmVzX2luY10sCisgIGNfYXJnczogWyctRFNPX01BSk9SX1ZFUlNJT049MyddLAogICBk ZXBlbmRlbmNpZXM6IFtmcm9udGVuZF9zaGxpYl9jb2RlXSwKICAgdmVyc2lvbjogJzMuJytw Z192ZXJzaW9uX21ham9yLnRvX3N0cmluZygpLAogICBzb3ZlcnNpb246IGhvc3Rfc3lzdGVt ICE9ICd3aW4zMicgPyAnMycgOiAnJywKZGlmZiAtLWdpdCBhL3NyYy9pbnRlcmZhY2VzL2xp YnBxL21lc29uLmJ1aWxkIGIvc3JjL2ludGVyZmFjZXMvbGlicHEvbWVzb24uYnVpbGQKaW5k ZXggYmI2YTQ3YzVhMi4uOWYyOTEzNjAzNCAxMDA2NDQKLS0tIGEvc3JjL2ludGVyZmFjZXMv bGlicHEvbWVzb24uYnVpbGQKKysrIGIvc3JjL2ludGVyZmFjZXMvbGlicHEvbWVzb24uYnVp bGQKQEAgLTQ4LDcgKzQ4LDcgQEAgZW5kaWYKIGxpYnBxX2JvdGggPSBib3RoX2xpYnJhcmll cygnbGlicHEnLAogICBsaWJwcV9zb3VyY2VzLAogICBpbmNsdWRlX2RpcmVjdG9yaWVzIDog W2xpYnBxX2luYywgcG9zdGdyZXNfaW5jXSwKLSAgY19hcmdzOiBbJy1ERlJPTlRFTkQnXSwK KyAgY19hcmdzOiBbJy1ERlJPTlRFTkQnLCAnLURTT19NQUpPUl9WRVJTSU9OPTUnXSwKICAg ZGVwZW5kZW5jaWVzOiBsaWJwcV9kZXBzLAogICB2ZXJzaW9uOiAnNS4nK3BnX3ZlcnNpb25f bWFqb3IudG9fc3RyaW5nKCksCiAgIHNvdmVyc2lvbjogaG9zdF9zeXN0ZW0gIT0gJ3dpbjMy JyA/ICc1JyA6ICcnICwKLS0gCjIuMzcuMQoK --------------y710EczIDC5WyXhRrAkVC0T4 Content-Type: text/plain; charset=UTF-8; name="0004-meson-Add-darwin_versions-argument-for-libraries.patch" Content-Disposition: attachment; filename*0="0004-meson-Add-darwin_versions-argument-for-libraries.patch" Content-Transfer-Encoding: base64 RnJvbSBlMmU3Nzk0NzA3YWEwMTcxOTNiYTY2ZGM2NjE1Yzk4ODQ4YjZlMDZjIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBQZXRlciBFaXNlbnRyYXV0IDxwZXRlckBlaXNlbnRy YXV0Lm9yZz4KRGF0ZTogV2VkLCAxNyBBdWcgMjAyMiAxNDoyMjoyNCArMDIwMApTdWJqZWN0 OiBbUEFUQ0ggNC83XSBtZXNvbjogQWRkIGRhcndpbl92ZXJzaW9ucyBhcmd1bWVudCBmb3Ig bGlicmFyaWVzCgotLS0KIHNyYy9pbnRlcmZhY2VzL2VjcGcvY29tcGF0bGliL21lc29uLmJ1 aWxkICB8IDEgKwogc3JjL2ludGVyZmFjZXMvZWNwZy9lY3BnbGliL21lc29uLmJ1aWxkICAg IHwgMSArCiBzcmMvaW50ZXJmYWNlcy9lY3BnL3BndHlwZXNsaWIvbWVzb24uYnVpbGQgfCAx ICsKIHNyYy9pbnRlcmZhY2VzL2xpYnBxL21lc29uLmJ1aWxkICAgICAgICAgICB8IDEgKwog NCBmaWxlcyBjaGFuZ2VkLCA0IGluc2VydGlvbnMoKykKCmRpZmYgLS1naXQgYS9zcmMvaW50 ZXJmYWNlcy9lY3BnL2NvbXBhdGxpYi9tZXNvbi5idWlsZCBiL3NyYy9pbnRlcmZhY2VzL2Vj cGcvY29tcGF0bGliL21lc29uLmJ1aWxkCmluZGV4IDIwMjJkZWM1NzEuLmIyNDk0NTllMWYg MTAwNjQ0Ci0tLSBhL3NyYy9pbnRlcmZhY2VzL2VjcGcvY29tcGF0bGliL21lc29uLmJ1aWxk CisrKyBiL3NyYy9pbnRlcmZhY2VzL2VjcGcvY29tcGF0bGliL21lc29uLmJ1aWxkCkBAIC03 LDYgKzcsNyBAQCBlY3BnX2NvbXBhdCA9IGJvdGhfbGlicmFyaWVzKCdsaWJlY3BnX2NvbXBh dCcsCiAgIGRlcGVuZGVuY2llczogW2Zyb250ZW5kX3NobGliX2NvZGUsIHRocmVhZF9kZXBd LAogICBsaW5rX3dpdGg6IFtlY3BnbGliLCBlY3BnX3BndHlwZXNdLAogICBzb3ZlcnNpb246 IGhvc3Rfc3lzdGVtICE9ICd3aW4zMicgPyAnMycgOiAnJywKKyAgZGFyd2luX3ZlcnNpb25z OiBbJzMnLCAnMy4nK3BnX3ZlcnNpb25fbWFqb3IudG9fc3RyaW5nKCldLAogICB2ZXJzaW9u OiAnMy4nK3BnX3ZlcnNpb25fbWFqb3IudG9fc3RyaW5nKCksCiAgIGxpbmtfYXJnczogZXhw b3J0X2ZtdC5mb3JtYXQoZXhwb3J0X2ZpbGUuZnVsbF9wYXRoKCkpLAogICBsaW5rX2RlcGVu ZHM6IGV4cG9ydF9maWxlLApkaWZmIC0tZ2l0IGEvc3JjL2ludGVyZmFjZXMvZWNwZy9lY3Bn bGliL21lc29uLmJ1aWxkIGIvc3JjL2ludGVyZmFjZXMvZWNwZy9lY3BnbGliL21lc29uLmJ1 aWxkCmluZGV4IDE4MzAwZjNlZjAuLmI5ZjAzNmE4MjYgMTAwNjQ0Ci0tLSBhL3NyYy9pbnRl cmZhY2VzL2VjcGcvZWNwZ2xpYi9tZXNvbi5idWlsZAorKysgYi9zcmMvaW50ZXJmYWNlcy9l Y3BnL2VjcGdsaWIvbWVzb24uYnVpbGQKQEAgLTIwLDYgKzIwLDcgQEAgZWNwZ2xpYiA9IGJv dGhfbGlicmFyaWVzKCdsaWJlY3BnJywKICAgZGVwZW5kZW5jaWVzOiBbZnJvbnRlbmRfc2hs aWJfY29kZSwgbGlicHEsIHRocmVhZF9kZXBdLAogICBsaW5rX3dpdGg6IFtlY3BnX3BndHlw ZXNdLAogICBzb3ZlcnNpb246IGhvc3Rfc3lzdGVtICE9ICd3aW4zMicgPyAnNicgOiAnJywK KyAgZGFyd2luX3ZlcnNpb25zOiBbJzYnLCAnNi4nK3BnX3ZlcnNpb25fbWFqb3IudG9fc3Ry aW5nKCldLAogICB2ZXJzaW9uOiAnNi4nK3BnX3ZlcnNpb25fbWFqb3IudG9fc3RyaW5nKCks CiAgIGxpbmtfYXJnczogZXhwb3J0X2ZtdC5mb3JtYXQoZXhwb3J0X2ZpbGUuZnVsbF9wYXRo KCkpLAogICBsaW5rX2RlcGVuZHM6IGV4cG9ydF9maWxlLApkaWZmIC0tZ2l0IGEvc3JjL2lu dGVyZmFjZXMvZWNwZy9wZ3R5cGVzbGliL21lc29uLmJ1aWxkIGIvc3JjL2ludGVyZmFjZXMv ZWNwZy9wZ3R5cGVzbGliL21lc29uLmJ1aWxkCmluZGV4IGEzM2RiMTQ0ZTYuLjAyYWUyYmNh ZjkgMTAwNjQ0Ci0tLSBhL3NyYy9pbnRlcmZhY2VzL2VjcGcvcGd0eXBlc2xpYi9tZXNvbi5i dWlsZAorKysgYi9zcmMvaW50ZXJmYWNlcy9lY3BnL3BndHlwZXNsaWIvbWVzb24uYnVpbGQK QEAgLTE2LDYgKzE2LDcgQEAgZWNwZ19wZ3R5cGVzID0gYm90aF9saWJyYXJpZXMoJ2xpYnBn dHlwZXMnLAogICBkZXBlbmRlbmNpZXM6IFtmcm9udGVuZF9zaGxpYl9jb2RlXSwKICAgdmVy c2lvbjogJzMuJytwZ192ZXJzaW9uX21ham9yLnRvX3N0cmluZygpLAogICBzb3ZlcnNpb246 IGhvc3Rfc3lzdGVtICE9ICd3aW4zMicgPyAnMycgOiAnJywKKyAgZGFyd2luX3ZlcnNpb25z OiBbJzMnLCAnMy4nK3BnX3ZlcnNpb25fbWFqb3IudG9fc3RyaW5nKCldLAogICBsaW5rX2Fy Z3M6IGV4cG9ydF9mbXQuZm9ybWF0KGV4cG9ydF9maWxlLmZ1bGxfcGF0aCgpKSwKICAgbGlu a19kZXBlbmRzOiBleHBvcnRfZmlsZSwKICAga3dhcmdzOiBkZWZhdWx0X2xpYl9hcmdzLApk aWZmIC0tZ2l0IGEvc3JjL2ludGVyZmFjZXMvbGlicHEvbWVzb24uYnVpbGQgYi9zcmMvaW50 ZXJmYWNlcy9saWJwcS9tZXNvbi5idWlsZAppbmRleCA5ZjI5MTM2MDM0Li4yY2M0ZjVmOGM4 IDEwMDY0NAotLS0gYS9zcmMvaW50ZXJmYWNlcy9saWJwcS9tZXNvbi5idWlsZAorKysgYi9z cmMvaW50ZXJmYWNlcy9saWJwcS9tZXNvbi5idWlsZApAQCAtNTIsNiArNTIsNyBAQCBsaWJw cV9ib3RoID0gYm90aF9saWJyYXJpZXMoJ2xpYnBxJywKICAgZGVwZW5kZW5jaWVzOiBsaWJw cV9kZXBzLAogICB2ZXJzaW9uOiAnNS4nK3BnX3ZlcnNpb25fbWFqb3IudG9fc3RyaW5nKCks CiAgIHNvdmVyc2lvbjogaG9zdF9zeXN0ZW0gIT0gJ3dpbjMyJyA/ICc1JyA6ICcnICwKKyAg ZGFyd2luX3ZlcnNpb25zOiBbJzUnLCAnNS4nK3BnX3ZlcnNpb25fbWFqb3IudG9fc3RyaW5n KCldLAogICBsaW5rX2RlcGVuZHM6IGV4cG9ydF9maWxlLAogICBsaW5rX2FyZ3M6IGV4cG9y dF9mbXQuZm9ybWF0KGV4cG9ydF9maWxlLmZ1bGxfcGF0aCgpKSwKICAga3dhcmdzOiBkZWZh dWx0X2xpYl9hcmdzLAotLSAKMi4zNy4xCgo= --------------y710EczIDC5WyXhRrAkVC0T4 Content-Type: text/plain; charset=UTF-8; name="0005-meson-Fix-link-order-of-support-libraries.patch" Content-Disposition: attachment; filename="0005-meson-Fix-link-order-of-support-libraries.patch" Content-Transfer-Encoding: base64 RnJvbSAzZjQzYjQ1Njk4NWE1OWYxNzA1M2ZkMzM2NzVhYjUxYjY2YWU2ZDM2IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBQZXRlciBFaXNlbnRyYXV0IDxwZXRlckBlaXNlbnRy YXV0Lm9yZz4KRGF0ZTogV2VkLCAxNyBBdWcgMjAyMiAxNDoyNzo0MiArMDIwMApTdWJqZWN0 OiBbUEFUQ0ggNS83XSBtZXNvbjogRml4IGxpbmsgb3JkZXIgb2Ygc3VwcG9ydCBsaWJyYXJp ZXMKCi0tLQogbWVzb24uYnVpbGQgICAgICAgICAgICAgICAgICAgIHwgMiArLQogc3JjL2Nv bW1vbi91bmljb2RlL21lc29uLmJ1aWxkIHwgMiArLQogMiBmaWxlcyBjaGFuZ2VkLCAyIGlu c2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvbWVzb24uYnVpbGQg Yi9tZXNvbi5idWlsZAppbmRleCAyZTc4NTgzYzZjLi44ODMzYTE2YTNiIDEwMDY0NAotLS0g YS9tZXNvbi5idWlsZAorKysgYi9tZXNvbi5idWlsZApAQCAtMjUwNSw3ICsyNTA1LDcgQEAg c3ViZGlyKCdzcmMvZmVfdXRpbHMnKQogZnJvbnRlbmRfY29kZSA9IGRlY2xhcmVfZGVwZW5k ZW5jeSgKICAgY29tcGlsZV9hcmdzOiBbJy1ERlJPTlRFTkQnXSwKICAgaW5jbHVkZV9kaXJl Y3RvcmllczogW3Bvc3RncmVzX2luY10sCi0gIGxpbmtfd2l0aDogW3BncG9ydF9zdGF0aWMs IGNvbW1vbl9zdGF0aWMsIGZlX3V0aWxzXSwKKyAgbGlua193aXRoOiBbZmVfdXRpbHMsIGNv bW1vbl9zdGF0aWMsIHBncG9ydF9zdGF0aWNdLAogICBzb3VyY2VzOiBnZW5lcmF0ZWRfaGVh ZGVycywKICAgZGVwZW5kZW5jaWVzOiBbb3NfZGVwcywgbGliaW50bF0sCiApCmRpZmYgLS1n aXQgYS9zcmMvY29tbW9uL3VuaWNvZGUvbWVzb24uYnVpbGQgYi9zcmMvY29tbW9uL3VuaWNv ZGUvbWVzb24uYnVpbGQKaW5kZXggZjM3ZjkwNzdkMC4uNDRhNmNmNzdjMyAxMDA2NDQKLS0t IGEvc3JjL2NvbW1vbi91bmljb2RlL21lc29uLmJ1aWxkCisrKyBiL3NyYy9jb21tb24vdW5p Y29kZS9tZXNvbi5idWlsZApAQCAtNzMsNyArNzMsNyBAQCBub3JtX3Rlc3QgPSBleGVjdXRh YmxlKCdub3JtX3Rlc3QnLAogICBbJ25vcm1fdGVzdC5jJywgbm9ybV90ZXN0X3RhYmxlXSwK ICAgZGVwZW5kZW5jaWVzOiBbZnJvbnRlbmRfcG9ydF9jb2RlXSwKICAgaW5jbHVkZV9kaXJl Y3RvcmllczogaW5jLAotICBsaW5rX3dpdGg6IFtwZ3BvcnRfc3RhdGljLCBjb21tb25fc3Rh dGljXSwKKyAgbGlua193aXRoOiBbY29tbW9uX3N0YXRpYywgcGdwb3J0X3N0YXRpY10sCiAg IGJ1aWxkX2J5X2RlZmF1bHQ6IGZhbHNlLAogICBrd2FyZ3M6IGRlZmF1bHRfYmluX2FyZ3Mg KyB7CiAgICAgJ2luc3RhbGwnOiBmYWxzZSwKLS0gCjIuMzcuMQoK --------------y710EczIDC5WyXhRrAkVC0T4 Content-Type: text/plain; charset=UTF-8; name="0006-meson-Make-link-order-of-external-libraries-match-ma.patch" Content-Disposition: attachment; filename*0="0006-meson-Make-link-order-of-external-libraries-match-ma.pa"; filename*1="tch" Content-Transfer-Encoding: base64 RnJvbSAzZmI3YjE5OGJjMzJmMzcyZTAyODhjODlhMDE1ZGU0ZjM1ODdkYjdjIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBQZXRlciBFaXNlbnRyYXV0IDxwZXRlckBlaXNlbnRy YXV0Lm9yZz4KRGF0ZTogV2VkLCAxNyBBdWcgMjAyMiAxNDoyOTowMSArMDIwMApTdWJqZWN0 OiBbUEFUQ0ggNi83XSBtZXNvbjogTWFrZSBsaW5rIG9yZGVyIG9mIGV4dGVybmFsIGxpYnJh cmllcyBtYXRjaAogbWFrZWZpbGUgb3JkZXIKCi0tLQogbWVzb24uYnVpbGQgICAgICAgICAg ICAgICAgICAgICAgIHwgMiArLQogc3JjL2Jpbi9wZ19iYXNlYmFja3VwL21lc29uLmJ1aWxk IHwgMiArLQogc3JjL2Jpbi9wZ19yZXdpbmQvbWVzb24uYnVpbGQgICAgIHwgMiArLQogc3Jj L2Jpbi9wZ193YWxkdW1wL21lc29uLmJ1aWxkICAgIHwgMiArLQogNCBmaWxlcyBjaGFuZ2Vk LCA0IGluc2VydGlvbnMoKyksIDQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvbWVzb24u YnVpbGQgYi9tZXNvbi5idWlsZAppbmRleCA4ODMzYTE2YTNiLi45MzhjODdkNDg1IDEwMDY0 NAotLS0gYS9tZXNvbi5idWlsZAorKysgYi9tZXNvbi5idWlsZApAQCAtMjQ5MiwxMCArMjQ5 MiwxMCBAQCBsaWJwcV9kZXBzID0gWwogICBmcm9udGVuZF9zaGxpYl9jb2RlLAogICB0aHJl YWRfZGVwLAogCisgIHNzbCwKICAgZ3NzYXBpLAogICBsZGFwLAogICBsaWJpbnRsLAotICBz c2wsCiBdCiAKIHN1YmRpcignc3JjL2ludGVyZmFjZXMvbGlicHEnKQpkaWZmIC0tZ2l0IGEv c3JjL2Jpbi9wZ19iYXNlYmFja3VwL21lc29uLmJ1aWxkIGIvc3JjL2Jpbi9wZ19iYXNlYmFj a3VwL21lc29uLmJ1aWxkCmluZGV4IDg1N2UyYjc3ZDIuLmRjYWFlODRiOWEgMTAwNjQ0Ci0t LSBhL3NyYy9iaW4vcGdfYmFzZWJhY2t1cC9tZXNvbi5idWlsZAorKysgYi9zcmMvYmluL3Bn X2Jhc2ViYWNrdXAvbWVzb24uYnVpbGQKQEAgLTEwLDcgKzEwLDcgQEAgY29tbW9uX3NvdXJj ZXMgPSBmaWxlcygKICAgJ3dhbG1ldGhvZHMuYycsCiApCiAKLXBnX2Jhc2ViYWNrdXBfZGVw cyA9IFtmcm9udGVuZF9jb2RlLCBsaWJwcSwgbHo0LCB6bGliLCB6c3RkXQorcGdfYmFzZWJh Y2t1cF9kZXBzID0gW2Zyb250ZW5kX2NvZGUsIGxpYnBxLCB6c3RkLCBsejQsIHpsaWJdCiBw Z19iYXNlYmFja3VwX2NvbW1vbiA9IHN0YXRpY19saWJyYXJ5KCdsaWJwZ19iYXNlYmFja3Vw X2NvbW1vbicsCiAgIGNvbW1vbl9zb3VyY2VzLAogICBkZXBlbmRlbmNpZXM6IHBnX2Jhc2Vi YWNrdXBfZGVwcywKZGlmZiAtLWdpdCBhL3NyYy9iaW4vcGdfcmV3aW5kL21lc29uLmJ1aWxk IGIvc3JjL2Jpbi9wZ19yZXdpbmQvbWVzb24uYnVpbGQKaW5kZXggNDBhZTU5M2U3Yy4uYmVm NGJhZmI0ZiAxMDA2NDQKLS0tIGEvc3JjL2Jpbi9wZ19yZXdpbmQvbWVzb24uYnVpbGQKKysr IGIvc3JjL2Jpbi9wZ19yZXdpbmQvbWVzb24uYnVpbGQKQEAgLTEyLDcgKzEyLDcgQEAgcGdf cmV3aW5kX3NvdXJjZXMgPSBmaWxlcygKIAogcGdfcmV3aW5kID0gZXhlY3V0YWJsZSgncGdf cmV3aW5kJywKICAgcGdfcmV3aW5kX3NvdXJjZXMsCi0gIGRlcGVuZGVuY2llczogW2Zyb250 ZW5kX2NvZGUsIGxpYnBxLCBsejQsIHpzdGRdLAorICBkZXBlbmRlbmNpZXM6IFtmcm9udGVu ZF9jb2RlLCBsaWJwcSwgenN0ZCwgbHo0XSwKICAga3dhcmdzOiBkZWZhdWx0X2Jpbl9hcmdz LAogKQogCmRpZmYgLS1naXQgYS9zcmMvYmluL3BnX3dhbGR1bXAvbWVzb24uYnVpbGQgYi9z cmMvYmluL3BnX3dhbGR1bXAvbWVzb24uYnVpbGQKaW5kZXggZTQ4MjAwNjI2NC4uYWZhMWEy NjljMyAxMDA2NDQKLS0tIGEvc3JjL2Jpbi9wZ193YWxkdW1wL21lc29uLmJ1aWxkCisrKyBi L3NyYy9iaW4vcGdfd2FsZHVtcC9tZXNvbi5idWlsZApAQCAtMTAsNyArMTAsNyBAQCBwZ193 YWxkdW1wX3NvdXJjZXMgKz0gZmlsZXMoJy4uLy4uL2JhY2tlbmQvYWNjZXNzL3RyYW5zYW0v eGxvZ3N0YXRzLmMnKQogCiBwZ193YWxkdW1wID0gZXhlY3V0YWJsZSgncGdfd2FsZHVtcCcs CiAgIHBnX3dhbGR1bXBfc291cmNlcywKLSAgZGVwZW5kZW5jaWVzOiBbZnJvbnRlbmRfY29k ZSwgbHo0LCB6c3RkXSwKKyAgZGVwZW5kZW5jaWVzOiBbZnJvbnRlbmRfY29kZSwgenN0ZCwg bHo0XSwKICAga3dhcmdzOiBkZWZhdWx0X2Jpbl9hcmdzLAogKQogCi0tIAoyLjM3LjEKCg== --------------y710EczIDC5WyXhRrAkVC0T4 Content-Type: text/plain; charset=UTF-8; name="0007-WIP-meson-Make-link-order-of-object-files-match-make.patch" Content-Disposition: attachment; filename*0="0007-WIP-meson-Make-link-order-of-object-files-match-make.pa"; filename*1="tch" Content-Transfer-Encoding: base64 RnJvbSAyZTM1YjIwN2QyYWNjZDY5YmFhMjU1N2RkOTA4MDY2Y2I0MzZiZWJmIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBQZXRlciBFaXNlbnRyYXV0IDxwZXRlckBlaXNlbnRy YXV0Lm9yZz4KRGF0ZTogV2VkLCAxNyBBdWcgMjAyMiAxNDozMTowOSArMDIwMApTdWJqZWN0 OiBbUEFUQ0ggNy83XSBXSVA6IG1lc29uOiBNYWtlIGxpbmsgb3JkZXIgb2Ygb2JqZWN0IGZp bGVzIG1hdGNoCiBtYWtlZmlsZSBvcmRlcgoKLS0tCiBzcmMvYmluL3BnX2Jhc2ViYWNrdXAv bWVzb24uYnVpbGQgfCAgMiArLQogc3JjL2Jpbi9wZ193YWxkdW1wL01ha2VmaWxlICAgICAg IHwgIDIgKy0KIHNyYy9jb21tb24vTWFrZWZpbGUgICAgICAgICAgICAgICB8IDE3ICsrKysr KysrKystLS0tLS0tCiBzcmMvZmVfdXRpbHMvTWFrZWZpbGUgICAgICAgICAgICAgfCAgMiAr LQogc3JjL2ludGVyZmFjZXMvbGlicHEvbWVzb24uYnVpbGQgIHwgIDQgKystLQogc3JjL3Bv cnQvTWFrZWZpbGUgICAgICAgICAgICAgICAgIHwgIDYgKysrLS0tCiA2IGZpbGVzIGNoYW5n ZWQsIDE4IGluc2VydGlvbnMoKyksIDE1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3Ny Yy9iaW4vcGdfYmFzZWJhY2t1cC9tZXNvbi5idWlsZCBiL3NyYy9iaW4vcGdfYmFzZWJhY2t1 cC9tZXNvbi5idWlsZAppbmRleCBkY2FhZTg0YjlhLi5kZDM4OGQ4YTFlIDEwMDY0NAotLS0g YS9zcmMvYmluL3BnX2Jhc2ViYWNrdXAvbWVzb24uYnVpbGQKKysrIGIvc3JjL2Jpbi9wZ19i YXNlYmFja3VwL21lc29uLmJ1aWxkCkBAIC0zLDggKzMsOCBAQCBjb21tb25fc291cmNlcyA9 IGZpbGVzKAogICAnYmJzdHJlYW1lcl9nemlwLmMnLAogICAnYmJzdHJlYW1lcl9pbmplY3Qu YycsCiAgICdiYnN0cmVhbWVyX2x6NC5jJywKLSAgJ2Jic3RyZWFtZXJfdGFyLmMnLAogICAn YmJzdHJlYW1lcl96c3RkLmMnLAorICAnYmJzdHJlYW1lcl90YXIuYycsCiAgICdyZWNlaXZl bG9nLmMnLAogICAnc3RyZWFtdXRpbC5jJywKICAgJ3dhbG1ldGhvZHMuYycsCmRpZmYgLS1n aXQgYS9zcmMvYmluL3BnX3dhbGR1bXAvTWFrZWZpbGUgYi9zcmMvYmluL3BnX3dhbGR1bXAv TWFrZWZpbGUKaW5kZXggZDY0NTllMTdjNy4uNTNjNjAyYzNjYSAxMDA2NDQKLS0tIGEvc3Jj L2Jpbi9wZ193YWxkdW1wL01ha2VmaWxlCisrKyBiL3NyYy9iaW4vcGdfd2FsZHVtcC9NYWtl ZmlsZQpAQCAtOCwxMSArOCwxMSBAQCB0b3BfYnVpbGRkaXIgPSAuLi8uLi8uLgogaW5jbHVk ZSAkKHRvcF9idWlsZGRpcikvc3JjL01ha2VmaWxlLmdsb2JhbAogCiBPQkpTID0gXAotCSQo Uk1HUkRFU0NPQkpTKSBcCiAJJChXSU4zMlJFUykgXAogCWNvbXBhdC5vIFwKIAlwZ193YWxk dW1wLm8gXAogCXJtZ3JkZXNjLm8gXAorCSQoUk1HUkRFU0NPQkpTKSBcCiAJeGxvZ3JlYWRl ci5vIFwKIAl4bG9nc3RhdHMubwogCmRpZmYgLS1naXQgYS9zcmMvY29tbW9uL01ha2VmaWxl IGIvc3JjL2NvbW1vbi9NYWtlZmlsZQppbmRleCBlOWFmNzM0NmM5Li4wNWVhOTU3ODYxIDEw MDY0NAotLS0gYS9zcmMvY29tbW9uL01ha2VmaWxlCisrKyBiL3NyYy9jb21tb24vTWFrZWZp bGUKQEAgLTUwLDEyICs1MCw5IEBAIE9CSlNfQ09NTU9OID0gXAogCWJhc2U2NC5vIFwKIAlj aGVja3N1bV9oZWxwZXIubyBcCiAJY29tcHJlc3Npb24ubyBcCi0JY29uZmlnX2luZm8ubyBc CiAJY29udHJvbGRhdGFfdXRpbHMubyBcCi0JZDJzLm8gXAogCWVuY25hbWVzLm8gXAogCWV4 ZWMubyBcCi0JZjJzLm8gXAogCWZpbGVfcGVybS5vIFwKIAlmaWxlX3V0aWxzLm8gXAogCWhh c2hmbi5vIFwKQEAgLTgzLDkgKzgwLDkgQEAgT0JKU19DT01NT04gPSBcCiAKIGlmZXEgKCQo d2l0aF9zc2wpLG9wZW5zc2wpCiBPQkpTX0NPTU1PTiArPSBcCi0JcHJvdG9jb2xfb3BlbnNz bC5vIFwKIAljcnlwdG9oYXNoX29wZW5zc2wubyBcCi0JaG1hY19vcGVuc3NsLm8KKwlobWFj X29wZW5zc2wubyBcCisJcHJvdG9jb2xfb3BlbnNzbC5vCiBlbHNlCiBPQkpTX0NPTU1PTiAr PSBcCiAJY3J5cHRvaGFzaC5vIFwKQEAgLTk1LDYgKzkyLDExIEBAIE9CSlNfQ09NTU9OICs9 IFwKIAlzaGEyLm8KIGVuZGlmCiAKK09CSlNfRVhUUkEgPSBcCisJZDJzLm8gXAorCWYycy5v IFwKKwljb25maWdfaW5mby5vCisKICMgQSBmZXcgZmlsZXMgYXJlIGN1cnJlbnRseSBvbmx5 IGJ1aWx0IGZvciBmcm9udGVuZCwgbm90IHNlcnZlcgogIyAoTWt2Y2J1aWxkLnBtIGhhcyBh IGNvcHkgb2YgdGhpcyBsaXN0LCB0b28pLiAgbG9nZ2luZy5jIGlzIGV4Y2x1ZGVkCiAjIGZy b20gT0JKU19GUk9OVEVORF9TSExJQiAoc2hhcmVkIGxpYnJhcnkpIGFzIGEgbWF0dGVyIG9m IHBvbGljeSwKQEAgLTEwNCwxNCArMTA2LDE1IEBAIE9CSlNfRlJPTlRFTkRfU0hMSUIgPSBc CiAJJChPQkpTX0NPTU1PTikgXAogCWZlX21lbXV0aWxzLm8gXAogCXJlc3RyaWN0ZWRfdG9r ZW4ubyBcCi0Jc3Byb21wdC5vCisJc3Byb21wdC5vIFwKKwkkKE9CSlNfRVhUUkEpCiBPQkpT X0ZST05URU5EID0gXAogCSQoT0JKU19GUk9OVEVORF9TSExJQikgXAogCWxvZ2dpbmcubwog CiAjIGZvby5vLCBmb29fc2hsaWIubywgYW5kIGZvb19zcnYubyBhcmUgYWxsIGJ1aWx0IGZy b20gZm9vLmMKIE9CSlNfU0hMSUIgPSAkKE9CSlNfRlJPTlRFTkRfU0hMSUI6JS5vPSVfc2hs aWIubykKLU9CSlNfU1JWID0gJChPQkpTX0NPTU1PTjolLm89JV9zcnYubykKK09CSlNfU1JW ID0gJChPQkpTX0NPTU1PTjolLm89JV9zcnYubykgJChPQkpTX0VYVFJBOiUubz0lX3Nydi5v KQogCiAjIHdoZXJlIHRvIGZpbmQgZ2VuX2tleXdvcmRsaXN0LnBsIGFuZCBzdWJzaWRpYXJ5 IGZpbGVzCiBUT09MU0RJUiA9ICQodG9wX3NyY2Rpcikvc3JjL3Rvb2xzCmRpZmYgLS1naXQg YS9zcmMvZmVfdXRpbHMvTWFrZWZpbGUgYi9zcmMvZmVfdXRpbHMvTWFrZWZpbGUKaW5kZXgg NDRiYzdhMTIxNS4uYWI3NTBkMzM2YSAxMDA2NDQKLS0tIGEvc3JjL2ZlX3V0aWxzL01ha2Vm aWxlCisrKyBiL3NyYy9mZV91dGlscy9NYWtlZmlsZQpAQCAtMjAsNiArMjAsNyBAQCBpbmNs dWRlICQodG9wX2J1aWxkZGlyKS9zcmMvTWFrZWZpbGUuZ2xvYmFsCiBvdmVycmlkZSBDUFBG TEFHUyA6PSAtREZST05URU5EIC1JJChsaWJwcV9zcmNkaXIpICQoQ1BQRkxBR1MpCiAKIE9C SlMgPSBcCisJcHNxbHNjYW4ubyBcCiAJYXJjaGl2ZS5vIFwKIAljYW5jZWwubyBcCiAJY29u ZGl0aW9uYWwubyBcCkBAIC0yOCw3ICsyOSw2IEBAIE9CSlMgPSBcCiAJb3B0aW9uX3V0aWxz Lm8gXAogCXBhcmFsbGVsX3Nsb3QubyBcCiAJcHJpbnQubyBcCi0JcHNxbHNjYW4ubyBcCiAJ cXVlcnlfdXRpbHMubyBcCiAJcmVjb3ZlcnlfZ2VuLm8gXAogCXNpbXBsZV9saXN0Lm8gXApk aWZmIC0tZ2l0IGEvc3JjL2ludGVyZmFjZXMvbGlicHEvbWVzb24uYnVpbGQgYi9zcmMvaW50 ZXJmYWNlcy9saWJwcS9tZXNvbi5idWlsZAppbmRleCAyY2M0ZjVmOGM4Li4wYTc4YTQ5OGM3 IDEwMDY0NAotLS0gYS9zcmMvaW50ZXJmYWNlcy9saWJwcS9tZXNvbi5idWlsZAorKysgYi9z cmMvaW50ZXJmYWNlcy9saWJwcS9tZXNvbi5idWlsZApAQCAtMjgsOCArMjgsOCBAQCBlbmRp ZgogCiBpZiBnc3NhcGkuZm91bmQoKQogICBsaWJwcV9zb3VyY2VzICs9IGZpbGVzKAotICAg ICdmZS1zZWN1cmUtZ3NzYXBpLmMnLAotICAgICdmZS1nc3NhcGktY29tbW9uLmMnCisgICAg J2ZlLWdzc2FwaS1jb21tb24uYycsCisgICAgJ2ZlLXNlY3VyZS1nc3NhcGkuYycKICAgKQog ZW5kaWYKIApkaWZmIC0tZ2l0IGEvc3JjL3BvcnQvTWFrZWZpbGUgYi9zcmMvcG9ydC9NYWtl ZmlsZQppbmRleCBiMzc1NGQ4OTQwLi5kOGRhOWQ3N2I2IDEwMDY0NAotLS0gYS9zcmMvcG9y dC9NYWtlZmlsZQorKysgYi9zcmMvcG9ydC9NYWtlZmlsZQpAQCAtMzgsOCArMzgsNiBAQCBM SUJTICs9ICQoUFRIUkVBRF9MSUJTKQogIyBJZiB5b3UgYWRkIG9iamVjdHMgaGVyZSwgc2Vl IGFsc28gc3JjL3Rvb2xzL21zdmMvTWt2Y2J1aWxkLnBtCiAKIE9CSlMgPSBcCi0JJChMSUJP QkpTKSBcCi0JJChQR19DUkMzMkNfT0JKUykgXAogCWJzZWFyY2hfYXJnLm8gXAogCWNoa2xv Y2FsZS5vIFwKIAlpbmV0X25ldF9udG9wLm8gXApAQCAtNTksNyArNTcsOSBAQCBPQkpTID0g XAogCXNucHJpbnRmLm8gXAogCXN0cmVycm9yLm8gXAogCXRhci5vIFwKLQl0aHJlYWQubwor CXRocmVhZC5vIFwKKwkkKExJQk9CSlMpIFwKKwkkKFBHX0NSQzMyQ19PQkpTKQogCiAjIGxp YnBncG9ydC5hLCBsaWJwZ3BvcnRfc2hsaWIuYSwgYW5kIGxpYnBncG9ydF9zcnYuYSBjb250 YWluIHRoZSBzYW1lIGZpbGVzCiAjIGZvby5vLCBmb29fc2hsaWIubywgYW5kIGZvb19zcnYu byBhcmUgYWxsIGJ1aWx0IGZyb20gZm9vLmMKLS0gCjIuMzcuMQoK --------------y710EczIDC5WyXhRrAkVC0T4--