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) v class='path'>path: root/gnu/packages/syncthing.scm
AgeCommit message (Expand)Author
2020-05-22gnu: Syncthing: Update to 1.5.0....* gnu/packages/syncthing.scm (syncthing): Update to 1.5.0. [inputs]: Replace go-gopkg.in-ldap.v2 with go-github-com-go-ldap-ldap. Leo Famulari
2020-05-22gnu: Change name of Go ldap package and update to 3.1.7....* gnu/packages/syncthing.scm (go-gopkg.in-ldap.v2): Replace with ... (go-github-com-go-ldap-ldap): ... new variable. Leo Famulari
2020-05-22gnu: Change name of Go asn1-ber package and update to 1.3.1....* gnu/packages/syncthing.scm (go-gopkg.in-asn1-ber.v1): Replace with ... (go-github-com-go-asn1-ber-asn1-ber): ... new variable. [arguments]: Remove custom 'check' phase. Leo Famulari
2020-05-22gnu: go-github-com-jackpal-gateway: Update to 1.0.6....* gnu/packages/syncthing.scm (go-github-com-jackpal-gateway): Update to 1.0.6. Leo Famulari
2020-04-12gnu: go-github-com-audriusbutkevicius-pfilter: Update to 0.0.5....* gnu/packages/syncthing.scm (go-github-com-audriusbutkevicius-pfilter) [version]: Correctly identify commit as version tag 0.0.5. Efraim Flashner
2020-04-11gnu: syncthing: Update to 1.4.2....* gnu/packages/syncthing.scm (syncthing): Update to 1.4.2. Tobias Geerinckx-Rice
2020-04-07gnu: Syncthing: Update to 1.4.1....* gnu/packages/syncthing.scm (syncthing): Update to 1.4.1. Leo Famulari