This project is archived. Its data is read-only.

Commit c9833791 authored Jul 03, 2012 by Arnout Vandecappelle (Essensium/Mind) Committed by Thomas Petazzoni Jul 17, 2012

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>

parent d09967e0

docs/manual/adding-packages-autotargets.txt

+4 −6

Original line number	Diff line number	Diff line
		@@ -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

docs/manual/adding-packages-cmaketargets.txt

+4 −5

Original line number	Diff line number	Diff line
		@@ -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+

docs/manual/adding-packages-gentargets.txt

+11 −14

Original line number	Diff line number	Diff line
		@@ -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

package/pkg-autotargets.mk

+2 −7

Original line number	Diff line number	Diff line
		@@ -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)

package/pkg-cmaketargets.mk

+2 −7

Original line number	Diff line number	Diff line
		@@ -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