Skip to contentSkip to conversation

package infra: remove duplicates in dependencies list

PATCH New Yann E. MORIN 2 participants 4 messages Jun 1, 2014 – Jun 8, 2014

lore
Share & tools
lore

Yann E. MORIN

author
#0 lore raw

PATCH 1/1 package infra: remove duplicates 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 has 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.

Signed-off-by "Yann E. MORIN" <[email protected]>
Cc Thomas De Schampheleire <[email protected]>

---
Changes v1 -> v2:
- fix typoes in commit log (Thomas)
- s/dupes/duplicates/ (Thomas)

---
 package/pkg-generic.mk | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)
package/pkg-generic.mk +9 -6
index 5116ed9..e950569 100644
@@ -391,6 +391,9 @@ $(2)_DEPENDENCIES += toolchain
 endif
 endif
 
+# Eliminate duplicates 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
#1 lore raw

PATCH 1/1 package infra: remove duplicates in dependencies list

Dear Yann E. MORIN,

Quoted 8 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 example, php has two options to add SQL support: 'mysql' or 'mysqli', which are not exclusive. So, php.mk has mysql twice as a dependency.

Quoted 5 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.

Typo: dependencies

Also, I'm wondering: is it necessary to do this in the core package infrastructure, or should we do it in the graph-depends tool, or even do it only in the $(1)-show-depends target? I don't have a strong disagreement with the patch, maybe after all it's cleaner to have the dependencies sorted and with duplicates removed.

Best regards,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
author
#2 lore raw

PATCH 1/1 package infra: remove duplicates in dependencies list

Thomas, All,

On 2014-06-01 15:15 +0200, Thomas Petazzoni spake thusly:

Quoted 9 lines · Yann E. MORIN
Quoted 8 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 example, php has two options to add SQL support: 'mysql' or 'mysqli', which are not exclusive. So, php.mk has mysql twice as a dependency.

Quoted 7 lines
Quoted 5 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.

Typo: dependencies

Grr.. I missed that one, already reported by the other Thomas... :-/

Quoted 5 lines

Also, I'm wondering: is it necessary to do this in the core package infrastructure, or should we do it in the graph-depends tool, or even do it only in the $(1)-show-depends target? I don't have a strong disagreement with the patch, maybe after all it's cleaner to have the dependencies sorted and with duplicates removed.

IMHO, it makes sense to cleanup and sort dependencies, even for make rules.

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.  |
'------------------------------^-------^------------------^--------------------'
Applied
#3 lore raw

PATCH 1/1 package infra: remove duplicates in dependencies list

In reply to Yann E. MORIN

Dear Yann E. MORIN,

Quoted 11 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 example, php has two options to add SQL support: 'mysql' or 'mysqli', which are not exclusive. So, php.mk has 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.

Quoted 8 lines

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.

Signed-off-by "Yann E. MORIN" <[email protected]>
Cc Thomas De Schampheleire <[email protected]>

Applied, thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com