diff options
| author | Peter Simons <simons@cryp.to> | 2013-10-03 17:08:56 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2013-10-03 17:09:02 +0200 |
| commit | e857fee7a7314be0ae6a47ed4e2421f800b9f75e (patch) | |
| tree | 72da96ee4aacde3ff5d6e9cff53250740a70ec23 /pkgs/os-specific/linux/lxc/support-db2x.patch | |
| parent | 9c6e0e584c8b19956897ac949acc925ea4576523 (diff) | |
| download | nixlib-e857fee7a7314be0ae6a47ed4e2421f800b9f75e.tar nixlib-e857fee7a7314be0ae6a47ed4e2421f800b9f75e.tar.gz nixlib-e857fee7a7314be0ae6a47ed4e2421f800b9f75e.tar.bz2 nixlib-e857fee7a7314be0ae6a47ed4e2421f800b9f75e.tar.lz nixlib-e857fee7a7314be0ae6a47ed4e2421f800b9f75e.tar.xz nixlib-e857fee7a7314be0ae6a47ed4e2421f800b9f75e.tar.zst nixlib-e857fee7a7314be0ae6a47ed4e2421f800b9f75e.zip | |
lxc: update to current git HEAD 1.0.0.alpha1-92-g8111adf
The developers claim that the new version works on systemd-based hosts.
Diffstat (limited to 'pkgs/os-specific/linux/lxc/support-db2x.patch')
| -rw-r--r-- | pkgs/os-specific/linux/lxc/support-db2x.patch | 41 |
1 files changed, 14 insertions, 27 deletions
diff --git a/pkgs/os-specific/linux/lxc/support-db2x.patch b/pkgs/os-specific/linux/lxc/support-db2x.patch index 8be7f5f0a92b..4662ca2e5048 100644 --- a/pkgs/os-specific/linux/lxc/support-db2x.patch +++ b/pkgs/os-specific/linux/lxc/support-db2x.patch @@ -1,29 +1,16 @@ -diff -ubr lxc-0.9.0-orig/configure lxc-0.9.0/configure ---- lxc-0.9.0-orig/configure 2013-04-15 10:50:22.899103057 +0200 -+++ lxc-0.9.0/configure 2013-04-15 11:08:08.696539776 +0200 -@@ -4792,7 +4792,7 @@ - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for docbook2x-man" >&5 - $as_echo_n "checking for docbook2x-man... " >&6; } -- for name in docbook2x-man db2x_docbook2man; do -+ for name in docbook2x-man db2x_docbook2man docbook2man; do - if "$name" --help >/dev/null 2>&1; then - db2xman="$name" - break; -@@ -8353,4 +8353,3 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 - $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} +diff --git a/configure.ac b/configure.ac +index 92a4690..4dd341b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -91,9 +91,9 @@ if test "x$enable_doc" = "xyes" -o "x$enable_doc" = "xauto"; then + AC_SUBST(db2xman) fi -- -diff -ubr lxc-0.9.0-orig/configure.ac lxc-0.9.0/configure.ac ---- lxc-0.9.0-orig/configure.ac 2013-04-15 10:50:22.896102806 +0200 -+++ lxc-0.9.0/configure.ac 2013-04-15 11:07:52.399582819 +0200 -@@ -67,7 +67,7 @@ - db2xman="" + AM_CONDITIONAL([ENABLE_DOCBOOK], [test "x$db2xman" != "x"]) +-AM_CONDITIONAL([USE_DOCBOOK2X], [test "x$db2xman" != "xdocbook2man"]) ++AM_CONDITIONAL([USE_DOCBOOK2X], [test "x$db2xman" != "no-no-no"]) - AC_MSG_CHECKING(for docbook2x-man) -- for name in docbook2x-man db2x_docbook2man; do -+ for name in docbook2x-man db2x_docbook2man docbook2man; do - if "$name" --help >/dev/null 2>&1; then - db2xman="$name" - break; +-if test "x$db2xman" = "xdocbook2man"; then ++if test "x$db2xman" = "no-no-no"; then + docdtd="\"-//Davenport//DTD DocBook V3.0//EN\"" + else + docdtd="\"-//OASIS//DTD DocBook XML\" \"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd\"" |