package infra: remove duplicats in dependencies list
PATCH 1/1 package infra: remove duplicats in dependencies list
From: "Yann E. MORIN" <[email protected]>
Currently, we just use what a package declares as its dependencies.
But some packages may declare the same depdency more than once. For example, php has two options to add SQL support: 'mysql' or 'mysqli', which are not exclusive. So, php.mk ahs mysql twice as a dependency.
Although that does not cause any grievance for make, we end up generating dependency graphs where this duplicate dependency is visible.
Add an intermediary variable which contains the $(sort)-ed list of the dependnecies, thus eliminating any duplicates.
This has the side effect of also sorting the list, which is probably good for reproducibility anyway.
--- package/pkg-generic.mk | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
package/pkg-generic.mk +9 -6
@@ -391,6 +391,9 @@ $(2)_DEPENDENCIES += toolchain endif endif +# Eliminate dupes in dependencies +$(2)_FINAL_DEPENDENCIES = $$(sort $$($(2)_DEPENDENCIES)) + $(2)_INSTALL_STAGING ?= NO $(2)_INSTALL_IMAGES ?= NO $(2)_INSTALL_TARGET ?= YES
@@ -476,14 +479,14 @@ $$($(2)_TARGET_INSTALL_HOST): $$($(2)_TARGET_BUILD) $(1)-build: $$($(2)_TARGET_BUILD) $$($(2)_TARGET_BUILD): $$($(2)_TARGET_CONFIGURE) -# Since $(2)_DEPENDENCIES are phony targets, they are always "newer" +# Since $(2)_FINAL_DEPENDENCIES are phony targets, they are always "newer" # than $(2)_TARGET_CONFIGURE. This would force the configure step (and # therefore the other steps as well) to be re-executed with every -# invocation of make. Therefore, make $(2)_DEPENDENCIES an order-only +# invocation of make. Therefore, make $(2)_FINAL_DEPENDENCIES an order-only # dependency by using |. $(1)-configure: $$($(2)_TARGET_CONFIGURE) -$$($(2)_TARGET_CONFIGURE): | $$($(2)_DEPENDENCIES) +$$($(2)_TARGET_CONFIGURE): | $$($(2)_FINAL_DEPENDENCIES) $$($(2)_TARGET_SOURCE) $$($(2)_TARGET_RSYNC): | dirs prepare ifeq ($(filter $(1),$(DEPENDENCIES_HOST_PREREQ)),)
@@ -505,7 +508,7 @@ $$($(2)_TARGET_PATCH): $$($(2)_TARGET_EXTRACT) $(1)-extract: $$($(2)_TARGET_EXTRACT) $$($(2)_TARGET_EXTRACT): $$($(2)_TARGET_SOURCE) -$(1)-depends: $$($(2)_DEPENDENCIES) +$(1)-depends: $$($(2)_FINAL_DEPENDENCIES) $(1)-source: $$($(2)_TARGET_SOURCE) else
@@ -515,7 +518,7 @@ else # configure $$($(2)_TARGET_CONFIGURE): $$($(2)_TARGET_RSYNC) -$(1)-depends: $$($(2)_DEPENDENCIES) +$(1)-depends: $$($(2)_FINAL_DEPENDENCIES) $(1)-patch: $(1)-rsync $(1)-extract: $(1)-rsync
@@ -526,7 +529,7 @@ $(1)-source: $$($(2)_TARGET_RSYNC_SOURCE) endif $(1)-show-depends: - @echo $$($(2)_DEPENDENCIES) + @echo $$($(2)_FINAL_DEPENDENCIES) $(1)-graph-depends: @$(INSTALL) -d $(O)/graphs
Signature · 1 line
1.8.3.2
PATCH 1/1 package infra: remove duplicats in dependencies list
Hi Yann,
Quoted 5 lines · Yann E. MORIN
From: "Yann E. MORIN" <[email protected]>
Currently, we just use what a package declares as its dependencies.
But some packages may declare the same depdency more than once. For
Some typo nits:
title: duplicates
above: dependency
Quoted 2 lines
example, php has two options to add SQL support: 'mysql' or 'mysqli', which are not exclusive. So, php.mk ahs mysql twice as a dependency.
has
Quoted 9 lines
Although that does not cause any grievance for make, we end up generating dependency graphs where this duplicate dependency is visible.
Add an intermediary variable which contains the $(sort)-ed list of the dependnecies, thus eliminating any duplicates.
This has the side effect of also sorting the list, which is probably good for reproducibility anyway.
While I'm ok with the idea, it could cause some new build failures initially due to missing mandatory dependencies which were hidden behind the current order.
So I would add this to -next only so we have time to fix any problems.
Quoted 11 lines
Signed-off-by "Yann E. MORIN" <[email protected]>--- package/pkg-generic.mk | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)package/pkg-generic.mk +0
-0
package/pkg-generic.mk $(2)_DEPENDENCIES += toolchain · line 395
Quoted 5 lines
package/pkg-generic.mk +2
-0@@ -391,6 +391,9 @@ $(2)_DEPENDENCIES += toolchain endif endif +# Eliminate dupes in dependencies +$(2)_FINAL_DEPENDENCIES = $$(sort $$($(2)_DEPENDENCIES))
I would write the full word: duplicates
Quoted 41 lines
package/pkg-generic.mk +6
-5+ $(2)_INSTALL_STAGING ?= NO $(2)_INSTALL_IMAGES ?= NO $(2)_INSTALL_TARGET ?= YES@@ -476,14 +479,14 @@ $$($(2)_TARGET_INSTALL_HOST): $$($(2)_TARGET_BUILD) $(1)-build: $$($(2)_TARGET_BUILD) $$($(2)_TARGET_BUILD): $$($(2)_TARGET_CONFIGURE) -# Since $(2)_DEPENDENCIES are phony targets, they are always "newer" +# Since $(2)_FINAL_DEPENDENCIES are phony targets, they are always "newer" # than $(2)_TARGET_CONFIGURE. This would force the configure step (and # therefore the other steps as well) to be re-executed with every -# invocation of make. Therefore, make $(2)_DEPENDENCIES an order-only +# invocation of make. Therefore, make $(2)_FINAL_DEPENDENCIES an order-only # dependency by using |. $(1)-configure: $$($(2)_TARGET_CONFIGURE) -$$($(2)_TARGET_CONFIGURE): | $$($(2)_DEPENDENCIES) +$$($(2)_TARGET_CONFIGURE): | $$($(2)_FINAL_DEPENDENCIES) $$($(2)_TARGET_SOURCE) $$($(2)_TARGET_RSYNC): | dirs prepare ifeq ($(filter $(1),$(DEPENDENCIES_HOST_PREREQ)),)@@ -505,7 +508,7 @@ $$($(2)_TARGET_PATCH): $$($(2)_TARGET_EXTRACT) $(1)-extract: $$($(2)_TARGET_EXTRACT) $$($(2)_TARGET_EXTRACT): $$($(2)_TARGET_SOURCE) -$(1)-depends: $$($(2)_DEPENDENCIES) +$(1)-depends: $$($(2)_FINAL_DEPENDENCIES) $(1)-source: $$($(2)_TARGET_SOURCE) else@@ -515,7 +518,7 @@ else # configure $$($(2)_TARGET_CONFIGURE): $$($(2)_TARGET_RSYNC) -$(1)-depends: $$($(2)_DEPENDENCIES) +$(1)-depends: $$($(2)_FINAL_DEPENDENCIES) $(1)-patch: $(1)-rsync $(1)-extract: $(1)-rsync
package/pkg-generic.mk $(1)-source: $$($(2)_TARGET_RSYNC_SOURCE)
Quoted 9 lines
package/pkg-generic.mk +1
-2@@ -526,7 +529,7 @@ $(1)-source: $$($(2)_TARGET_RSYNC_SOURCE) endif $(1)-show-depends: - @echo $$($(2)_DEPENDENCIES) + @echo $$($(2)_FINAL_DEPENDENCIES) $(1)-graph-depends: @$(INSTALL) -d $(O)/graphs --
Best regards,
Thomas
PATCH 1/1 package infra: remove duplicats in dependencies list
Thomas, All,
On 2014-05-28 18:05 +0200, Thomas De Schampheleire spake thusly:
Quoted 11 lines · Yann E. MORIN
Quoted 5 lines
From: "Yann E. MORIN" <[email protected]>
Currently, we just use what a package declares as its dependencies.
But some packages may declare the same depdency more than once. For
Some typo nits:
title: duplicates
above: dependency
[--SNIP--]
Quoted 1 line
has
Gah. OK.
Quoted 6 lines
Quoted 6 lines
Although that does not cause any grievance for make, we end up generating dependency graphs where this duplicate dependency is visible.
Add an intermediary variable which contains the $(sort)-ed list of the dependnecies, thus eliminating any duplicates.
Quoted 7 lines
Quoted 2 lines
This has the side effect of also sorting the list, which is probably good for reproducibility anyway.
While I'm ok with the idea, it could cause some new build failures initially due to missing mandatory dependencies which were hidden behind the current order.
So I would add this to -next only so we have time to fix any problems.
Yes, I should have marked it for -next.
Quoted 4 lines
Quoted 2 lines
+# Eliminate dupes in dependencies +$(2)_FINAL_DEPENDENCIES = $$(sort $$($(2)_DEPENDENCIES))
I would write the full word: duplicates
OK.
Thanks for the review!
Regards,
Yann E. MORIN.
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'