| 1 | init.lxc.static is only used as a fallback and breaks ‘strip-runpath’,
|
| 2 | so let's not build it.
|
| 3 |
|
| 4 | Index: lxc-6.0.1/src/lxc/cmd/meson.build
|
| 5 | ===================================================================
|
| 6 | |
| 7 | |
| 8 | @@ -62,19 +62,6 @@ cmd_lxc_update_config = configure_file(
|
| 9 | output: 'lxc-update-config')
|
| 10 | install_data(join_paths(project_build_root, 'src/lxc/cmd/lxc-update-config'), install_dir: bindir)
|
| 11 |
|
| 12 | -if sanitize == 'none' and libcap_static_linkable
|
| 13 | - cmd_programs += executable(
|
| 14 | - 'init.lxc.static',
|
| 15 | - cmd_lxc_init_sources,
|
| 16 | - include_directories: liblxc_includes,
|
| 17 | - link_with: [liblxc_static],
|
| 18 | - link_args: ['-static'],
|
| 19 | - c_args: ['-DNO_LXC_CONF'],
|
| 20 | - dependencies: [libcap_static] + liblxc_dependency_headers,
|
| 21 | - install_dir: sbindir,
|
| 22 | - install: true)
|
| 23 | -endif
|
| 24 | -
|
| 25 | cmd_programs += executable(
|
| 26 | 'init.lxc',
|
| 27 | cmd_lxc_init_sources,
|
| 28 | Index: lxc-6.0.1/meson.build
|
| 29 | ===================================================================
|
| 30 | |
| 31 | |
| 32 | @@ -426,26 +426,11 @@ if want_capabilities
|
| 33 | pkgconfig_libs += libcap
|
| 34 | liblxc_dependencies += libcap
|
| 35 |
|
| 36 | - libcap_static = dependency('libcap', required: false, static: true)
|
| 37 | - if not libcap_static.found()
|
| 38 | - # Compat with Ubuntu 14.04 which ships libcap w/o .pc file
|
| 39 | - libcap_static = cc.find_library('cap', required: false, static: true)
|
| 40 | - endif
|
| 41 | -
|
| 42 | code = '''
|
| 43 | int main(int argc, char *argv[]) { return 0; };
|
| 44 | '''
|
| 45 | - if libcap_static.found()
|
| 46 | - libcap_static_linkable = cc.links(code, args: '-static', dependencies: libcap_static)
|
| 47 | - else
|
| 48 | - libcap_static_linkable = false
|
| 49 | - endif
|
| 50 | - srcconf.set10('HAVE_STATIC_LIBCAP', libcap_static_linkable)
|
| 51 | else
|
| 52 | - libcap_static = []
|
| 53 | - libcap_static_linkable = false
|
| 54 | srcconf.set10('HAVE_LIBCAP', false)
|
| 55 | - srcconf.set10('HAVE_STATIC_LIBCAP', false)
|
| 56 | endif
|
| 57 |
|
| 58 | libutil = cc.find_library('util', required: false)
|