[PATCH] gdbserver: fix the standalone build

[PATCH] gdbserver: fix the standalone build

[Mircea Gherzan]

When direcltly invoking gdb/gdbserver/configure && make, the build will
fail because the $(host_alias) is empty and thus create-version.sh does
not get enough parameters.

2013-06-27  Mircea Gherzan  <mircea.gherzan@intel.com>

gdbserver:

	* Makefile.in (host_alias): Use @host@ instead of @host_alias@.

Signed-off-by: Mircea Gherzan <mircea.gherzan@intel.com>
---
 gdb/gdbserver/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in
index e5ecdd3..7a68ae3 100644
--- a/gdb/gdbserver/Makefile.in
+++ b/gdb/gdbserver/Makefile.in
@@ -18,7 +18,7 @@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 
-host_alias = @host_alias@
+host_alias = @host@
 target_alias = @target_alias@
 program_transform_name = @program_transform_name@
 bindir = @bindir@
-- 
1.7.12.4

Re: [PATCH] gdbserver: fix the standalone build

[Pedro Alves]

On 06/27/2013 03:22 PM, Mircea Gherzan wrote:
> When direcltly invoking gdb/gdbserver/configure && make, the build will
> fail because the $(host_alias) is empty and thus create-version.sh does
> not get enough parameters.

Wasn't this fixed by this patch?

commit b30a226a69f155ac6ab02a5dcb0ada444730d5b4
Author: qiyao <qiyao>
Date:   Thu Jun 27 00:12:13 2013 +0000

    gdb/

        * common/create-version.sh: Update comments.  Handle the case
        that TARGET_ALIAS is empty.

-- 
Pedro Alves

Re: [PATCH] gdbserver: fix the standalone build

[Mircea Gherzan]

On 27.06.2013 16:58, Pedro Alves wrote:
> On 06/27/2013 03:22 PM, Mircea Gherzan wrote:
>> When direcltly invoking gdb/gdbserver/configure && make, the build will
>> fail because the $(host_alias) is empty and thus create-version.sh does
>> not get enough parameters.
>
> Wasn't this fixed by this patch?

No, because in the standalone case both host_alias and target_alias are 
empty. The patch below only handles an empty target_alias.

-Mircea

> commit b30a226a69f155ac6ab02a5dcb0ada444730d5b4
> Author: qiyao <qiyao>
> Date:   Thu Jun 27 00:12:13 2013 +0000
>
>      gdb/
>
>          * common/create-version.sh: Update comments.  Handle the case
>          that TARGET_ALIAS is empty.
>


-- 

Intel GmbH
Dornacher Strasse 1
85622 Feldkirchen/Muenchen, Deutschland
Sitz der Gesellschaft: Feldkirchen bei Muenchen
Geschaeftsfuehrer: Christian Lamprechter, Hannes Schwaderer, Douglas Lusk
Registergericht: Muenchen HRB 47456
Ust.-IdNr./VAT Registration No.: DE129385895
Citibank Frankfurt a.M. (BLZ 502 109 00) 600119052

Re: [PATCH] gdbserver: fix the standalone build

[Tom Tromey]

>>>>> "Mircea" == Mircea Gherzan <mircea.gherzan@intel.com> writes:

Mircea> When direcltly invoking gdb/gdbserver/configure && make, the build will
Mircea> fail because the $(host_alias) is empty and thus create-version.sh does
Mircea> not get enough parameters.

Sorry about that.

I think it would be better to put quotes around the argument to
create-version.sh.  This would preserve compatibility with how things
worked before this change.

Tom

Re: [PATCH] gdbserver: fix the standalone build

[Pedro Alves]

On 06/27/2013 05:30 PM, Mircea Gherzan wrote:
> On 27.06.2013 16:58, Pedro Alves wrote:
>> On 06/27/2013 03:22 PM, Mircea Gherzan wrote:
>>> When direcltly invoking gdb/gdbserver/configure && make, the build will
>>> fail because the $(host_alias) is empty and thus create-version.sh does
>>> not get enough parameters.
>>
>> Wasn't this fixed by this patch?
> 
> No, because in the standalone case both host_alias and target_alias are 
> empty. The patch below only handles an empty target_alias.

Ah.

