All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH v1] Fix makefile include order by using sort/wildcard.
@ 2017-11-21 19:13 Peter Seiderer
  2017-11-21 20:18 ` Petr Vorel
  2017-11-23 23:23 ` Arnout Vandecappelle
  0 siblings, 2 replies; 6+ messages in thread
From: Peter Seiderer @ 2017-11-21 19:13 UTC (permalink / raw)
  To: buildroot

Use ordered 'include $(sort $(wildcard ...))' instead of unordered
direct 'include */*.mk'.

Fixes [1] reported by Petr Vorel:

  make: *** No rule to make target 'toolchain-external-custom', needed by '.../build/toolchain-external/.stamp_configured'.  Stop.

[1] http://lists.busybox.net/pipermail/buildroot/2017-November/206969.html

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
 Makefile                                           | 6 +++---
 package/gstreamer/gstreamer.mk                     | 2 +-
 package/gstreamer1/gstreamer1.mk                   | 2 +-
 toolchain/toolchain-external/toolchain-external.mk | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 55409b99af..9d9737332d 100644
--- a/Makefile
+++ b/Makefile
@@ -483,13 +483,13 @@ include system/system.mk
 include package/Makefile.in
 # arch/arch.mk.* must be after package/Makefile.in because it may need to
 # complement variables defined therein, like BR_NO_CHECK_HASH_FOR.
--include $(wildcard arch/arch.mk.*)
+-include $(sort $(wildcard arch/arch.mk.*))
 include support/dependencies/dependencies.mk
 
 PACKAGES += $(DEPENDENCIES_HOST_PREREQ)
 
-include toolchain/*.mk
-include toolchain/*/*.mk
+include $(sort $(wildcard toolchain/*.mk))
+include $(sort $(wildcard toolchain/*/*.mk))
 
 # Include the package override file if one has been provided in the
 # configuration.
diff --git a/package/gstreamer/gstreamer.mk b/package/gstreamer/gstreamer.mk
index bc886c78a2..22240bceea 100644
--- a/package/gstreamer/gstreamer.mk
+++ b/package/gstreamer/gstreamer.mk
@@ -1 +1 @@
-include package/gstreamer/*/*.mk
+include $(sort $(wildcard package/gstreamer/*/*.mk))
diff --git a/package/gstreamer1/gstreamer1.mk b/package/gstreamer1/gstreamer1.mk
index 5b748e33fb..8530ff027a 100644
--- a/package/gstreamer1/gstreamer1.mk
+++ b/package/gstreamer1/gstreamer1.mk
@@ -1 +1 @@
-include package/gstreamer1/*/*.mk
+include $(sort $(wildcard package/gstreamer1/*/*.mk))
diff --git a/toolchain/toolchain-external/toolchain-external.mk b/toolchain/toolchain-external/toolchain-external.mk
index 48de1e71f2..dd07884c7e 100644
--- a/toolchain/toolchain-external/toolchain-external.mk
+++ b/toolchain/toolchain-external/toolchain-external.mk
@@ -25,4 +25,4 @@ $(error No prefix selected for external toolchain package $(BR2_PACKAGE_PROVIDES
 endif
 endif
 
-include toolchain/toolchain-external/*/*.mk
+include $(sort $(wildcard toolchain/toolchain-external/*/*.mk))
-- 
2.15.0

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [Buildroot] [PATCH v1] Fix makefile include order by using sort/wildcard.
  2017-11-21 19:13 [Buildroot] [PATCH v1] Fix makefile include order by using sort/wildcard Peter Seiderer
@ 2017-11-21 20:18 ` Petr Vorel
  2017-11-23 23:23 ` Arnout Vandecappelle
  1 sibling, 0 replies; 6+ messages in thread
From: Petr Vorel @ 2017-11-21 20:18 UTC (permalink / raw)
  To: buildroot

> Use ordered 'include $(sort $(wildcard ...))' instead of unordered
> direct 'include */*.mk'.

> Fixes [1] reported by Petr Vorel:

>   make: *** No rule to make target 'toolchain-external-custom', needed by '.../build/toolchain-external/.stamp_configured'.  Stop.

> [1] http://lists.busybox.net/pipermail/buildroot/2017-November/206969.html

> Signed-off-by: Peter Seiderer <ps.report@gmx.net>
> ---
Tested-by: Petr Vorel <petr.vorel@gmail.com>

Works as expected.

NOTE: I posted in original thread [1] which make version is affected by this behaviour.

Kind regards,
Petr

