diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-11-06 09:19:37 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-11-06 09:19:37 +0000 |
| commit | 6003fc7a6eda56862fcff321f47e40cd34e60098 (patch) | |
| tree | 342368c16c4837b5d9eaf8c4d8c0ea298d1e3308 /sys-apps/systemd-utils | |
| parent | 30c2cb2c8971dc95b672303f9191d166d622fe47 (diff) | |
gentoo auto-resync : 06:11:2022 - 09:19:37
Diffstat (limited to 'sys-apps/systemd-utils')
| -rw-r--r-- | sys-apps/systemd-utils/Manifest | 3 | ||||
| -rw-r--r-- | sys-apps/systemd-utils/files/251-meson-0.64.patch | 26 | ||||
| -rw-r--r-- | sys-apps/systemd-utils/systemd-utils-251.7.ebuild | 1 |
3 files changed, 29 insertions, 1 deletions
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest index 3234dbcfb171..56529b1ce08d 100644 --- a/sys-apps/systemd-utils/Manifest +++ b/sys-apps/systemd-utils/Manifest @@ -1,4 +1,5 @@ AUX 251-gpt-auto-no-cryptsetup.patch 958 BLAKE2B 7067224e613433fcb139c38597552e080e07d33b207965a9c9a2b3d4e353c43dae38e6800d6ce28cadcba5f914b1b49e80fa48929df2c4bb96248bfeb6bf6aa5 SHA512 6a78bbdde3aae9a2ad4c4f824eb5281ca9ab24770516ad7c9a9e3daf7f39475bf9b4dd868c857a9833dd408db801393f949b8fae1700b2ad04ea822dc84e3429 +AUX 251-meson-0.64.patch 919 BLAKE2B e9eb5f82235f60f18658e4a6a3bc262525cb3152f8b6953b38683c51d439ebebe215dc4b71935e4059e17d82a07bc9e0ffd1354453d5c6977c927d0ba8f52646 SHA512 2d331194071c6cd0c1e8cf3c50de71b3a06b65ec7cf03f0ced15f2d060dd1b0b252efd59604bc871a8b3bb60794cdafecd9ab01ca17f73d854fce77528cf3f4a AUX 251-revert-fortify-source-3-fix.patch 2059 BLAKE2B 5b34062821f2097fc622ffc66d83029267173b2b4131b29d9339644577b7e80c513c83f62d07ba3e030c2a861efe7d399bd871cc35803b39940f7ec0e7bacfec SHA512 14c5ac8d0343a4cb50de6c56124e515b159cf5f9bf358404ba41ec7a9c439206673e0d44888164ff3872236c7b8c74f5ea9544ea7a981a3b5930585dabcd4782 AUX 40-gentoo.rules 167 BLAKE2B 07116c6e5aab7de9fa8a88c6cdd9ad76a09d797d6f7bc3d0535c93ccf83486bbdae8f68d682714576b072a174df070505cce9c6f4b729e91a6f61ed89da72e8e SHA512 92e2be610839432f46cefab4d128825199dc9f2c5ef33119f9ff84dfe635ef56a4f7aaed64ba52ea2798868b00c3a1b7955caa33219aa298c6a2b8290181f94b AUX systemd-tmpfiles-setup 329 BLAKE2B 7b4d801ec7c29a3d6073c47af8fa1c9fa670b3762c5358d0008ecf372e675e3f65cba3ea453d374c5e23453cfe32252421b69dff23aaeea636c611b960eb7b11 SHA512 cd7f7c69d1b1861cb4eac90d44579361e365ee77906376b6124ff79ba1c0d414b8891ffca19e715585d7400bddc5e9ad973f191125039a4a2c37acb95a111c37 @@ -11,5 +12,5 @@ DIST systemd-stable-251.7.tar.gz 11448429 BLAKE2B 959ac7944d778c8e6d7a3c67ea6adc EBUILD systemd-utils-251.4-r2.ebuild 12095 BLAKE2B 21014fadfa7a5ea04e2cabde58ff7a5c404c28feb224680309c49f3f056b2b0af92688d245f17f42896e71bd1e59879ed070c691dfadaaa29e90580a3a216038 SHA512 f3bb8010c6162fc601b95eebc297ae8f3f5256bd6a20c70423aec1c90854744c773f63affe3f610c3b28ab795f5579cfb45ec57f70cb5eb6121c4347a7f45e95 EBUILD systemd-utils-251.5.ebuild 12004 BLAKE2B 813622adb081673984af0142e4fcec51259441bcc31d2cd2985cd93c31ab6790a82081469525b6e3a05e9fe17f9cc581f717903aefa267aeb5167edebf714521 SHA512 3cfc14f2d5d0570dc6be9d4ad1ad9ebcc17c59970e5840a02a84bda6d80f35b33facddd46554a1857ecc38fc6e69875681e292d57a2dc32205e4e2f88a377c54 EBUILD systemd-utils-251.6.ebuild 12053 BLAKE2B 885efc6eacdee2839c1098a7a450eee58b7cd28eb4c1c09c58cf090c9ba6c6c9a887ffee96cde1131a8f5d3ac701bb02c0ed47581d7a4da75189237774a1c729 SHA512 c25c6088674b560130e7b113e376077c44e5eb622ab62e5c8211dd7c9d84efd97df82fd94d169bbbbf46f180203d042dad8d39b34773b33fb5294ad92ef934f9 -EBUILD systemd-utils-251.7.ebuild 12077 BLAKE2B cde11f108438a6f010fb7a9dc47391e09fd033018ecb16850307583dadc511526724af81d4d5fd9900be6ef5af8ca2168c77405a84ccc94deecaad7a0d5bb054 SHA512 d37dcf2472fa594add1e1bec03567e6eceaf442febc27352df22f9c83c045a24c8fbe9426980bf98d0f02a716621da8c3db3182c37b605592948d40d93cf23de +EBUILD systemd-utils-251.7.ebuild 12114 BLAKE2B 4059cb8c4af812daee221c7f4022be89b7edeae664a046eca1f1183f530c90b855e4a90ea27f911cb235b0217c25d8c61389dd3d9c419b0455cf9ca2d5611075 SHA512 0aa44c5b3fa1a5f03bb7552fe2ebf3fb02658ad799619289e8f7918bb50f7a281fd7e2f69467c88de985e19758bddd6de966ec415515d3d324f1fceff8099640 MISC metadata.xml 713 BLAKE2B 1dcb5d9949600c9a8c8ac0c005ffa03b2ca91293a932fa96092a24c094e9fb29f2cf063af041432c12daec4aa4e60d11ea77ed0a423e188095f995c68e75b91a SHA512 46d167a6d898abfc56130e373d232c18fb3ef8865755379fa7678c049515458e7354b7a8cab3bf3faa7326932cccceb0b0745b4695ab9bea492bc2344abf9da4 diff --git a/sys-apps/systemd-utils/files/251-meson-0.64.patch b/sys-apps/systemd-utils/files/251-meson-0.64.patch new file mode 100644 index 000000000000..6cc200bbd87d --- /dev/null +++ b/sys-apps/systemd-utils/files/251-meson-0.64.patch @@ -0,0 +1,26 @@ +From cddbc850270415a818aadabd71fe12dc0dddd508 Mon Sep 17 00:00:00 2001 +From: Jan Janssen <medhefgo@web.de> +Date: Sun, 9 Oct 2022 17:16:12 +0200 +Subject: [PATCH] meson: Fix build with --optimization=plain + +Note that -O0 is deliberately filtered out as we have to compile with at +least -O1 due to #24202. + +Fixes: #24323 +--- + src/boot/efi/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build +index e0cd4ebad993..395386d3eda7 100644 +--- a/src/boot/efi/meson.build ++++ b/src/boot/efi/meson.build +@@ -223,7 +223,7 @@ endif + if get_option('debug') and get_option('mode') == 'developer' + efi_cflags += ['-ggdb', '-DEFI_DEBUG'] + endif +-if get_option('optimization') != '0' ++if get_option('optimization') in ['1', '2', '3', 's', 'g'] + efi_cflags += ['-O' + get_option('optimization')] + endif + if get_option('b_ndebug') == 'true' or ( diff --git a/sys-apps/systemd-utils/systemd-utils-251.7.ebuild b/sys-apps/systemd-utils/systemd-utils-251.7.ebuild index 46a55e226ca4..3f1741e3035d 100644 --- a/sys-apps/systemd-utils/systemd-utils-251.7.ebuild +++ b/sys-apps/systemd-utils/systemd-utils-251.7.ebuild @@ -108,6 +108,7 @@ src_prepare() { # Breaks Clang. Revert the commit for now and force off F_S=3. "${FILESDIR}/251-revert-fortify-source-3-fix.patch" "${FILESDIR}/251-gpt-auto-no-cryptsetup.patch" + "${FILESDIR}/251-meson-0.64.patch" ) if use elibc_musl; then |