From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex Vong Subject: [PATCH 1/2] daemon: Fix '--version'. Date: Wed, 24 Aug 2016 09:34:42 +0800 Message-ID: <87fupvx83x.fsf@gmail.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:53842) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bcN6f-0006la-E7 for guix-devel@gnu.org; Tue, 23 Aug 2016 21:35:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bcN6Z-0003QF-GE for guix-devel@gnu.org; Tue, 23 Aug 2016 21:35:52 -0400 Received: from mail-pf0-f175.google.com ([209.85.192.175]:36555) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bcN6Z-0003PY-9o for guix-devel@gnu.org; Tue, 23 Aug 2016 21:35:47 -0400 Received: by mail-pf0-f175.google.com with SMTP id h186so950331pfg.3 for ; Tue, 23 Aug 2016 18:35:47 -0700 (PDT) List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org --=-=-= Content-Type: text/plain Hi guixes, This one and the next patch fix '--version' of guix-daemon and guix-register. Currently, they are not working, which is the reason why help2man gives error when building from source. --=-=-= Content-Type: text/x-diff; charset=utf-8 Content-Disposition: inline; filename=0001-daemon-Fix-version.patch Content-Transfer-Encoding: quoted-printable >From 06d97b6de29aedeec7efe6f9a1e654145183a06b Mon Sep 17 00:00:00 2001 From: Alex Vong Date: Wed, 24 Aug 2016 08:25:48 +0800 Subject: [PATCH 1/2] daemon: Fix '--version'. * nix/nix-daemon/guix-daemon.cc (argp_program_version): Assigning instead of declaring. (argp_program_bug_address): Likewise. --- nix/nix-daemon/guix-daemon.cc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/nix/nix-daemon/guix-daemon.cc b/nix/nix-daemon/guix-daemon.cc index d5d33a5..41b56cb 100644 --- a/nix/nix-daemon/guix-daemon.cc +++ b/nix/nix-daemon/guix-daemon.cc @@ -1,5 +1,6 @@ /* GNU Guix --- Functional package management for GNU Copyright (C) 2012, 2013, 2014, 2015, 2016 Ludovic Court=C3=A8s + Copyright (C) 2016 Alex Vong =20 This file is part of GNU Guix. =20 @@ -53,10 +54,6 @@ extern void run (Strings args); static const char guix_textdomain[] =3D "guix"; =20 =20 -const char *argp_program_version =3D - "guix-daemon (" PACKAGE_NAME ") " PACKAGE_VERSION; -const char *argp_program_bug_address =3D PACKAGE_BUGREPORT; - static char doc[] =3D n_("guix-daemon -- perform derivation builds and store accesses") "\v\n" @@ -344,6 +341,8 @@ main (int argc, char *argv[]) settings.useBuildHook =3D false; #endif =20 + argp_program_version =3D "guix-daemon (" PACKAGE_NAME ") " PACKAGE_V= ERSION; + argp_program_bug_address =3D PACKAGE_BUGREPORT; argp_parse (&argp, argc, argv, 0, 0, 0); =20 /* Effect all the changes made via 'settings.set'. */ --=20 2.9.3 --=-=-=--