From 2cb26483945211e812d7a0351ae472a676cd9592 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 16 Aug 2022 14:30:35 +0100 Subject: gentoo auto-resync : 16:08:2022 - 14:30:35 --- .../lxc-5.0.0-dont-depend-on-static-libcap.patch | 27 ---------------- .../lxc-5.0.0-fix-strerror-r-char-p-musl.patch | 36 ---------------------- 2 files changed, 63 deletions(-) delete mode 100644 app-containers/lxc/files/lxc-5.0.0-dont-depend-on-static-libcap.patch delete mode 100644 app-containers/lxc/files/lxc-5.0.0-fix-strerror-r-char-p-musl.patch (limited to 'app-containers/lxc/files') diff --git a/app-containers/lxc/files/lxc-5.0.0-dont-depend-on-static-libcap.patch b/app-containers/lxc/files/lxc-5.0.0-dont-depend-on-static-libcap.patch deleted file mode 100644 index 74f3d353c561..000000000000 --- a/app-containers/lxc/files/lxc-5.0.0-dont-depend-on-static-libcap.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 7d72354898feac15bc4082130bcbe638bae02450 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 14 Jul 2022 17:03:40 +0200 -Subject: [PATCH] meson.build: fix build with -Dcapabilities=false - -Define libcap_static to an empty array to avoid the following build -failure with -Dcapabilities=false: - -output/build/lxc-5.0.0/src/lxc/cmd/meson.build:64:4: ERROR: Unknown variable "libcap_static". - -Signed-off-by: Fabrice Fontaine ---- - meson.build | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/meson.build b/meson.build -index 992fa08c72..4ed57a655b 100644 ---- a/meson.build -+++ b/meson.build -@@ -443,6 +443,7 @@ int main(int argc, char *argv[]) { return 0; }; - srcconf.set10('HAVE_STATIC_LIBCAP', false) - endif - else -+ libcap_static = [] - srcconf.set10('HAVE_LIBCAP', false) - srcconf.set10('HAVE_STATIC_LIBCAP', false) - endif diff --git a/app-containers/lxc/files/lxc-5.0.0-fix-strerror-r-char-p-musl.patch b/app-containers/lxc/files/lxc-5.0.0-fix-strerror-r-char-p-musl.patch deleted file mode 100644 index fdd7aa24ad8a..000000000000 --- a/app-containers/lxc/files/lxc-5.0.0-fix-strerror-r-char-p-musl.patch +++ /dev/null @@ -1,36 +0,0 @@ -https://github.com/lxc/lxc/commit/8ee8879083f40d2d0b9cef46d6a6907c1b5a814b - -From 8ee8879083f40d2d0b9cef46d6a6907c1b5a814b Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 14 Jul 2022 12:31:21 +0200 -Subject: [PATCH] src/lxc/log.h: fix STRERROR_R_CHAR_P - -STRERROR_R_CHAR_P is always defined to 0 or 1 depending on the value of -have_func_strerror_r_char_p in meson.build so replace #ifdef by #if to -avoid a redefinition build failure if char *strerror_r is not defined - -Signed-off-by: Fabrice Fontaine ---- - src/lxc/log.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/lxc/log.h b/src/lxc/log.h -index 554a2e1d48..fcddc679a8 100644 ---- a/src/lxc/log.h -+++ b/src/lxc/log.h -@@ -304,13 +304,13 @@ __lxc_unused static inline void LXC_##LEVEL(struct lxc_log_locinfo* locinfo, \ - * Helper macro to define errno string. - */ - #if HAVE_STRERROR_R -- #ifdef STRERROR_R_CHAR_P -+ #if STRERROR_R_CHAR_P - char *strerror_r(int errnum, char *buf, size_t buflen); - #else - int strerror_r(int errnum, char *buf, size_t buflen); - #endif - -- #ifdef STRERROR_R_CHAR_P -+ #if STRERROR_R_CHAR_P - #define lxc_log_strerror_r \ - char errno_buf[PATH_MAX / 2] = {"Failed to get errno string"}; \ - char *ptr = NULL; \ -- cgit v1.2.3