unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Eric Bavier <bavier@cray.com>
To: 28765@debbugs.gnu.org
Subject: [bug#28765] [PATCH] config: Conditionally configure daemon offload script.
Date: Mon, 9 Oct 2017 19:08:21 +0000	[thread overview]
Message-ID: <CY4PR11MB17189D487BEBC3AA8150097AB7740@CY4PR11MB1718.namprd11.prod.outlook.com> (raw)

[-- Attachment #1: Type: text/plain, Size: 139 bytes --]

This prevents pre-inst-env from exporting NIX_BUILD_HOOK when guile-ssh is not available.

Eric Bavier, Scientific Libraries, Cray Inc.

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-config-Conditionally-configure-daemon-offload-script.patch --]
[-- Type: text/x-patch; name="0001-config-Conditionally-configure-daemon-offload-script.patch", Size: 1024 bytes --]

From 984e324370c2c17d8d1a982adf2884112c9e64b7 Mon Sep 17 00:00:00 2001
From: Eric Bavier <bavier@cray.com>
Date: Mon, 9 Oct 2017 13:58:04 -0500
Subject: [PATCH] config: Conditionally configure daemon offload script.

* config-daemon.ac (nix/scripts/offload): Configure only if offloading enabled.
---
 config-daemon.ac | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/config-daemon.ac b/config-daemon.ac
index 42b5981..841e0ac 100644
--- a/config-daemon.ac
+++ b/config-daemon.ac
@@ -159,8 +159,10 @@ if test "x$guix_build_daemon" = "xyes"; then
     [chmod +x nix/scripts/substitute])
   AC_CONFIG_FILES([nix/scripts/guix-authenticate],
     [chmod +x nix/scripts/guix-authenticate])
-  AC_CONFIG_FILES([nix/scripts/offload],
-    [chmod +x nix/scripts/offload])
+  if test "x$guix_build_daemon_offload" = "xyes"; then
+    AC_CONFIG_FILES([nix/scripts/offload],
+      [chmod +x nix/scripts/offload])
+  fi
 fi
 
 AM_CONDITIONAL([BUILD_DAEMON], [test "x$guix_build_daemon" = "xyes"])
-- 
1.8.5.6


             reply	other threads:[~2017-10-09 19:09 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-10-09 19:08 Eric Bavier [this message]
2017-10-09 21:07 ` [bug#28765] [PATCH] config: Conditionally configure daemon offload script Ludovic Courtès
2017-10-10  0:08   ` Eric Bavier
2017-10-10  6:49     ` Ludovic Courtès
2017-10-10 13:00       ` Eric Bavier
2017-10-10 14:17         ` Ludovic Courtès
2017-10-11  4:18           ` bug#28765: " Eric Bavier

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=CY4PR11MB17189D487BEBC3AA8150097AB7740@CY4PR11MB1718.namprd11.prod.outlook.com \
    --to=bavier@cray.com \
    --cc=28765@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).