Quellcode durchsuchen

webkit: prefer X11 backend if both directfb and x11 are available

This shouldn't happen with any sane configuration, but is possible with
randpackageconfig builds, where it breaks the build as libgtk would prefer
X11 and webkit directfb, causing it to fail with:

No package 'gtk+-directfb-2.0' found

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Peter Korsgaard vor 14 Jahren
Ursprung
Commit
07c469ed16
1 geänderte Dateien mit 1 neuen und 3 gelöschten Zeilen
  1. 1 3
      package/webkit/webkit.mk

+ 1 - 3
package/webkit/webkit.mk

@@ -14,9 +14,7 @@ WEBKIT_CONF_ENV = ac_cv_path_icu_config=$(STAGING_DIR)/usr/bin/icu-config
 ifeq ($(BR2_PACKAGE_XORG7),y)
 	WEBKIT_CONF_OPT += --with-target=x11
 	WEBKIT_DEPENDENCIES += xserver_xorg-server xlib_libXt
-endif
-
-ifeq ($(BR2_PACKAGE_DIRECTFB),y)
+else
 	WEBKIT_CONF_OPT += --with-target=directfb
 	WEBKIT_DEPENDENCIES += directfb
 endif