[1]: http://lists.busybox.net/pipermail/buildroot/2017-November/207453.html

^ permalink raw reply	[flat|nested] 6+ messages in thread
* [Buildroot] [PATCH v1] Fix makefile include order by using sort/wildcard.
  2017-11-21 19:13 [Buildroot] [PATCH v1] Fix makefile include order by using sort/wildcard Peter Seiderer
  2017-11-21 20:18 ` Petr Vorel
@ 2017-11-23 23:23 ` Arnout Vandecappelle
  2017-11-27 10:07   ` Peter Korsgaard
  1 sibling, 1 reply; 6+ messages in thread
From: Arnout Vandecappelle @ 2017-11-23 23:23 UTC (permalink / raw)
  To: buildroot



On 21-11-17 20:13, Peter Seiderer wrote:
> Use ordered 'include $(sort $(wildcard ...))' instead of unordered
> direct 'include */*.mk'.
> 
> Fixes [1] reported by Petr Vorel:
> 
>   make: *** No rule to make target 'toolchain-external-custom', needed by '.../build/toolchain-external/.stamp_configured'.  Stop.
> 
> [1] http://lists.busybox.net/pipermail/buildroot/2017-November/206969.html
> 
> Signed-off-by: Peter Seiderer <ps.report@gmx.net>

 There was one more include that wasn't sorted:

-include $(foreach dir,$(BR2_EXTERNAL_DIRS),$(dir)/docs/*/*.mk)

I've fixed that one as well, I've extended the commit log a little, and applied
to master, thanks.

 Regards,
 Arnout

> ---
>  Makefile                                           | 6 +++---
>  package/gstreamer/gstreamer.mk                     | 2 +-
>  package/gstreamer1/gstreamer1.mk                   | 2 +-
>  toolchain/toolchain-external/toolchain-external.mk | 2 +-
>  4 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/Makefile b/Makefile
> index 55409b99af..9d9737332d 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -483,13 +483,13 @@ include system/system.mk
>  include package/Makefile.in
>  # arch/arch.mk.* must be after package/Makefile.in because it may need to
>  # complement variables defined therein, like BR_NO_CHECK_HASH_FOR.
> --include $(wildcard arch/arch.mk.*)
> +-include $(sort $(wildcard arch/arch.mk.*))
>  include support/dependencies/dependencies.mk
>  
>  PACKAGES += $(DEPENDENCIES_HOST_PREREQ)
>  
> -include toolchain/*.mk
> -include toolchain/*/*.mk
> +include $(sort $(wildcard toolchain/*.mk))
> +include $(sort $(wildcard toolchain/*/*.mk))
>  
>  # Include the package override file if one has been provided in the
>  # configuration.
> diff --git a/package/gstreamer/gstreamer.mk b/package/gstreamer/gstreamer.mk
> index bc886c78a2..22240bceea 100644
> --- a/package/gstreamer/gstreamer.mk
> +++ b/package/gstreamer/gstreamer.mk
> @@ -1 +1 @@
> -include package/gstreamer/*/*.mk
> +include $(sort $(wildcard package/gstreamer/*/*.mk))
> diff --git a/package/gstreamer1/gstreamer1.mk b/package/gstreamer1/gstreamer1.mk
> index 5b748e33fb..8530ff027a 100644
> --- a/package/gstreamer1/gstreamer1.mk
> +++ b/package/gstreamer1/gstreamer1.mk
> @@ -1 +1 @@
> -include package/gstreamer1/*/*.mk
> +include $(sort $(wildcard package/gstreamer1/*/*.mk))
> diff --git a/toolchain/toolchain-external/toolchain-external.mk b/toolchain/toolchain-external/toolchain-external.mk
> index 48de1e71f2..dd07884c7e 100644
> --- a/toolchain/toolchain-external/toolchain-external.mk
> +++ b/toolchain/toolchain-external/toolchain-external.mk
> @@ -25,4 +25,4 @@ $(error No prefix selected for external toolchain package $(BR2_PACKAGE_PROVIDES
>  endif
>  endif
>  
> -include toolchain/toolchain-external/*/*.mk
> +include $(sort $(wildcard toolchain/toolchain-external/*/*.mk))
> 

-- 
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF

^ permalink raw reply	[flat|nested] 6+ messages in thread
* [Buildroot] [PATCH v1] Fix makefile include order by using sort/wildcard.
  2017-11-23 23:23 ` Arnout Vandecappelle
