diff options
Diffstat (limited to 'filesystems/libblkid/files')
-rw-r--r-- | filesystems/libblkid/files/patch-libblkid_meson.build | 13 | ||||
-rw-r--r-- | filesystems/libblkid/files/patch-meson.build | 67 | ||||
-rw-r--r-- | filesystems/libblkid/files/patch-tools_poman-translate.sh | 11 |
3 files changed, 91 insertions, 0 deletions
diff --git a/filesystems/libblkid/files/patch-libblkid_meson.build b/filesystems/libblkid/files/patch-libblkid_meson.build new file mode 100644 index 000000000000..c1b100f4ab72 --- /dev/null +++ b/filesystems/libblkid/files/patch-libblkid_meson.build @@ -0,0 +1,13 @@ +--- libblkid/meson.build.orig 2025-06-24 07:55:28 UTC ++++ libblkid/meson.build +@@ -141,10 +141,8 @@ libblkid_link_args = [] + libblkid_link_depends = [] + libblkid_link_args = [] + +-if cc.has_link_argument('-Wl,--version-script=@0@'.format(libblkid_sym_path)) + libblkid_link_depends += [libblkid_sym] + libblkid_link_args += ['-Wl,--version-script=@0@'.format(libblkid_sym_path)] +-endif + + lib_blkid = both_libraries( + 'blkid', diff --git a/filesystems/libblkid/files/patch-meson.build b/filesystems/libblkid/files/patch-meson.build new file mode 100644 index 000000000000..f64f68b47e8f --- /dev/null +++ b/filesystems/libblkid/files/patch-meson.build @@ -0,0 +1,67 @@ +--- meson.build.orig 2025-06-24 07:55:28 UTC ++++ meson.build +@@ -861,7 +861,7 @@ conf.set('HAVE_DECL_VMADDR_CID_LOCAL', have ? 1 : fals + prefix : '#include <sys/socket.h>') + conf.set('HAVE_DECL_VMADDR_CID_LOCAL', have ? 1 : false) + +-build_plymouth_support = (not build_plymouth_support.disabled() and ++build_plymouth_support = (not build_plymouth_support.disabled() and + have_tiocglcktrmios and + have_sock_cloexec and + have_sock_nonblock and +@@ -1868,14 +1868,7 @@ endif + bashcompletions += ['zramctl'] + endif + +-exe = executable( +- 'prlimit', +- prlimit_sources, +- include_directories : includes, +- link_with : [lib_common, +- lib_smartcols], +- install_dir : usrbin_exec_dir, +- install : true) ++exe = disabler() + if not is_disabler(exe) + exes += exe + manadocs += prlimit_manadocs +@@ -1991,15 +1984,7 @@ endif + bashcompletions += ['swapoff'] + endif + +-exe = executable( +- 'lscpu', +- lscpu_sources, +- include_directories : includes, +- link_with : [lib_common, +- lib_smartcols], +- dependencies : [rtas_libs], +- install_dir : usrbin_exec_dir, +- install : true) ++exe = disabler() + if not is_disabler(exe) + exes += exe + manadocs += lscpu_manadocs +@@ -2021,13 +2006,7 @@ endif + bashcompletions += ['chcpu'] + endif + +-exe = executable( +- 'wdctl', +- wdctl_sources, +- include_directories : includes, +- link_with : [lib_common, +- lib_smartcols], +- install : true) ++exe = disabler() + if not is_disabler(exe) + exes += exe + manadocs += wdctl_manadocs +@@ -4024,7 +4003,6 @@ run_target( + depends : exes) + + +-manadocs += lib_tcolors_manadocs + if build_libblkid + manadocs += lib_blkid_manadocs + endif diff --git a/filesystems/libblkid/files/patch-tools_poman-translate.sh b/filesystems/libblkid/files/patch-tools_poman-translate.sh new file mode 100644 index 000000000000..ed558d9f2d9a --- /dev/null +++ b/filesystems/libblkid/files/patch-tools_poman-translate.sh @@ -0,0 +1,11 @@ +--- tools/poman-translate.sh.orig 2025-03-18 12:50:51 UTC ++++ tools/poman-translate.sh +@@ -82,7 +82,7 @@ mapfile -t PO4ACFG_TRANSLATIONS < <( awk '/\[type:asci + mapfile -t LOCALES < <( awk '/\[po4a_langs\]/ {for (i=2; i<=NF; i++) print $i}' "$PO4ACFG" ) + mapfile -t PO4ACFG_TRANSLATIONS < <( awk '/\[type:asciidoc\]/ {print $2;}' "$PO4ACFG" ) + +-mkdir --parents "$DESTDIR" ++mkdir -p "$DESTDIR" + + DESTDIR=$( OLDPWD=- CDPATH='' cd -P -- "$DESTDIR" && pwd ) + |