| Message ID | 20170619082519.13041-1-petri.savolainen@linaro.org |
|---|---|
| State | Accepted |
| Commit | 5dd7d9ed05ee228406cc3c0ae6cd9caa20a71f08 |
| Headers | show |
On Mon, Jun 19, 2017 at 3:25 AM, Petri Savolainen <petri.savolainen@linaro.org> wrote: > Generated files need $(top_builddir) instead of $(top_srcdir) > > Fixes bug https://bugs.linaro.org/show_bug.cgi?id=3052 > > Signed-off-by: Petri Savolainen <petri.savolainen@linaro.org> > --- > platform/Makefile.inc | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/platform/Makefile.inc b/platform/Makefile.inc > index 9844a58a..1903d92d 100644 > --- a/platform/Makefile.inc > +++ b/platform/Makefile.inc > @@ -29,7 +29,6 @@ odpapispecinclude_HEADERS = \ > $(top_srcdir)/include/odp/api/spec/cpumask.h \ > $(top_srcdir)/include/odp/api/spec/crypto.h \ > $(top_srcdir)/include/odp/api/spec/debug.h \ > - $(top_srcdir)/include/odp/api/spec/deprecated.h \ > $(top_srcdir)/include/odp/api/spec/errno.h \ > $(top_srcdir)/include/odp/api/spec/event.h \ > $(top_srcdir)/include/odp/api/spec/hash.h \ > @@ -58,8 +57,9 @@ odpapispecinclude_HEADERS = \ > $(top_srcdir)/include/odp/api/spec/ticketlock.h \ > $(top_srcdir)/include/odp/api/spec/time.h \ > $(top_srcdir)/include/odp/api/spec/timer.h \ > - $(top_builddir)/include/odp/api/spec/version.h \ > - $(top_srcdir)/include/odp/api/spec/traffic_mngr.h > + $(top_srcdir)/include/odp/api/spec/traffic_mngr.h \ > + $(top_builddir)/include/odp/api/spec/deprecated.h \ > + $(top_builddir)/include/odp/api/spec/version.h Shouldn't this list be maintained in alphabetical order? > > odpapiabidefaultincludedir= $(includedir)/odp/arch/default/api/abi > odpapiabidefaultinclude_HEADERS = \ > -- > 2.13.0 >
it should. top chunk is good, but chunk bellow is not. On 19 June 2017 at 13:30, Bill Fischofer <bill.fischofer@linaro.org> wrote: > On Mon, Jun 19, 2017 at 3:25 AM, Petri Savolainen > <petri.savolainen@linaro.org> wrote: > > Generated files need $(top_builddir) instead of $(top_srcdir) > > > > Fixes bug https://bugs.linaro.org/show_bug.cgi?id=3052 > > > > Signed-off-by: Petri Savolainen <petri.savolainen@linaro.org> > > --- > > platform/Makefile.inc | 6 +++--- > > 1 file changed, 3 insertions(+), 3 deletions(-) > > > > diff --git a/platform/Makefile.inc b/platform/Makefile.inc > > index 9844a58a..1903d92d 100644 > > --- a/platform/Makefile.inc > > +++ b/platform/Makefile.inc > > @@ -29,7 +29,6 @@ odpapispecinclude_HEADERS = \ > > $(top_srcdir)/include/odp/api/spec/cpumask.h \ > > $(top_srcdir)/include/odp/api/spec/crypto.h \ > > $(top_srcdir)/include/odp/api/spec/debug.h \ > > - $(top_srcdir)/include/odp/api/spec/deprecated.h \ > > $(top_srcdir)/include/odp/api/spec/errno.h \ > > $(top_srcdir)/include/odp/api/spec/event.h \ > > $(top_srcdir)/include/odp/api/spec/hash.h \ > > @@ -58,8 +57,9 @@ odpapispecinclude_HEADERS = \ > > $(top_srcdir)/include/odp/api/spec/ticketlock.h \ > > $(top_srcdir)/include/odp/api/spec/time.h \ > > $(top_srcdir)/include/odp/api/spec/timer.h \ > > - $(top_builddir)/include/odp/api/spec/version.h \ > > - $(top_srcdir)/include/odp/api/spec/traffic_mngr.h > > + $(top_srcdir)/include/odp/api/spec/traffic_mngr.h \ > > + $(top_builddir)/include/odp/api/spec/deprecated.h \ > > + $(top_builddir)/include/odp/api/spec/version.h > > Shouldn't this list be maintained in alphabetical order? > > > > > odpapiabidefaultincludedir= $(includedir)/odp/arch/default/api/abi > > odpapiabidefaultinclude_HEADERS = \ > > -- > > 2.13.0 > > >
> -----Original Message----- > From: Bill Fischofer [mailto:bill.fischofer@linaro.org] > Sent: Monday, June 19, 2017 1:31 PM > To: Petri Savolainen <petri.savolainen@linaro.org> > Cc: lng-odp-forward <lng-odp@lists.linaro.org> > Subject: Re: [lng-odp] [PATCH] linux-gen: makefile: fix out of tree build > > On Mon, Jun 19, 2017 at 3:25 AM, Petri Savolainen > <petri.savolainen@linaro.org> wrote: > > Generated files need $(top_builddir) instead of $(top_srcdir) > > > > Fixes bug https://bugs.linaro.org/show_bug.cgi?id=3052 > > > > Signed-off-by: Petri Savolainen <petri.savolainen@linaro.org> > > --- > > platform/Makefile.inc | 6 +++--- > > 1 file changed, 3 insertions(+), 3 deletions(-) > > > > diff --git a/platform/Makefile.inc b/platform/Makefile.inc > > index 9844a58a..1903d92d 100644 > > --- a/platform/Makefile.inc > > +++ b/platform/Makefile.inc > > @@ -29,7 +29,6 @@ odpapispecinclude_HEADERS = \ > > $(top_srcdir)/include/odp/api/spec/cpumask.h \ > > $(top_srcdir)/include/odp/api/spec/crypto.h \ > > $(top_srcdir)/include/odp/api/spec/debug.h \ > > - $(top_srcdir)/include/odp/api/spec/deprecated.h \ > > $(top_srcdir)/include/odp/api/spec/errno.h \ > > $(top_srcdir)/include/odp/api/spec/event.h \ > > $(top_srcdir)/include/odp/api/spec/hash.h \ > > @@ -58,8 +57,9 @@ odpapispecinclude_HEADERS = \ > > $(top_srcdir)/include/odp/api/spec/ticketlock.h \ > > $(top_srcdir)/include/odp/api/spec/time.h \ > > $(top_srcdir)/include/odp/api/spec/timer.h \ > > - $(top_builddir)/include/odp/api/spec/version.h \ > > - $(top_srcdir)/include/odp/api/spec/traffic_mngr.h > > + $(top_srcdir)/include/odp/api/spec/traffic_mngr.h \ > > + $(top_builddir)/include/odp/api/spec/deprecated.h \ > > + $(top_builddir)/include/odp/api/spec/version.h > > Shouldn't this list be maintained in alphabetical order? It's ordered first by path, then by file name in alphabetical order. First all $(top_srcdir), then all $(top_builddir). The bug was in not using $(top_builddir). This order highlights that the path matters. -Petri
top_builddir alphabetical before top_srcdir. But here I'm ok with current change. Bill, review + ? Maxim. On 19 June 2017 at 14:58, Savolainen, Petri (Nokia - FI/Espoo) < petri.savolainen@nokia.com> wrote: > > > > -----Original Message----- > > From: Bill Fischofer [mailto:bill.fischofer@linaro.org] > > Sent: Monday, June 19, 2017 1:31 PM > > To: Petri Savolainen <petri.savolainen@linaro.org> > > Cc: lng-odp-forward <lng-odp@lists.linaro.org> > > Subject: Re: [lng-odp] [PATCH] linux-gen: makefile: fix out of tree build > > > > On Mon, Jun 19, 2017 at 3:25 AM, Petri Savolainen > > <petri.savolainen@linaro.org> wrote: > > > Generated files need $(top_builddir) instead of $(top_srcdir) > > > > > > Fixes bug https://bugs.linaro.org/show_bug.cgi?id=3052 > > > > > > Signed-off-by: Petri Savolainen <petri.savolainen@linaro.org> > > > --- > > > platform/Makefile.inc | 6 +++--- > > > 1 file changed, 3 insertions(+), 3 deletions(-) > > > > > > diff --git a/platform/Makefile.inc b/platform/Makefile.inc > > > index 9844a58a..1903d92d 100644 > > > --- a/platform/Makefile.inc > > > +++ b/platform/Makefile.inc > > > @@ -29,7 +29,6 @@ odpapispecinclude_HEADERS = \ > > > $(top_srcdir)/include/odp/api/spec/cpumask.h \ > > > $(top_srcdir)/include/odp/api/spec/crypto.h \ > > > $(top_srcdir)/include/odp/api/spec/debug.h \ > > > - $(top_srcdir)/include/odp/api/spec/deprecated.h \ > > > $(top_srcdir)/include/odp/api/spec/errno.h \ > > > $(top_srcdir)/include/odp/api/spec/event.h \ > > > $(top_srcdir)/include/odp/api/spec/hash.h \ > > > @@ -58,8 +57,9 @@ odpapispecinclude_HEADERS = \ > > > $(top_srcdir)/include/odp/api/spec/ticketlock.h \ > > > $(top_srcdir)/include/odp/api/spec/time.h \ > > > $(top_srcdir)/include/odp/api/spec/timer.h \ > > > - $(top_builddir)/include/odp/api/spec/version.h \ > > > - $(top_srcdir)/include/odp/api/spec/traffic_mngr.h > > > + $(top_srcdir)/include/odp/api/spec/traffic_mngr.h \ > > > + $(top_builddir)/include/odp/api/spec/deprecated.h \ > > > + $(top_builddir)/include/odp/api/spec/version.h > > > > Shouldn't this list be maintained in alphabetical order? > > It's ordered first by path, then by file name in alphabetical order. First > all $(top_srcdir), then all $(top_builddir). The bug was in not using > $(top_builddir). This order highlights that the path matters. > > -Petri > > >
For this patch: Reviewed-by: Bill Fischofer <bill.fischofer@linaro.org> On Mon, Jun 19, 2017 at 8:12 AM, Maxim Uvarov <maxim.uvarov@linaro.org> wrote: > top_builddir alphabetical before top_srcdir. But here I'm ok with current > change. > > Bill, review + ? > > Maxim. > > On 19 June 2017 at 14:58, Savolainen, Petri (Nokia - FI/Espoo) > <petri.savolainen@nokia.com> wrote: >> >> >> >> > -----Original Message----- >> > From: Bill Fischofer [mailto:bill.fischofer@linaro.org] >> > Sent: Monday, June 19, 2017 1:31 PM >> > To: Petri Savolainen <petri.savolainen@linaro.org> >> > Cc: lng-odp-forward <lng-odp@lists.linaro.org> >> > Subject: Re: [lng-odp] [PATCH] linux-gen: makefile: fix out of tree >> > build >> > >> > On Mon, Jun 19, 2017 at 3:25 AM, Petri Savolainen >> > <petri.savolainen@linaro.org> wrote: >> > > Generated files need $(top_builddir) instead of $(top_srcdir) >> > > >> > > Fixes bug https://bugs.linaro.org/show_bug.cgi?id=3052 >> > > >> > > Signed-off-by: Petri Savolainen <petri.savolainen@linaro.org> >> > > --- >> > > platform/Makefile.inc | 6 +++--- >> > > 1 file changed, 3 insertions(+), 3 deletions(-) >> > > >> > > diff --git a/platform/Makefile.inc b/platform/Makefile.inc >> > > index 9844a58a..1903d92d 100644 >> > > --- a/platform/Makefile.inc >> > > +++ b/platform/Makefile.inc >> > > @@ -29,7 +29,6 @@ odpapispecinclude_HEADERS = \ >> > > $(top_srcdir)/include/odp/api/spec/cpumask.h \ >> > > $(top_srcdir)/include/odp/api/spec/crypto.h \ >> > > $(top_srcdir)/include/odp/api/spec/debug.h \ >> > > - $(top_srcdir)/include/odp/api/spec/deprecated.h \ >> > > $(top_srcdir)/include/odp/api/spec/errno.h \ >> > > $(top_srcdir)/include/odp/api/spec/event.h \ >> > > $(top_srcdir)/include/odp/api/spec/hash.h \ >> > > @@ -58,8 +57,9 @@ odpapispecinclude_HEADERS = \ >> > > $(top_srcdir)/include/odp/api/spec/ticketlock.h \ >> > > $(top_srcdir)/include/odp/api/spec/time.h \ >> > > $(top_srcdir)/include/odp/api/spec/timer.h \ >> > > - $(top_builddir)/include/odp/api/spec/version.h \ >> > > - $(top_srcdir)/include/odp/api/spec/traffic_mngr.h >> > > + $(top_srcdir)/include/odp/api/spec/traffic_mngr.h \ >> > > + $(top_builddir)/include/odp/api/spec/deprecated.h \ >> > > + $(top_builddir)/include/odp/api/spec/version.h >> > >> > Shouldn't this list be maintained in alphabetical order? >> >> It's ordered first by path, then by file name in alphabetical order. First >> all $(top_srcdir), then all $(top_builddir). The bug was in not using >> $(top_builddir). This order highlights that the path matters. >> >> -Petri >> >> >
Merged. On 19 June 2017 at 17:12, Bill Fischofer <bill.fischofer@linaro.org> wrote: > For this patch: > > Reviewed-by: Bill Fischofer <bill.fischofer@linaro.org> > > On Mon, Jun 19, 2017 at 8:12 AM, Maxim Uvarov <maxim.uvarov@linaro.org> > wrote: > > top_builddir alphabetical before top_srcdir. But here I'm ok with current > > change. > > > > Bill, review + ? > > > > Maxim. > > > > On 19 June 2017 at 14:58, Savolainen, Petri (Nokia - FI/Espoo) > > <petri.savolainen@nokia.com> wrote: > >> > >> > >> > >> > -----Original Message----- > >> > From: Bill Fischofer [mailto:bill.fischofer@linaro.org] > >> > Sent: Monday, June 19, 2017 1:31 PM > >> > To: Petri Savolainen <petri.savolainen@linaro.org> > >> > Cc: lng-odp-forward <lng-odp@lists.linaro.org> > >> > Subject: Re: [lng-odp] [PATCH] linux-gen: makefile: fix out of tree > >> > build > >> > > >> > On Mon, Jun 19, 2017 at 3:25 AM, Petri Savolainen > >> > <petri.savolainen@linaro.org> wrote: > >> > > Generated files need $(top_builddir) instead of $(top_srcdir) > >> > > > >> > > Fixes bug https://bugs.linaro.org/show_bug.cgi?id=3052 > >> > > > >> > > Signed-off-by: Petri Savolainen <petri.savolainen@linaro.org> > >> > > --- > >> > > platform/Makefile.inc | 6 +++--- > >> > > 1 file changed, 3 insertions(+), 3 deletions(-) > >> > > > >> > > diff --git a/platform/Makefile.inc b/platform/Makefile.inc > >> > > index 9844a58a..1903d92d 100644 > >> > > --- a/platform/Makefile.inc > >> > > +++ b/platform/Makefile.inc > >> > > @@ -29,7 +29,6 @@ odpapispecinclude_HEADERS = \ > >> > > $(top_srcdir)/include/odp/api/spec/cpumask.h \ > >> > > $(top_srcdir)/include/odp/api/spec/crypto.h \ > >> > > $(top_srcdir)/include/odp/api/spec/debug.h \ > >> > > - $(top_srcdir)/include/odp/api/spec/deprecated.h \ > >> > > $(top_srcdir)/include/odp/api/spec/errno.h \ > >> > > $(top_srcdir)/include/odp/api/spec/event.h \ > >> > > $(top_srcdir)/include/odp/api/spec/hash.h \ > >> > > @@ -58,8 +57,9 @@ odpapispecinclude_HEADERS = \ > >> > > $(top_srcdir)/include/odp/api/spec/ticketlock.h \ > >> > > $(top_srcdir)/include/odp/api/spec/time.h \ > >> > > $(top_srcdir)/include/odp/api/spec/timer.h \ > >> > > - $(top_builddir)/include/odp/api/spec/version.h \ > >> > > - $(top_srcdir)/include/odp/api/spec/traffic_mngr.h > >> > > + $(top_srcdir)/include/odp/api/spec/traffic_mngr.h > \ > >> > > + $(top_builddir)/include/odp/api/spec/deprecated.h > \ > >> > > + $(top_builddir)/include/odp/api/spec/version.h > >> > > >> > Shouldn't this list be maintained in alphabetical order? > >> > >> It's ordered first by path, then by file name in alphabetical order. > First > >> all $(top_srcdir), then all $(top_builddir). The bug was in not using > >> $(top_builddir). This order highlights that the path matters. > >> > >> -Petri > >> > >> > > >
Patch breaks native build. I had to test it before apply :( On 19 June 2017 at 17:16, Maxim Uvarov <maxim.uvarov@linaro.org> wrote: > Merged. > > On 19 June 2017 at 17:12, Bill Fischofer <bill.fischofer@linaro.org> > wrote: > >> For this patch: >> >> Reviewed-by: Bill Fischofer <bill.fischofer@linaro.org> >> >> On Mon, Jun 19, 2017 at 8:12 AM, Maxim Uvarov <maxim.uvarov@linaro.org> >> wrote: >> > top_builddir alphabetical before top_srcdir. But here I'm ok with >> current >> > change. >> > >> > Bill, review + ? >> > >> > Maxim. >> > >> > On 19 June 2017 at 14:58, Savolainen, Petri (Nokia - FI/Espoo) >> > <petri.savolainen@nokia.com> wrote: >> >> >> >> >> >> >> >> > -----Original Message----- >> >> > From: Bill Fischofer [mailto:bill.fischofer@linaro.org] >> >> > Sent: Monday, June 19, 2017 1:31 PM >> >> > To: Petri Savolainen <petri.savolainen@linaro.org> >> >> > Cc: lng-odp-forward <lng-odp@lists.linaro.org> >> >> > Subject: Re: [lng-odp] [PATCH] linux-gen: makefile: fix out of tree >> >> > build >> >> > >> >> > On Mon, Jun 19, 2017 at 3:25 AM, Petri Savolainen >> >> > <petri.savolainen@linaro.org> wrote: >> >> > > Generated files need $(top_builddir) instead of $(top_srcdir) >> >> > > >> >> > > Fixes bug https://bugs.linaro.org/show_bug.cgi?id=3052 >> >> > > >> >> > > Signed-off-by: Petri Savolainen <petri.savolainen@linaro.org> >> >> > > --- >> >> > > platform/Makefile.inc | 6 +++--- >> >> > > 1 file changed, 3 insertions(+), 3 deletions(-) >> >> > > >> >> > > diff --git a/platform/Makefile.inc b/platform/Makefile.inc >> >> > > index 9844a58a..1903d92d 100644 >> >> > > --- a/platform/Makefile.inc >> >> > > +++ b/platform/Makefile.inc >> >> > > @@ -29,7 +29,6 @@ odpapispecinclude_HEADERS = \ >> >> > > $(top_srcdir)/include/odp/api/spec/cpumask.h \ >> >> > > $(top_srcdir)/include/odp/api/spec/crypto.h \ >> >> > > $(top_srcdir)/include/odp/api/spec/debug.h \ >> >> > > - $(top_srcdir)/include/odp/api/spec/deprecated.h >> \ >> >> > > $(top_srcdir)/include/odp/api/spec/errno.h \ >> >> > > $(top_srcdir)/include/odp/api/spec/event.h \ >> >> > > $(top_srcdir)/include/odp/api/spec/hash.h \ >> >> > > @@ -58,8 +57,9 @@ odpapispecinclude_HEADERS = \ >> >> > > $(top_srcdir)/include/odp/api/spec/ticketlock.h >> \ >> >> > > $(top_srcdir)/include/odp/api/spec/time.h \ >> >> > > $(top_srcdir)/include/odp/api/spec/timer.h \ >> >> > > - $(top_builddir)/include/odp/api/spec/version.h \ >> >> > > - $(top_srcdir)/include/odp/ >> api/spec/traffic_mngr.h >> >> > > + $(top_srcdir)/include/odp/api/spec/traffic_mngr.h >> \ >> >> > > + $(top_builddir)/include/odp/api/spec/deprecated.h >> \ >> >> > > + $(top_builddir)/include/odp/api/spec/version.h >> >> > >> >> > Shouldn't this list be maintained in alphabetical order? >> >> >> >> It's ordered first by path, then by file name in alphabetical order. >> First >> >> all $(top_srcdir), then all $(top_builddir). The bug was in not using >> >> $(top_builddir). This order highlights that the path matters. >> >> >> >> -Petri >> >> >> >> >> > >> > >
diff --git a/platform/Makefile.inc b/platform/Makefile.inc index 9844a58a..1903d92d 100644 --- a/platform/Makefile.inc +++ b/platform/Makefile.inc @@ -29,7 +29,6 @@ odpapispecinclude_HEADERS = \ $(top_srcdir)/include/odp/api/spec/cpumask.h \ $(top_srcdir)/include/odp/api/spec/crypto.h \ $(top_srcdir)/include/odp/api/spec/debug.h \ - $(top_srcdir)/include/odp/api/spec/deprecated.h \ $(top_srcdir)/include/odp/api/spec/errno.h \ $(top_srcdir)/include/odp/api/spec/event.h \ $(top_srcdir)/include/odp/api/spec/hash.h \ @@ -58,8 +57,9 @@ odpapispecinclude_HEADERS = \ $(top_srcdir)/include/odp/api/spec/ticketlock.h \ $(top_srcdir)/include/odp/api/spec/time.h \ $(top_srcdir)/include/odp/api/spec/timer.h \ - $(top_builddir)/include/odp/api/spec/version.h \ - $(top_srcdir)/include/odp/api/spec/traffic_mngr.h + $(top_srcdir)/include/odp/api/spec/traffic_mngr.h \ + $(top_builddir)/include/odp/api/spec/deprecated.h \ + $(top_builddir)/include/odp/api/spec/version.h odpapiabidefaultincludedir= $(includedir)/odp/arch/default/api/abi odpapiabidefaultinclude_HEADERS = \
Generated files need $(top_builddir) instead of $(top_srcdir) Fixes bug https://bugs.linaro.org/show_bug.cgi?id=3052 Signed-off-by: Petri Savolainen <petri.savolainen@linaro.org> --- platform/Makefile.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.13.0