summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2011-09-17 20:22:57 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2011-09-18 21:00:07 (GMT)
commita473a616d27e46951a23d90249a31b08006098bf (patch)
tree0ccfb0b3341b0d51bc43d34de75f0b804662e65c
parent4b78a5008995d459399a38692d436eceb7c2278d (diff)
downloadbuildroot-a473a616d27e46951a23d90249a31b08006098bf.tar.gz
buildroot-a473a616d27e46951a23d90249a31b08006098bf.tar.bz2
package: change ordering of steps
Currently, the dependency chain is : configure -> patch patch -> extract extract -> depends depends -> source + dependencies ready This is a problem for RTAI, as : * In linux/linux-ext-rtai.mk, we need the RTAI source code to be extracted/patched by the RTAI package, so we need to have a dependency on RTAI. * The RTAI package cannot have its configure step executed before the Linux kernel is built, because it needs the kernel source code to be extracted and configured. Therefore, we have a sort of circular dependency. We solve this circular dependency by having the RTAI kernel part depending on rtai-patch, and having the RTAI userspace part depending on the linux package. However, for this to work, we have to modify the dependency chain to: configure -> patch + depends patch -> extract extract -> source depends -> dependencies ready Which means that dependencies are guaranteed to be built not when the package is extracted, but when the package is configured. Which is technically more correct that what we were doing in the past. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/Makefile.package.in6
1 files changed, 3 insertions, 3 deletions
diff --git a/package/Makefile.package.in b/package/Makefile.package.in
index 0751144..66be0a2 100644
--- a/package/Makefile.package.in
+++ b/package/Makefile.package.in
@@ -487,15 +487,15 @@ $(1)-install-host: $(1)-build $$($(2)_TARGET_INSTALL_HOST)
$(1)-build: $(1)-configure \
$$($(2)_TARGET_BUILD)
-$(1)-configure: $(1)-patch \
+$(1)-configure: $(1)-patch $(1)-depends \
$$($(2)_TARGET_CONFIGURE)
$(1)-patch: $(1)-extract $$($(2)_TARGET_PATCH)
-$(1)-extract: $(1)-depends \
+$(1)-extract: $(1)-source \
$$($(2)_TARGET_EXTRACT)
-$(1)-depends: $(1)-source $$($(2)_DEPENDENCIES)
+$(1)-depends: $$($(2)_DEPENDENCIES)
$(1)-show-depends:
@echo $$($(2)_DEPENDENCIES)