[PATCH] Add support for DESTDIR to the simulator core

[PATCH] Add support for DESTDIR to the simulator core

[Martin Koegler]

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

I noticed, that sim is missing the support for DESTDIR in its Makefiles,
which is supported by all automake based programs.

The patch added support for this feature. Is it possible to apply it to the
CVS?

mfg Martin Kögler
PS: Please CC me on replies.

[-- Attachment #2: sim.korr.patch --]
[-- Type: text/plain, Size: 1531 bytes --]

Index: Makefile.in
===================================================================
RCS file: /cvs/src/src/sim/Makefile.in,v
retrieving revision 1.6
diff -u -r1.6 Makefile.in
--- Makefile.in	29 Jan 2005 00:53:13 -0000	1.6
+++ Makefile.in	10 May 2005 20:37:38 -0000
@@ -83,6 +83,7 @@
 RUNTESTFLAGS=
 
 FLAGS_TO_PASS = \
+	"DESTDIR=$(DESTDIR)" \
 	"prefix=$(prefix)" \
 	"exec_prefix=$(exec_prefix)" \
 	"bindir=$(bindir)" \
Index: common/Make-common.in
===================================================================
RCS file: /cvs/src/src/sim/common/Make-common.in,v
retrieving revision 1.21
diff -u -r1.21 Make-common.in
--- common/Make-common.in	27 Apr 2005 20:38:08 -0000	1.21
+++ common/Make-common.in	10 May 2005 20:37:38 -0000
@@ -616,14 +616,14 @@
 
 install-common: installdirs
 	n=`echo run | sed '$(program_transform_name)'`; \
-	$(INSTALL_PROGRAM) run$(EXEEXT) $(bindir)/$$n$(EXEEXT)
+	$(INSTALL_PROGRAM) run$(EXEEXT) $(DESTDIR)$(bindir)/$$n$(EXEEXT)
 	n=`echo libsim.a | sed s/libsim.a/lib$(target_alias)-sim.a/`; \
-	$(INSTALL_DATA) libsim.a $(libdir)/$$n ; \
-	( cd $(libdir) ; $(RANLIB) $$n )
+	$(INSTALL_DATA) libsim.a $(DESTDIR)$(libdir)/$$n ; \
+	( cd $(DESTDIR)$(libdir) ; $(RANLIB) $$n )
 
 installdirs:
-	$(SHELL) $(srcdir)/../../mkinstalldirs $(bindir)
-	$(SHELL) $(srcdir)/../../mkinstalldirs $(libdir)
+	$(SHELL) $(srcdir)/../../mkinstalldirs $(DESTDIR)$(bindir)
+	$(SHELL) $(srcdir)/../../mkinstalldirs $(DESTDIR)$(libdir)
 
 check:
 	cd ../testsuite && $(MAKE) check RUNTESTFLAGS="$(RUNTESTFLAGS)"

Re: [PATCH] Add support for DESTDIR to the simulator core

[Daniel Jacobowitz]

On Tue, May 10, 2005 at 10:49:20PM +0200, Martin Koegler wrote:
> I noticed, that sim is missing the support for DESTDIR in its Makefiles,
> which is supported by all automake based programs.
> 
> The patch added support for this feature. Is it possible to apply it to the
> CVS?
> 
> mfg Martin Kögler
> PS: Please CC me on replies.

The heck?  You're the third person in the last week to submit this
patch.  I hadn't gotten to the oldest one yet.  The problem isn't new;
I wonder why everyone is encountering it all of a sudden?

> Index: Makefile.in
> ===================================================================
> RCS file: /cvs/src/src/sim/Makefile.in,v
> retrieving revision 1.6
> diff -u -r1.6 Makefile.in
> --- Makefile.in	29 Jan 2005 00:53:13 -0000	1.6
> +++ Makefile.in	10 May 2005 20:37:38 -0000
> @@ -83,6 +83,7 @@
>  RUNTESTFLAGS=
>  
>  FLAGS_TO_PASS = \
> +	"DESTDIR=$(DESTDIR)" \
>  	"prefix=$(prefix)" \
>  	"exec_prefix=$(exec_prefix)" \
>  	"bindir=$(bindir)" \

The other two patches did not modify FLAGS_TO_PASS; is this really
necessary?  I don't believe it is.

-- 
Daniel Jacobowitz
CodeSourcery, LLC

Re: [PATCH] Add support for DESTDIR to the simulator core

[Mark Kettenis]

   Date: Tue, 10 May 2005 16:53:36 -0400
   From: Daniel Jacobowitz <drow@false.org>

   On Tue, May 10, 2005 at 10:49:20PM +0200, Martin Koegler wrote:
   > I noticed, that sim is missing the support for DESTDIR in its Makefiles,
   > which is supported by all automake based programs.
   > 
   > The patch added support for this feature. Is it possible to apply it to the
   > CVS?
   > 
   > mfg Martin Kögler
   > PS: Please CC me on replies.

   The heck?  You're the third person in the last week to submit this
   patch.  I hadn't gotten to the oldest one yet.  The problem isn't new;
   I wonder why everyone is encountering it all of a sudden?

Oh, that's easy.  In the past it was only hooked up to a few embedded
targets, wheras now we build sim for every target based on a processor
that we have a sim more.  Are GDB maintainers supposed to review sim
patches now?

Mark

Re: [PATCH] Add support for DESTDIR to the simulator core

[Daniel Jacobowitz]

On Tue, May 10, 2005 at 11:35:25PM +0200, Mark Kettenis wrote:
>    Date: Tue, 10 May 2005 16:53:36 -0400
>    From: Daniel Jacobowitz <drow@false.org>
> 
>    On Tue, May 10, 2005 at 10:49:20PM +0200, Martin Koegler wrote:
>    > I noticed, that sim is missing the support for DESTDIR in its Makefiles,
>    > which is supported by all automake based programs.
>    > 
>    > The patch added support for this feature. Is it possible to apply it to the
>    > CVS?
>    > 
>    > mfg Martin Kögler
>    > PS: Please CC me on replies.
> 
>    The heck?  You're the third person in the last week to submit this
>    patch.  I hadn't gotten to the oldest one yet.  The problem isn't new;
>    I wonder why everyone is encountering it all of a sudden?
> 
> Oh, that's easy.  In the past it was only hooked up to a few embedded
> targets, wheras now we build sim for every target based on a processor
> that we have a sim more.  Are GDB maintainers supposed to review sim
> patches now?
	
Always have been.

Interesting, when did that change?  I seem to recall noticing that we
now build it more often - but don't wire up target sim.

-- 
Daniel Jacobowitz
CodeSourcery, LLC

Re: [PATCH] Add support for DESTDIR to the simulator core

[Daniel Jacobowitz]

On Tue, May 10, 2005 at 04:53:36PM -0400, Daniel Jacobowitz wrote:
> The other two patches did not modify FLAGS_TO_PASS; is this really
> necessary?  I don't believe it is.

I didn't get an answer to this so I am going to assume that it isn't.

None of the three submitted versions of this patch had a correct
ChangeLog, so I redid it myself.  Thank you all for reporting the
problem.

-- 
Daniel Jacobowitz
CodeSourcery, LLC

2005-05-17  Daniel Jacobowitz  <dan@codesourcery.com>

	* Make-common.in (install-common, installdirs): Honor $DESTDIR.

Index: Make-common.in
===================================================================
RCS file: /cvs/src/src/sim/common/Make-common.in,v
retrieving revision 1.21
diff -u -p -r1.21 Make-common.in
--- Make-common.in	27 Apr 2005 20:38:08 -0000	1.21
+++ Make-common.in	18 May 2005 01:54:13 -0000
@@ -616,14 +616,14 @@ install: install-common $(SIM_EXTRA_INST
 
 install-common: installdirs
 	n=`echo run | sed '$(program_transform_name)'`; \
-	$(INSTALL_PROGRAM) run$(EXEEXT) $(bindir)/$$n$(EXEEXT)
+	$(INSTALL_PROGRAM) run$(EXEEXT) $(DESTDIR)$(bindir)/$$n$(EXEEXT)
 	n=`echo libsim.a | sed s/libsim.a/lib$(target_alias)-sim.a/`; \
-	$(INSTALL_DATA) libsim.a $(libdir)/$$n ; \
-	( cd $(libdir) ; $(RANLIB) $$n )
+	$(INSTALL_DATA) libsim.a $(DESTDIR)$(libdir)/$$n ; \
+	( cd $(DESTDIR)$(libdir) ; $(RANLIB) $$n )
 
 installdirs:
-	$(SHELL) $(srcdir)/../../mkinstalldirs $(bindir)
-	$(SHELL) $(srcdir)/../../mkinstalldirs $(libdir)
+	$(SHELL) $(srcdir)/../../mkinstalldirs $(DESTDIR)$(bindir)
+	$(SHELL) $(srcdir)/../../mkinstalldirs $(DESTDIR)$(libdir)
 
 check:
 	cd ../testsuite && $(MAKE) check RUNTESTFLAGS="$(RUNTESTFLAGS)"