"The variables ‘build_alias’, ‘host_alias’, and ‘target_alias’ are
always exactly the arguments of --build, --host, and --target; in particular,
they are left empty if the user did not use them, even if the
corresponding AC_CANONICAL macro was run.

>
> -host_alias = @host_alias@
> +host_alias = @host@
>  target_alias = @target_alias@

and "host" is the canonical form, gotcha.

But instead of that, then, which I'd call a hack, we should
instead do:

host_alias = @host_alias@
target_alias = @target_alias@
+host = @host@
+target = @target@

version.c: Makefile $(srcdir)/../common/version.in $(srcdir)/../../bfd/version.h $(srcdir)/../common/create-version.sh
	$(SHELL) $(srcdir)/../common/create-version.sh $(srcdir)/.. \
-	    $(host_alias) $(target_alias) version.c
+	    $(host) $(target) version.c

In GDB, GDBserver, and elsewhere necessary.

-- 
Pedro Alves

Re: [PATCH] gdbserver: fix the standalone build

[Pedro Alves]

On 06/27/2013 06:42 PM, Pedro Alves wrote:
> On 06/27/2013 06:38 PM, Pedro Alves wrote:
> 
>> But instead of that, then, which I'd call a hack, we should
>> instead do:
> 
> Or better yet, do as Tom suggests, as I believe we do want
> to print the non-canonical string here, exactly as --host
> was specified.
> 

Even better, if $host_alias is empty, we should print $host, IMO:

 $ ./gdbserver --version
 GNU gdbserver (GDB) 7.6.0.20130529-cvs
 Copyright (C) 2013 Free Software Foundation, Inc.
 gdbserver is free software, covered by the GNU General Public License.
 This gdbserver was configured as ""

But that's a preexisting bug.

-- 
Pedro Alves

Re: [PATCH] gdbserver: fix the standalone build

[Pedro Alves]

On 06/27/2013 06:38 PM, Pedro Alves wrote:

> But instead of that, then, which I'd call a hack, we should
> instead do:

Or better yet, do as Tom suggests, as I believe we do want
to print the non-canonical string here, exactly as --host
was specified.

-- 
Pedro Alves

Re: [PATCH] gdbserver: fix the standalone build

[Mircea Gherzan]

On 27.06.2013 19:45, Pedro Alves wrote:
> On 06/27/2013 06:42 PM, Pedro Alves wrote:
>> On 06/27/2013 06:38 PM, Pedro Alves wrote:
>>
>>> But instead of that, then, which I'd call a hack, we should
>>> instead do:
>>
>> Or better yet, do as Tom suggests, as I believe we do want
>> to print the non-canonical string here, exactly as --host
>> was specified.
>>
>
> Even better, if $host_alias is empty, we should print $host, IMO:
>
>   $ ./gdbserver --version
>   GNU gdbserver (GDB) 7.6.0.20130529-cvs
>   Copyright (C) 2013 Free Software Foundation, Inc.
>   gdbserver is free software, covered by the GNU General Public License.
>   This gdbserver was configured as ""

So in the end it's a matter of either
1. quoting the parameters when calling create-version.sh and getting an 
empty string at --version, OR
2. using $host when $host_alias is empty

I favour the latter. Tom, what do think?

Thanks,
Mircea

-- 

Intel GmbH
Dornacher Strasse 1
85622 Feldkirchen/Muenchen, Deutschland
Sitz der Gesellschaft: Feldkirchen bei Muenchen
Geschaeftsfuehrer: Christian Lamprechter, Hannes Schwaderer, Douglas Lusk
Registergericht: Muenchen HRB 47456
Ust.-IdNr./VAT Registration No.: DE129385895
Citibank Frankfurt a.M. (BLZ 502 109 00) 600119052

Re: [PATCH] gdbserver: fix the standalone build

[Tom Tromey]

>>>>> "Mircea" == Mircea Gherzan <mircea.gherzan@intel.com> writes:

Mircea> So in the end it's a matter of either
Mircea> 1. quoting the parameters when calling create-version.sh and getting
Mircea> an empty string at --version, OR
Mircea> 2. using $host when $host_alias is empty

Mircea> I favour the latter. Tom, what do think?

I think #2 would be a nice improvement.

thanks,
Tom