diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-10-28 15:59:37 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-10-28 15:59:37 +0100 |
commit | cf7630078a53ff74b245b148bd722994068e28f9 (patch) | |
tree | b2410f6c46e821d66a697e1b7e551607357264f0 /sys-boot/systemd-boot/files | |
parent | 8eb973cc2247ee4fe34e4d907fdc6cf5b94709e3 (diff) |
gentoo auto-resync : 28:10:2022 - 15:59:37
Diffstat (limited to 'sys-boot/systemd-boot/files')
-rw-r--r-- | sys-boot/systemd-boot/files/249-libshared-static.patch | 27 | ||||
-rw-r--r-- | sys-boot/systemd-boot/files/249.9-cross-compile.patch | 23 |
2 files changed, 0 insertions, 50 deletions
diff --git a/sys-boot/systemd-boot/files/249-libshared-static.patch b/sys-boot/systemd-boot/files/249-libshared-static.patch deleted file mode 100644 index c08e451af9fc..000000000000 --- a/sys-boot/systemd-boot/files/249-libshared-static.patch +++ /dev/null @@ -1,27 +0,0 @@ -From eac425295227c5deda4536fd647ecf11b643e1ca Mon Sep 17 00:00:00 2001 -From: Mike Gilbert <floppym@gentoo.org> -Date: Sun, 29 Aug 2021 09:22:33 -0400 -Subject: [PATCH] Link bootctl against libshared_static - ---- - meson.build | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/meson.build b/meson.build -index 738879eb21..96042b6906 100644 ---- a/meson.build -+++ b/meson.build -@@ -2150,9 +2150,8 @@ if conf.get('ENABLE_EFI') == 1 and conf.get('HAVE_BLKID') == 1 - 'bootctl', - 'src/boot/bootctl.c', - include_directories : includes, -- link_with : [libshared], -+ link_with : [libshared_static, libsystemd_static], - dependencies : [libblkid], -- install_rpath : rootlibexecdir, - install : true) - - public_programs += executable( --- -2.33.0 - diff --git a/sys-boot/systemd-boot/files/249.9-cross-compile.patch b/sys-boot/systemd-boot/files/249.9-cross-compile.patch deleted file mode 100644 index e063d303c7d8..000000000000 --- a/sys-boot/systemd-boot/files/249.9-cross-compile.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 3d7fd38ea938ab194366f40ed7aa413ad33f2fad Mon Sep 17 00:00:00 2001 -From: Yu Watanabe <watanabe.yu+github@gmail.com> -Date: Tue, 21 Dec 2021 20:10:09 +0900 -Subject: [PATCH] meson: fix cross compiling - -(cherry picked from commit 3112d756a36993900b70fbff98e69a2a43b970a8) ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 02495d16c9..c76cab535d 100644 ---- a/meson.build -+++ b/meson.build -@@ -442,7 +442,7 @@ conf.set('SIZEOF_DEV_T', cc.sizeof('dev_t', prefix : '#include <sys/types.h>')) - conf.set('SIZEOF_INO_T', cc.sizeof('ino_t', prefix : '#include <sys/types.h>')) - conf.set('SIZEOF_TIME_T', cc.sizeof('time_t', prefix : '#include <sys/time.h>')) - conf.set('SIZEOF_RLIM_T', cc.sizeof('rlim_t', prefix : '#include <sys/resource.h>')) --conf.set('SIZEOF_TIMEX_MEMBER', cc.sizeof('((struct timex *)0)->freq', prefix : '#include <sys/timex.h>')) -+conf.set('SIZEOF_TIMEX_MEMBER', cc.sizeof('typeof(((struct timex *)0)->freq)', prefix : '#include <sys/timex.h>')) - - decl_headers = ''' - #include <uchar.h> |