From e9d903f146865db5948abd271a5c7e763681b4e9 Mon Sep 17 00:00:00 2001
From: Jakob Kirsch <jakob.kirsch@web.de>
Date: Thu, 19 Sep 2024 11:54:55 +0200
Subject: gnu: lxc: Update to 6.0.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/virtualization.scm (lxc): Update to 6.0.1.
[source] Add patch lxc-no-static-bin.patch.
[build-system]: Change to meson-build-system.
[inputs]: Add apparmor and dbus.
[arguments]: Replace “--docdir=…” with “-Ddoc-path=…”.
Replace “--sysconfdir=/etc” with “-Ddistrosysconfdir=/etc”.
Remove “--localstatedir=/var”.
Add “-Dinit-script=sysvinit”.
Add “-Dinstall-state-dirs=false”.
Add “-Dinstall-init-files=false”.
Add “-Dspecfile=false”.
Add “-Db_lto=false”.
<#:phases>: No longer replace ‘install’.
* gnu/packages/patches/lxc-static-link.patch: Add patch.
* gnu/local.mk (dist_patch_DATA): Register it here.

Change-Id: I089d53611a996e44cb9a92986c2b8de9cb69634f
Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
---
 gnu/packages/patches/lxc-no-static-bin.patch | 58 ++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 gnu/packages/patches/lxc-no-static-bin.patch

(limited to 'gnu/packages/patches')

diff --git a/gnu/packages/patches/lxc-no-static-bin.patch b/gnu/packages/patches/lxc-no-static-bin.patch
new file mode 100644
index 0000000000..bad1771f09
--- /dev/null
+++ b/gnu/packages/patches/lxc-no-static-bin.patch
@@ -0,0 +1,58 @@
+init.lxc.static is only used as a fallback and breaks ‘strip-runpath’,
+so let's not build it.
+
+Index: lxc-6.0.1/src/lxc/cmd/meson.build
+===================================================================
+--- lxc-6.0.1.orig/src/lxc/cmd/meson.build
++++ lxc-6.0.1/src/lxc/cmd/meson.build
+@@ -62,19 +62,6 @@ cmd_lxc_update_config = configure_file(
+     output: 'lxc-update-config')
+ install_data(join_paths(project_build_root, 'src/lxc/cmd/lxc-update-config'), install_dir: bindir)
+ 
+-if sanitize == 'none' and libcap_static_linkable
+-    cmd_programs += executable(
+-        'init.lxc.static',
+-        cmd_lxc_init_sources,
+-        include_directories: liblxc_includes,
+-        link_with: [liblxc_static],
+-        link_args: ['-static'],
+-        c_args: ['-DNO_LXC_CONF'],
+-        dependencies: [libcap_static] + liblxc_dependency_headers,
+-        install_dir: sbindir,
+-        install: true)
+-endif
+-
+ cmd_programs += executable(
+     'init.lxc',
+     cmd_lxc_init_sources,
+Index: lxc-6.0.1/meson.build
+===================================================================
+--- lxc-6.0.1.orig/meson.build
++++ lxc-6.0.1/meson.build
+@@ -426,26 +426,11 @@ if want_capabilities
+     pkgconfig_libs += libcap
+     liblxc_dependencies += libcap
+ 
+-    libcap_static = dependency('libcap', required: false, static: true)
+-    if not libcap_static.found()
+-        # Compat with Ubuntu 14.04 which ships libcap w/o .pc file
+-        libcap_static = cc.find_library('cap', required: false, static: true)
+-    endif
+-
+     code = '''
+ int main(int argc, char *argv[]) { return 0; };
+ '''
+-    if libcap_static.found()
+-        libcap_static_linkable = cc.links(code, args: '-static', dependencies: libcap_static)
+-    else
+-        libcap_static_linkable = false
+-    endif
+-    srcconf.set10('HAVE_STATIC_LIBCAP', libcap_static_linkable)
+ else
+-    libcap_static = []
+-    libcap_static_linkable = false
+     srcconf.set10('HAVE_LIBCAP', false)
+-    srcconf.set10('HAVE_STATIC_LIBCAP', false)
+ endif
+ 
+ libutil = cc.find_library('util', required: false)
-- 
cgit v1.2.3