Commit d4f2f892 authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

directfb: fixup input/gfx drivers handling after 0e4d25ff



The input/gfx drivers handling got broken by the ':=' -> '=' conversion,
as we redefine the variables in terms of themselves, causing recursion.

Fix it by directly assigning the result to DIRECTFB_CONF_OPT instead.

Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent c7a81abc
Loading
Loading
Loading
Loading
+6 −8
Original line number Diff line number Diff line
@@ -63,13 +63,12 @@ DIRECTFB_GFX = \
	$(if $(BR2_PACKAGE_DIRECTFB_EP9X),ep9x)

ifeq ($(strip $(DIRECTFB_GFX)),)
DIRECTFB_GFX = none
DIRECTFB_CONF_OPT += --with-gfxdrivers=none
else
DIRECTFB_GFX = $(subst $(space),$(comma),$(strip $(DIRECTFB_GFX)))
DIRECTFB_CONF_OPT += \
	--with-gfxdrivers=$(subst $(space),$(comma),$(strip $(DIRECTFB_GFX)))
endif

DIRECTFB_CONF_OPT += --with-gfxdrivers=$(DIRECTFB_GFX)

DIRECTFB_INPUT = \
	$(if $(BR2_PACKAGE_DIRECTFB_LINUXINPUT),linuxinput) \
	$(if $(BR2_PACKAGE_DIRECTFB_KEYBOARD),keyboard) \
@@ -82,13 +81,12 @@ DIRECTFB_DEPENDENCIES += tslib
endif

ifeq ($(strip $(DIRECTFB_INPUT)),)
DIRECTFB_INPUT = none
DIRECTFB_CONF_OPT += --with-inputdrivers=none
else
DIRECTFB_INPUT = $(subst $(space),$(comma),$(strip $(DIRECTFB_INPUT)))
DIRECTFB_CONF_OPT += \
	--with-inputdrivers=$(subst $(space),$(comma),$(strip $(DIRECTFB_INPUT)))
endif

DIRECTFB_CONF_OPT += --with-inputdrivers=$(DIRECTFB_INPUT)

ifeq ($(BR2_PACKAGE_DIRECTFB_GIF),y)
DIRECTFB_CONF_OPT += --enable-gif
else