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) >path: root/gnu/packages/openbox.scm
AgeCommit message (Expand)Author
2017-01-15gnu: Add obconf....* gnu/packages/openbox.scm (obconf): New variable. Signed-off-by: Marius Bakke <mbakke@fastmail.com> ng0
2016-08-10gnu: openbox: Update source location....* gnu/packages/openbox.scm (openbox)[source]: Download from openbox.org. Efraim Flashner
2016-08-10gnu: openbox: Fix autostart....* gnu/packages/openbox.scm (openbox)[inputs]: Add python2. [propagated-inputs]: Add python2-pyxdg. Efraim Flashner
2016-02-14gnu: openbox: Update to 3.6.1....* gnu/packages/openbox.scm (openbox): Update to 3.6.1. Efraim Flashner
2015-07-18gnu packages: Clean up synopses and descriptions....* gnu/packages/admin.scm, gnu/packages/algebra.scm, gnu/packages/audio.scm, gnu/packages/backup.scm, gnu/packages/base.scm, gnu/packages/bittorrent.scm, gnu/packages/code.scm, gnu/packages/compression.scm, gnu/packages/databases.scm, gnu/packages/enchant.scm, gnu/packages/firmware.scm, gnu/packages/fonts.scm, gnu/packages/freedesktop.scm, gnu/packages/games.scm, gnu/packages/gd.scm, gnu/packages/gl.scm, gnu/packages/gnome.scm, gnu/packages/gsasl.scm, gnu/packages/gstreamer.scm, gnu/packages/gtk.scm, gnu/packages/guile.scm, gnu/packages/haskell.scm, gnu/packages/language.scm, gnu/packages/lesstif.scm, gnu/packages/libreoffice.scm, gnu/packages/linux.scm, gnu/packages/llvm.scm, gnu/packages/maths.scm, gnu/packages/mcrypt.scm, gnu/packages/mit-krb5.scm, gnu/packages/mp3.scm, gnu/packages/ncdu.scm, gnu/packages/networking.scm, gnu/packages/ntp.scm, gnu/packages/ocaml.scm, gnu/packages/openbox.scm, gnu/packages/pdf.scm, gnu/packages/perl.scm, gnu/packages/pretty-print.scm, gnu/packages/pulseaudio.scm, gnu/packages/python.scm, gnu/packages/rdesktop.scm, gnu/packages/rdf.scm, gnu/packages/ruby.scm, gnu/packages/slang.scm, gnu/packages/slim.scm, gnu/packages/telephony.scm, gnu/packages/tls.scm, gnu/packages/tmux.scm, gnu/packages/tre.scm, gnu/packages/unrtf.scm, gnu/packages/version-control.scm, gnu/packages/vpn.scm, gnu/packages/web.scm, gnu/packages/wget.scm, gnu/packages/xdisorg.scm, gnu/packages/xfce.scm, gnu/packages/xiph.scm: Fix typos. Trim long lines. Add missing periods in the end of sentences. Use double spaces between sentences. Remove trailing whitespaces. Alex Kost
2014-11-18gnu: Add Openbox....* gnu/packages/openbox.scm: New file. * gnu-system.am (GNU_SYSTEM_MODULES): Add it. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Julien Lepiller