From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex Vong Subject: (ping!) Re: [PATCH 1/2] daemon: Fix '--version'. Date: Mon, 29 Aug 2016 09:31:25 +0800 Message-ID: <87y43guzrm.fsf@gmail.com> References: <87fupvx83x.fsf@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:43837) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1beBRI-0002Dw-0n for guix-devel@gnu.org; Sun, 28 Aug 2016 21:32:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1beBRD-0007Mi-Lq for guix-devel@gnu.org; Sun, 28 Aug 2016 21:32:38 -0400 Received: from mail-pf0-f195.google.com ([209.85.192.195]:35214) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1beBRD-0007MY-GY for guix-devel@gnu.org; Sun, 28 Aug 2016 21:32:35 -0400 Received: by mail-pf0-f195.google.com with SMTP id h186so8333401pfg.2 for ; Sun, 28 Aug 2016 18:32:34 -0700 (PDT) In-Reply-To: <87fupvx83x.fsf@gmail.com> (Alex Vong's message of "Wed, 24 Aug 2016 09:34:42 +0800") 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 Hi, Alex Vong writes: > 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. > > > 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=20 > This file is part of GNU Guix. >=20=20 > @@ -53,10 +54,6 @@ extern void run (Strings args); > static const char guix_textdomain[] =3D "guix"; >=20=20 >=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=20 > + argp_program_version =3D "guix-daemon (" PACKAGE_NAME ") " PACKAGE= _VERSION; > + argp_program_bug_address =3D PACKAGE_BUGREPORT; > argp_parse (&argp, argc, argv, 0, 0, 0); >=20=20 > /* Effect all the changes made via 'settings.set'. */ This patch and the other one fix the problem reported in , do they look good? Thanks, Alex