From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E003715813A for ; Wed, 22 Jan 2025 07:33:54 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id C98D6340CBB for ; Wed, 22 Jan 2025 07:33:54 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 41DBF11042D; Wed, 22 Jan 2025 07:33:51 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 3CBE111042D for ; Wed, 22 Jan 2025 07:33:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D79A933FE60 for ; Wed, 22 Jan 2025 07:33:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 413C5236B for ; Wed, 22 Jan 2025 07:33:49 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1737531114.a7fc4432516e9f87d57a2abfb8e1474b4893ecaf.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/util-linux/files/util-linux-9999-meson-disabler.patch X-VCS-Directories: sys-apps/util-linux/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: a7fc4432516e9f87d57a2abfb8e1474b4893ecaf X-VCS-Branch: master Date: Wed, 22 Jan 2025 07:33:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 11a78bb5-e993-493d-b2a5-8648d56f999e X-Archives-Hash: f6c207987c831d93c66b6b515eb70601 commit: a7fc4432516e9f87d57a2abfb8e1474b4893ecaf Author: Sam James gentoo org> AuthorDate: Wed Jan 22 07:31:54 2025 +0000 Commit: Sam James gentoo org> CommitDate: Wed Jan 22 07:31:54 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7fc4432 sys-apps/util-linux: drop upstreamed meson patch Signed-off-by: Sam James gentoo.org> .../files/util-linux-9999-meson-disabler.patch | 405 --------------------- 1 file changed, 405 deletions(-) diff --git a/sys-apps/util-linux/files/util-linux-9999-meson-disabler.patch b/sys-apps/util-linux/files/util-linux-9999-meson-disabler.patch deleted file mode 100644 index 956199a4dc32..000000000000 --- a/sys-apps/util-linux/files/util-linux-9999-meson-disabler.patch +++ /dev/null @@ -1,405 +0,0 @@ -https://github.com/util-linux/util-linux/pull/3351 - -From 528dbe18854fb16dba41af620ee2ca295936a550 Mon Sep 17 00:00:00 2001 -From: Sam James -Date: Wed, 8 Jan 2025 06:49:40 +0000 -Subject: [PATCH] meson: add missing `is_disabler` checks - -Noticed this when looking at why the `check` target isn't created -with `-Dauto_features=disabled`. This doesn't fix that but it does -fix a bunch of issues I noticed along the way after a hint from Eli Schwartz. ---- - meson.build | 133 +++++++++++++++++++++++++++++++++++++--------------- - 1 file changed, 95 insertions(+), 38 deletions(-) - -diff --git a/meson.build b/meson.build -index 462ceaae224..b87362c757c 100644 ---- a/meson.build -+++ b/meson.build -@@ -2026,7 +2026,7 @@ if opt and not is_disabler(exe) - endif - - opt = not get_option('build-switch_root').disabled() --if opt and not have_dirfd and not have_ddfd -+if opt and not have_dirfd and not have_ddfd - error('neither dirfd nor ddfd are available') - endif - exe = executable( -@@ -2520,7 +2520,7 @@ exe4 = executable( - install_dir : usrsbin_exec_dir, - install : opt, - build_by_default : opt) --if opt -+if opt and not is_disabler(exe) - exes += [exe, exe2, exe3, exe4] - manadocs += ['disk-utils/addpart.8.adoc', - 'disk-utils/delpart.8.adoc', -@@ -2568,7 +2568,7 @@ exe4 = executable( - install : opt, - build_by_default : opt) - --if opt -+if opt and not is_disabler(exe) - exes += [exe, exe2, exe3, exe4] - endif - -@@ -2651,7 +2651,7 @@ exe = executable( - install_dir : sbindir, - install : opt, - build_by_default : opt) --if opt -+if opt and not is_disabler(exe) - exes += exe - manadocs += ['term-utils/agetty.8.adoc'] - endif -@@ -2666,7 +2666,7 @@ exe = executable( - install_dir : usrbin_exec_dir, - install : opt, - build_by_default : opt) --if opt -+if opt and not is_disabler(exe) - exes += exe - manadocs += ['term-utils/setterm.1.adoc'] - bashcompletions += ['setterm'] -@@ -2681,7 +2681,7 @@ exe = executable( - install_dir : usrbin_exec_dir, - install : opt, - build_by_default : opt) --if opt -+if opt and not is_disabler(exe) - exes += exe - manadocs += ['term-utils/mesg.1.adoc'] - bashcompletions += ['mesg'] -@@ -2705,7 +2705,7 @@ exe = executable( - install_mode : tty_install_mode, - install : opt, - build_by_default : opt) --if opt -+if opt and not is_disabler(exe) - exes += exe - manadocs += ['term-utils/wall.1.adoc'] - bashcompletions += ['wall'] -@@ -2725,7 +2725,7 @@ exe = executable( - install_mode : tty_install_mode, - install : opt, - build_by_default : opt) --if opt -+if opt and not is_disabler(exe) - exes += exe - manadocs += ['term-utils/write.1.adoc'] - bashcompletions += ['write'] -@@ -3384,7 +3384,9 @@ exe = executable( - include_directories : dir_include, - link_with : lib_common, - build_by_default: program_tests) --exes += exe -+if not is_disabler(exe) -+ exes += exe -+endif - - exe = executable( - 'test_blkdev', -@@ -3393,7 +3395,9 @@ exe = executable( - include_directories : dir_include, - link_with : lib_common, - build_by_default: program_tests) --exes += exe -+if not is_disabler(exe) -+ exes += exe -+endif - - exe = executable( - 'test_ismounted', -@@ -3402,7 +3406,9 @@ exe = executable( - include_directories : dir_include, - link_with : lib_common, - build_by_default: program_tests) --exes += exe -+if not is_disabler(exe) -+ exes += exe -+endif - - exe = executable( - 'test_mangle', -@@ -3410,7 +3416,9 @@ exe = executable( - c_args : ['-DTEST_PROGRAM_MANGLE'], - include_directories : dir_include, - build_by_default: program_tests) --exes += exe -+if not is_disabler(exe) -+ exes += exe -+endif - - exe = executable( - 'test_strutils', -@@ -3418,7 +3426,9 @@ exe = executable( - c_args : ['-DTEST_PROGRAM_STRUTILS'], - include_directories : dir_include, - build_by_default: program_tests) --exes += exe -+if not is_disabler(exe) -+ exes += exe -+endif - - exe = executable( - 'test_colors', -@@ -3428,7 +3438,9 @@ exe = executable( - include_directories : dir_include, - link_with : [lib_common, lib_tcolors], - build_by_default: program_tests) --exes += exe -+if not is_disabler(exe) -+ exes += exe -+endif - - exe = executable( - 'test_randutils', -@@ -3436,7 +3448,9 @@ exe = executable( - c_args : ['-DTEST_PROGRAM_RANDUTILS'], - include_directories : dir_include, - build_by_default: program_tests) --exes += exe -+if not is_disabler(exe) -+ exes += exe -+endif - - if conf.get('HAVE_OPENAT').to_string() == '1' \ - and conf.get('HAVE_DIRFD').to_string() == '1' -@@ -3447,7 +3461,9 @@ if conf.get('HAVE_OPENAT').to_string() == '1' \ - include_directories : dir_include, - link_with : lib_common, - build_by_default: program_tests) -- exes += exe -+ if not is_disabler(exe) -+ exes += exe -+ endif - - exe = executable( - 'test_path', -@@ -3458,7 +3474,9 @@ if conf.get('HAVE_OPENAT').to_string() == '1' \ - include_directories : dir_include, - link_with : lib_common, - build_by_default: program_tests) -- exes += exe -+ if not is_disabler(exe) -+ exes += exe -+ endif - endif - - if have_pty -@@ -3473,7 +3491,9 @@ if have_pty - realtime_libs, - lib_util], - build_by_default: program_tests) -- exes += exe -+ if not is_disabler(exe) -+ exes += exe -+ endif - endif - - if LINUX -@@ -3483,7 +3503,9 @@ if LINUX - c_args : ['-DTEST_PROGRAM_CPUSET'], - include_directories : dir_include, - build_by_default: program_tests) -- exes += exe -+ if not is_disabler(exe) -+ exes += exe -+ endif - endif - - exe = executable( -@@ -3497,7 +3519,9 @@ exe = executable( - c_args : ['-DTEST_PROGRAM_SYSFS'], - include_directories : dir_include, - build_by_default: program_tests) --exes += exe -+if not is_disabler(exe) -+ exes += exe -+endif - - exe = executable( - 'test_pager', -@@ -3505,7 +3529,9 @@ exe = executable( - c_args : ['-DTEST_PROGRAM_PAGER'], - include_directories : dir_include, - build_by_default: program_tests) --exes += exe -+if not is_disabler(exe) -+ exes += exe -+endif - - exe = executable( - 'test_linux_version', -@@ -3513,7 +3539,9 @@ exe = executable( - c_args : ['-DTEST_PROGRAM_LINUXVERSION'], - include_directories : dir_include, - build_by_default: program_tests) --exes += exe -+if not is_disabler(exe) -+ exes += exe -+endif - - exe = executable( - 'test_fileutils', -@@ -3521,7 +3549,9 @@ exe = executable( - c_args : ['-DTEST_PROGRAM_FILEUTILS'], - include_directories : dir_include, - build_by_default: program_tests) --exes += exe -+if not is_disabler(exe) -+ exes += exe -+endif - - exe = executable( - 'test_canonicalize', -@@ -3529,7 +3559,9 @@ exe = executable( - c_args : ['-DTEST_PROGRAM_CANONICALIZE'], - include_directories : dir_include, - build_by_default: program_tests) --exes += exe -+if not is_disabler(exe) -+ exes += exe -+endif - - exe = executable( - 'test_timeutils', -@@ -3538,7 +3570,9 @@ exe = executable( - c_args : ['-DTEST_PROGRAM_TIMEUTILS'], - include_directories : dir_include, - build_by_default: program_tests) --exes += exe -+if not is_disabler(exe) -+ exes += exe -+endif - - exe = executable( - 'test_pwdutils', -@@ -3547,7 +3581,9 @@ exe = executable( - include_directories : dir_include, - link_with : lib_common, - build_by_default: program_tests) --exes += exe -+if not is_disabler(exe) -+ exes += exe -+endif - - exe = executable( - 'test_logindefs', -@@ -3556,8 +3592,9 @@ exe = executable( - include_directories : dir_include, - link_with : [lib_common, logindefs_c], - build_by_default: program_tests) --exes += exe -- -+if not is_disabler(exe) -+ exes += exe -+endif - - ############################################################ - -@@ -3699,14 +3736,18 @@ exe = executable( - include_directories : includes, - link_with : lib_common, - build_by_default: program_tests) --exes += exe -+if not is_disabler(exe) -+ exes += exe -+endif - - exe = executable( - 'test_byteswap', - 'tests/helpers/test_byteswap.c', - include_directories : includes, - build_by_default: program_tests) --exes += exe -+if not is_disabler(exe) -+ exes += exe -+endif - - exe = executable( - 'test_md5', -@@ -3714,7 +3755,9 @@ exe = executable( - md5_c, - include_directories : includes, - build_by_default: program_tests) --exes += exe -+if not is_disabler(exe) -+ exes += exe -+endif - - exe = executable( - 'test_sha1', -@@ -3722,28 +3765,36 @@ exe = executable( - sha1_c, - include_directories : includes, - build_by_default: program_tests) --exes += exe -+if not is_disabler(exe) -+ exes += exe -+endif - - exe = executable( - 'test_pathnames', - 'tests/helpers/test_pathnames.c', - include_directories : includes, - build_by_default: program_tests) --exes += exe -+if not is_disabler(exe) -+ exes += exe -+endif - - exe = executable( - 'test_strerror', - 'tests/helpers/test_strerror.c', - include_directories : includes, - build_by_default: program_tests) --exes += exe -+if not is_disabler(exe) -+ exes += exe -+endif - - exe = executable( - 'test_sysinfo', - 'tests/helpers/test_sysinfo.c', - include_directories : includes, - build_by_default: program_tests) --exes += exe -+if not is_disabler(exe) -+ exes += exe -+endif - - exe = executable( - 'test_sigreceive', -@@ -3751,7 +3802,9 @@ exe = executable( - include_directories : includes, - link_with : lib_common, - build_by_default: program_tests) --exes += exe -+if not is_disabler(exe) -+ exes += exe -+endif - - exe = executable( - 'test_sigstate', -@@ -3759,14 +3812,18 @@ exe = executable( - include_directories : includes, - link_with : lib_common, - build_by_default: program_tests) --exes += exe -+if not is_disabler(exe) -+ exes += exe -+endif - - exe = executable( - 'test_tiocsti', - 'tests/helpers/test_tiocsti.c', - include_directories : includes, - build_by_default: program_tests) --exes += exe -+if not is_disabler(exe) -+ exes += exe -+endif - - exe = executable( - 'test_uuid_namespace',