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

Commit f72fe573 authored Feb 25, 2014 by eric.le.bihan.dev@free.fr Committed by Peter Korsgaard Feb 25, 2014

packages: improve dependency check in virtual packages.



The current version of dependency check for virtual package <foo>
defines FOO_CONFIGURE_CMDS to print an error message if the
dependencies are not met.

This patch updates all the virtual packages to use the GNU Make control
function $(error text...) instead.

This makes the error happen at the beginning of the build, with a clearer
message.

Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Reviewed-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

parent 4c10eedc

package/luainterpreter/luainterpreter.mk

+6 −0

Original line number	Diff line number	Diff line
		@@ -9,4 +9,10 @@ LUAINTERPRETER_DEPENDENCIES = $(call qstrip,$(BR2_PACKAGE_PROVIDES_LUA_INTERPRET

		LUAINTERPRETER_ABIVER = $(call qstrip,$(BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION))

		ifeq ($(BR2_PACKAGE_HAS_LUA_INTERPRETER),y)
		ifeq ($(LUAINTERPRETER_DEPENDENCIES),)
		$(error No lua interpreter implementation selected. Configuration error.)
		endif
		endif

		$(eval $(generic-package))

package/opengl/libegl/libegl.mk

+3 −4

Original line number	Diff line number	Diff line
		@@ -7,11 +7,10 @@
		LIBEGL_SOURCE =
		LIBEGL_DEPENDENCIES = $(call qstrip,$(BR2_PACKAGE_PROVIDES_OPENGL_EGL))

		ifeq ($(BR2_PACKAGE_HAS_OPENGL_EGL),y)
		ifeq ($(LIBEGL_DEPENDENCIES),)
		define LIBEGL_CONFIGURE_CMDS
		echo "No libEGL implementation selected. Configuration error."
		exit 1
		endef
		$(error No libEGL implementation selected. Configuration error.)
		endif
		endif

		$(eval $(generic-package))

package/opengl/libgles/libgles.mk

+3 −4

Original line number	Diff line number	Diff line
		@@ -7,11 +7,10 @@
		LIBGLES_SOURCE =
		LIBGLES_DEPENDENCIES = $(call qstrip,$(BR2_PACKAGE_PROVIDES_OPENGL_ES))

		ifeq ($(BR2_PACKAGE_HAS_OPENGL_ES),y)
		ifeq ($(LIBGLES_DEPENDENCIES),)
		define LIBGLES_CONFIGURE_CMDS
		echo "No libGLES implementation selected. Configuration error."
		exit 1
		endef
		$(error No libGLES implementation selected. Configuration error.)
		endif
		endif

		$(eval $(generic-package))

package/opengl/libopenmax/libopenmax.mk

+3 −4

Original line number	Diff line number	Diff line
		@@ -7,11 +7,10 @@
		LIBOPENMAX_SOURCE =
		LIBOPENMAX_DEPENDENCIES = $(call qstrip,$(BR2_PACKAGE_PROVIDES_OPENMAX))

		ifeq ($(BR2_PACKAGE_HAS_OPENMAX),y)
		ifeq ($(LIBOPENMAX_DEPENDENCIES),)
		define LIBOPENMAX_CONFIGURE_CMDS
		echo "No libopenmax implementation selected. Configuration error."
		exit 1
		endef
		$(error No libopenmax implementation selected. Configuration error.)
		endif
		endif

		$(eval $(generic-package))

package/opengl/libopenvg/libopenvg.mk

+3 −4

Original line number	Diff line number	Diff line
		@@ -7,11 +7,10 @@
		LIBOPENVG_SOURCE =
		LIBOPENVG_DEPENDENCIES = $(call qstrip,$(BR2_PACKAGE_PROVIDES_OPENVG))

		ifeq ($(BR2_PACKAGE_HAS_OPENVG),y)
		ifeq ($(LIBOPENVG_DEPENDENCIES),)
		define LIBOPENVG_CONFIGURE_CMDS
		echo "No libOpenVG implementation selected. Configuration error."
		exit 1
		endef
		$(error No libOpenVG implementation selected. Configuration error.)
		endif
		endif

		$(eval $(generic-package))