diff options
| author | Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> | 2012-07-03 00:05:46 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2012-07-17 20:17:33 +0200 |
| commit | c98337911cc2427f9cf78e9da44a1b1dead61d4b (patch) | |
| tree | 071259690fa9af2b30348b3cb46f7e22cece0e09 /package | |
| parent | d09967e0716894b91d27348877467ecba5eccad0 (diff) | |
| download | buildroot-novena-c98337911cc2427f9cf78e9da44a1b1dead61d4b.tar.gz buildroot-novena-c98337911cc2427f9cf78e9da44a1b1dead61d4b.zip | |
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) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package')
| -rw-r--r-- | package/pkg-autotargets.mk | 9 | ||||
| -rw-r--r-- | package/pkg-cmaketargets.mk | 9 | ||||
| -rw-r--r-- | package/pkg-gentargets.mk | 11 |
3 files changed, 7 insertions, 22 deletions
diff --git a/package/pkg-autotargets.mk b/package/pkg-autotargets.mk index d31230dd7..d925cbb46 100644 --- a/package/pkg-autotargets.mk +++ b/package/pkg-autotargets.mk @@ -305,10 +305,5 @@ endef # Argument 1 is "target" or "host" [optional, default: "target"] ################################################################################ -define AUTOTARGETS -ifeq ($(1),host) -$(call AUTOTARGETS_INNER,$(1)-$(call pkgname),$(call UPPERCASE,$(1)-$(call pkgname)),$(call UPPERCASE,$(call pkgname)),$(call pkgparentdir),host) -else -$(call AUTOTARGETS_INNER,$(call pkgname),$(call UPPERCASE,$(call pkgname)),$(call UPPERCASE,$(call pkgname)),$(call pkgparentdir),target) -endif -endef +AUTOTARGETS = $(call AUTOTARGETS_INNER,$(call pkgname),$(call UPPERCASE,$(call pkgname)),$(call UPPERCASE,$(call pkgname)),$(call pkgparentdir),target) +host-autotools-package = $(call AUTOTARGETS_INNER,host-$(call pkgname),$(call UPPERCASE,host-$(call pkgname)),$(call UPPERCASE,$(call pkgname)),$(call pkgparentdir),host) diff --git a/package/pkg-cmaketargets.mk b/package/pkg-cmaketargets.mk index b405df505..71cc61036 100644 --- a/package/pkg-cmaketargets.mk +++ b/package/pkg-cmaketargets.mk @@ -190,13 +190,8 @@ endef # Argument 1 is "target" or "host" [optional, default: "target"] ################################################################################ -define CMAKETARGETS -ifeq ($(1),host) -$(call CMAKETARGETS_INNER,$(1)-$(call pkgname),$(call UPPERCASE,$(1)-$(call pkgname)),$(call UPPERCASE,$(call pkgname)),$(call pkgparentdir),host) -else -$(call CMAKETARGETS_INNER,$(call pkgname),$(call UPPERCASE,$(call pkgname)),$(call UPPERCASE,$(call pkgname)),$(call pkgparentdir),target) -endif -endef +CMAKETARGETS = $(call CMAKETARGETS_INNER,$(call pkgname),$(call UPPERCASE,$(call pkgname)),$(call UPPERCASE,$(call pkgname)),$(call pkgparentdir),target) +host-cmake-package = $(call CMAKETARGETS_INNER,host-$(call pkgname),$(call UPPERCASE,host-$(call pkgname)),$(call UPPERCASE,$(call pkgname)),$(call pkgparentdir),host) ################################################################################ # Generation of the CMake toolchain file diff --git a/package/pkg-gentargets.mk b/package/pkg-gentargets.mk index 51053359a..a9cee9099 100644 --- a/package/pkg-gentargets.mk +++ b/package/pkg-gentargets.mk @@ -504,14 +504,9 @@ endef # GENTARGETS_INNER # Argument 1 is "target" or "host" [optional, default: "target"] ################################################################################ -define GENTARGETS -ifeq ($(1),host) -# In the case of host packages, turn the package name "pkg" into "host-pkg" -$(call GENTARGETS_INNER,$(1)-$(call pkgname),$(call UPPERCASE,$(1)-$(call pkgname)),$(call UPPERCASE,$(call pkgname)),$(call pkgparentdir),host) -else # In the case of target packages, keep the package name "pkg" -$(call GENTARGETS_INNER,$(call pkgname),$(call UPPERCASE,$(call pkgname)),$(call UPPERCASE,$(call pkgname)),$(call pkgparentdir),target) -endif -endef +GENTARGETS = $(call GENTARGETS_INNER,$(call pkgname),$(call UPPERCASE,$(call pkgname)),$(call UPPERCASE,$(call pkgname)),$(call pkgparentdir),target) +# In the case of host packages, turn the package name "pkg" into "host-pkg" +host-generic-package = $(call GENTARGETS_INNER,host-$(call pkgname),$(call UPPERCASE,host-$(call pkgname)),$(call UPPERCASE,$(call pkgname)),$(call pkgparentdir),host) # :mode=makefile: |