From c98337911cc2427f9cf78e9da44a1b1dead61d4b Mon Sep 17 00:00:00 2001 From: "Arnout Vandecappelle (Essensium/Mind)" Date: Tue, 3 Jul 2012 00:05:46 +0200 Subject: pkg-infra: add host-xxx-package macro Create host-generic-package, host-autotools-package and host-cmake-package macros. Such a macro is more intuitive to use than the $(call ...,host) construct. Also it speeds things up by having one less $(call ...) evaluation. Also includes documentation update, but not for buildroot.html. This brings the time for 'make -qp' (which is used by bash-completion) down from 1.85s to 1.35s on my laptop. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- docs/manual/adding-packages-autotargets.txt | 10 ++++------ docs/manual/adding-packages-cmaketargets.txt | 9 ++++----- docs/manual/adding-packages-gentargets.txt | 25 +++++++++++-------------- 3 files changed, 19 insertions(+), 25 deletions(-) (limited to 'docs') diff --git a/docs/manual/adding-packages-autotargets.txt b/docs/manual/adding-packages-autotargets.txt index 428a1822b..09a2e7c09 100644 --- a/docs/manual/adding-packages-autotargets.txt +++ b/docs/manual/adding-packages-autotargets.txt @@ -23,7 +23,7 @@ package, with an example : 11: LIBFOO_CONF_OPT = --enable-shared 12: LIBFOO_DEPENDENCIES = libglib2 host-pkg-config 13: -14: $(eval $(call AUTOTARGETS)) +14: $(eval $(AUTOTARGETS)) ------------------------ On line 6, we declare the version of the package. @@ -67,11 +67,9 @@ package to be built. ~~~~~~~~~~~~~~~~~~~~~~~ The main macro of the autotools package infrastructure is -+AUTOTARGETS+. It has the same number of arguments and the -same semantic as the +GENTARGETS+ macro, which is the main -macro of the generic package infrastructure. For autotools packages, the -ability to have target and host packages is also available (and is -actually widely used). ++AUTOTARGETS+. It is similar to the +GENTARGETS+ macro. The ability to +have target and host packages is also available, with the ++host-autotools-package+ macro. Just like the generic infrastructure, the autotools infrastructure works by defining a number of variables before calling the diff --git a/docs/manual/adding-packages-cmaketargets.txt b/docs/manual/adding-packages-cmaketargets.txt index 3e400ec14..a29404270 100644 --- a/docs/manual/adding-packages-cmaketargets.txt +++ b/docs/manual/adding-packages-cmaketargets.txt @@ -23,7 +23,7 @@ with an example : 11: LIBFOO_CONF_OPT = -DBUILD_DEMOS=ON 12: LIBFOO_DEPENDENCIES = libglib2 host-pkg-config 13: -14: $(eval $(call CMAKETARGETS)) +14: $(eval $(CMAKETARGETS)) ------------------------ On line 6, we declare the version of the package. @@ -66,10 +66,9 @@ package to be built. ~~~~~~~~~~~~~~~~~~~~~~~~ The main macro of the CMake package infrastructure is -+CMAKETARGETS+. It has the same number of arguments and the same -semantic as the +GENTARGETS+ macro, which is the main macro of the -generic package infrastructure. For CMake packages, the ability to -have target and host packages is also available. ++CMAKETARGETS+. It is similar to the +GENTARGETS+ macro. The ability to +have target and host packages is also available, with the ++host-cmake-package+ macro. Just like the generic infrastructure, the CMake infrastructure works by defining a number of variables before calling the +CMAKETARGETS+ diff --git a/docs/manual/adding-packages-gentargets.txt b/docs/manual/adding-packages-gentargets.txt index 6e9dc8990..2e9ebef71 100644 --- a/docs/manual/adding-packages-gentargets.txt +++ b/docs/manual/adding-packages-gentargets.txt @@ -46,7 +46,7 @@ system is based on hand-written Makefiles or shell scripts. 32: /bin/foo f 4755 0 0 - - - - - 33: endef 34: -35: $(eval $(call GENTARGETS)) +35: $(eval $(GENTARGETS)) -------------------------------- The Makefile begins on line 6 to 8 with metadata information: the @@ -92,19 +92,16 @@ Makefile code necessary to make your package working. +GENTARGETS+ Reference ~~~~~~~~~~~~~~~~~~~~~~ -The +GENTARGETS+ macro takes one optional argument. This argument can -be used to tell if the package is a target package (cross-compiled for -the target) or a host package (natively compiled for the host). If -unspecified, it is assumed that it is a target package. See below for -details. - -For a given package, in a single +.mk+ file, it is possible to call -GENTARGETS twice, once to create the rules to generate a target +There are two variants of the generic target. The +GENTARGETS+ macro is +used for packages to be cross-compiled for the target. The ++host-generic-package+ macro is used for host packages, natively compiled +for the host. It is possible to call both of them in a single +.mk+ +file: once to create the rules to generate a target package and once to create the rules to generate a host package: ---------------------- -$(eval $(call GENTARGETS)) -$(eval $(call GENTARGETS,host)) +$(eval $(GENTARGETS)) +$(eval $(host-generic-package)) ---------------------- This might be useful if the compilation of the target package requires @@ -115,12 +112,12 @@ some tools to be installed on the host. If the package name is variables of other packages, if they depend on +libfoo+ or +host-libfoo+. -The call to the +GENTARGETS+ macro *must* be at the end of the +.mk+ -file, after all variable definitions. +The call to the +GENTARGETS+ and/or +host-generic-package+ macro *must* be +at the end of the +.mk+ file, after all variable definitions. For the target package, the +GENTARGETS+ uses the variables defined by the .mk file and prefixed by the uppercased package name: -+LIBFOO_*+. For the host package, it uses the +HOST_LIBFOO_*+. For ++LIBFOO_*+. +host-generic-package+ uses the +HOST_LIBFOO_*+ variables. For 'some' variables, if the +HOST_LIBFOO_+ prefixed variable doesn't exist, the package infrastructure uses the corresponding variable prefixed by +LIBFOO_+. This is done for variables that are likely to -- cgit v1.2.3