Remove make gnu-ism in gdbserver

Remove make gnu-ism in gdbserver

[Yao Qi]

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

On 03/01/2011 01:46 PM, Yao Qi wrote:
> 3.  GNU make feature,
> http://sourceware.org/ml/gdb-patches/2011-02/msg00489.html
> Since we decide not to require GNU make, I'll remove its GNU make feature.

This patch is to fix this problem above.  This patch should be applied
top of my "make-clean fix" patch
(http://sourceware.org/ml/gdb-patches/2011-03/msg00020.html).

-- 
Yao (齐尧)

[-- Attachment #2: remove-gdbserver-gnu-0301.patch --]
[-- Type: text/x-patch, Size: 581 bytes --]

gdb/gdbserver/

	* Makefile.in: Remove GNU make feature --direcotry.

diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in
index d27c942..14ee91f 100644
--- a/gdb/gdbserver/Makefile.in
+++ b/gdb/gdbserver/Makefile.in
@@ -200,7 +200,7 @@ FLAGS_TO_PASS = \
 all: gdbserver$(EXEEXT) gdbreplay$(EXEEXT) $(extra_libraries)
 
 $(LIBCOMMON): $(LIBCOMMON_DIR)/Makefile
-	@$(MAKE) $(FLAGS_TO_PASS) DO=all --directory=common
+	@$(MAKE) $(FLAGS_TO_PASS) DO=all DODIRS=common subdir_do
 
 common/Makefile: configure-common config.status
         CONFIG_FILES="common/Makefile" \

Re: Remove make gnu-ism in gdbserver

[Joel Brobecker]

> gdb/gdbserver/
> 
> 	* Makefile.in: Remove GNU make feature --direcotry.
                                                 directory

OK for this one.

-- 
Joel

Re: Remove make gnu-ism in gdbserver

[Yao Qi]

On 03/04/2011 01:49 PM, Joel Brobecker wrote:
>> > gdb/gdbserver/
>> > 
>> > 	* Makefile.in: Remove GNU make feature --direcotry.
>                                                  directory
> 
> OK for this one.

Thanks for the review.  Applied.

-- 
Yao (齐尧)

Re: Remove make gnu-ism in gdbserver

[Ulrich Weigand]

Yao Qi wrote:

>  $(LIBCOMMON): $(LIBCOMMON_DIR)/Makefile
> -	@$(MAKE) $(FLAGS_TO_PASS) DO=all --directory=common
> +	@$(MAKE) $(FLAGS_TO_PASS) DO=all DODIRS=common subdir_do

This breaks building gdbserver completely for me:

make[4]: Entering directory `/home/uweigand/fsf/gdb-head-build/gdb/gdbserver'
make[5]: Entering directory `/home/uweigand/fsf/gdb-head-build/gdb/gdbserver'
make[5]: *** No rule to make target `subdir_do'.  Stop.
make[5]: Leaving directory `/home/uweigand/fsf/gdb-head-build/gdb/gdbserver'
make[4]: *** [common/libcommon.a] Error 2

And indeed there is no make target "subdir_do" in the gdbserver Makefile ...

Bye,
Ulrich

-- 
  Dr. Ulrich Weigand
  GNU Toolchain for Linux on System z and Cell BE
  Ulrich.Weigand@de.ibm.com

Re: Remove make gnu-ism in gdbserver

[Joel Brobecker]

> >  $(LIBCOMMON): $(LIBCOMMON_DIR)/Makefile
> > -	@$(MAKE) $(FLAGS_TO_PASS) DO=all --directory=common
> > +	@$(MAKE) $(FLAGS_TO_PASS) DO=all DODIRS=common subdir_do
> 
> This breaks building gdbserver completely for me:

Probably because Yao forgot that this patch was dependent on
one of his previous patches. I was a little surprised when Yao
said he checked it in, but I thought that maybe the other part
got approved beforehand.  Let's see if we can approve the part
of the other patch that - otherwise, we'll make a temporary
revert.  Sorry about that.

-- 
Joel

Re: Remove make gnu-ism in gdbserver

[Joel Brobecker]

On Sat, Mar 05, 2011 at 07:24:45AM +0400, Joel Brobecker wrote:
> > >  $(LIBCOMMON): $(LIBCOMMON_DIR)/Makefile
> > > -	@$(MAKE) $(FLAGS_TO_PASS) DO=all --directory=common
> > > +	@$(MAKE) $(FLAGS_TO_PASS) DO=all DODIRS=common subdir_do
> > 
> > This breaks building gdbserver completely for me:

This should now be fixed. I was able to reproduce by building
the gdbserver standalone.  It turns out that the other patch
on which this depended had been approved by me (!), except
that I asked Yao to wait for a few days, in order to give
others some time to comment (I tend to defer to Pedro in the
gdbserver/ area). Since I approved the patch, I applied it now.

-- 
Joel

Re: Remove make gnu-ism in gdbserver

[Yao Qi]

On 03/05/2011 11:24 AM, Joel Brobecker wrote:
>>>  $(LIBCOMMON): $(LIBCOMMON_DIR)/Makefile
>>> -	@$(MAKE) $(FLAGS_TO_PASS) DO=all --directory=common
>>> +	@$(MAKE) $(FLAGS_TO_PASS) DO=all DODIRS=common subdir_do
>>
>> This breaks building gdbserver completely for me:
> 
> Probably because Yao forgot that this patch was dependent on
> one of his previous patches. I was a little surprised when Yao
> said he checked it in, but I thought that maybe the other part
> got approved beforehand.  Let's see if we can approve the part
> of the other patch that - otherwise, we'll make a temporary
> revert.  Sorry about that.
> 

Sorry about breaking the build.  I forget that this patch depends on the
other patch which was not approved then.

-- 
Yao (齐尧)