@ 2017-11-27 10:07   ` Peter Korsgaard
  2017-11-27 11:29     ` Baruch Siach
  0 siblings, 1 reply; 6+ messages in thread
From: Peter Korsgaard @ 2017-11-27 10:07 UTC (permalink / raw)
  To: buildroot

>>>>> "Arnout" == Arnout Vandecappelle <arnout@mind.be> writes:

 > On 21-11-17 20:13, Peter Seiderer wrote:
 >> Use ordered 'include $(sort $(wildcard ...))' instead of unordered
 >> direct 'include */*.mk'.
 >> 
 >> Fixes [1] reported by Petr Vorel:
 >> 
 >> make: *** No rule to make target 'toolchain-external-custom',
 >> needed by '.../build/toolchain-external/.stamp_configured'.  Stop.
 >> 
 >> [1] http://lists.busybox.net/pipermail/buildroot/2017-November/206969.html
 >> 
 >> Signed-off-by: Peter Seiderer <ps.report@gmx.net>

 >  There was one more include that wasn't sorted:

 > -include $(foreach dir,$(BR2_EXTERNAL_DIRS),$(dir)/docs/*/*.mk)

 > I've fixed that one as well, I've extended the commit log a little, and applied
 > to master, thanks.

Committed to 2017.02.x and 2017.08.x, thanks.

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 6+ messages in thread
* [Buildroot] [PATCH v1] Fix makefile include order by using sort/wildcard.
  2017-11-27 10:07   ` Peter Korsgaard
@ 2017-11-27 11:29     ` Baruch Siach
  2017-11-30  7:24       ` Peter Korsgaard
  0 siblings, 1 reply; 6+ messages in thread
From: Baruch Siach @ 2017-11-27 11:29 UTC (permalink / raw)
  To: buildroot

Hi Peter,

On Mon, Nov 27, 2017 at 11:07:52AM +0100, Peter Korsgaard wrote:
> >>>>> "Arnout" == Arnout Vandecappelle <arnout@mind.be> writes:
> 
>  > On 21-11-17 20:13, Peter Seiderer wrote:
>  >> Use ordered 'include $(sort $(wildcard ...))' instead of unordered
>  >> direct 'include */*.mk'.
>  >> 
>  >> Fixes [1] reported by Petr Vorel:
>  >> 
>  >> make: *** No rule to make target 'toolchain-external-custom',
>  >> needed by '.../build/toolchain-external/.stamp_configured'.  Stop.
>  >> 
>  >> [1] http://lists.busybox.net/pipermail/buildroot/2017-November/206969.html
>  >> 
>  >> Signed-off-by: Peter Seiderer <ps.report@gmx.net>
> 
>  >  There was one more include that wasn't sorted:
> 
>  > -include $(foreach dir,$(BR2_EXTERNAL_DIRS),$(dir)/docs/*/*.mk)
> 
>  > I've fixed that one as well, I've extended the commit log a little, and applied
>  > to master, thanks.
> 
> Committed to 2017.02.x and 2017.08.x, thanks.

Not in 2017.02.x as of commit 22b996fef069fe (ffmpeg: bump version to 3.2.9).

baruch

-- 
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -

^ permalink raw reply	[flat|nested] 6+ messages in thread
* [Buildroot] [PATCH v1] Fix makefile include order by using sort/wildcard.
  2017-11-27 11:29     ` Baruch Siach
@ 2017-11-30  7:24       ` Peter Korsgaard
  0 siblings, 0 replies; 6+ messages in thread
From: Peter Korsgaard @ 2017-11-30  7:24 UTC (permalink / raw)
  To: buildroot

>>>>> "Baruch" == Baruch Siach <baruch@tkos.co.il> writes:

Hi,

 >> > I've fixed that one as well, I've extended the commit log a little, and applied
 >> > to master, thanks.
 >> 
 >> Committed to 2017.02.x and 2017.08.x, thanks.

 > Not in 2017.02.x as of commit 22b996fef069fe (ffmpeg: bump version to 3.2.9).

Hmm, indeed not - I wonder what happened. I've added it now.

Thanks!

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-11-30  7:24 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-11-21 19:13 [Buildroot] [PATCH v1] Fix makefile include order by using sort/wildcard Peter Seiderer
2017-11-21 20:18 ` Petr Vorel
2017-11-23 23:23 ` Arnout Vandecappelle
2017-11-27 10:07   ` Peter Korsgaard
2017-11-27 11:29     ` Baruch Siach
2017-11-30  7:24       ` Peter Korsgaard

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.