From 155a48bac214bd600f4aaa4211469d9c8f2b48f5 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 28 Sep 2014 10:48:14 +0200 Subject: [PATCH] package/wayland: requires shared library Fixes CC src/libwayland_server_la-wayland-server.lo src/wayland-server.c:36:19: error: dlfcn.h: No such file or directory using this defconfig http://autobuild.buildroot.net/results/dfd/dfd81f1f1f0f315317b2a85d24b286a277ac7c16/ Signed-off-by: Bernd Kuhls Reviewed-by: "Yann E. MORIN" Signed-off-by: Peter Korsgaard --- package/gstreamer1/gst1-plugins-bad/Config.in | 1 + package/wayland/Config.in | 5 +++-- package/weston/Config.in | 6 ++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-bad/Config.in b/package/gstreamer1/gst1-plugins-bad/Config.in index 9cb275d944..c455acab74 100644 --- a/package/gstreamer1/gst1-plugins-bad/Config.in +++ b/package/gstreamer1/gst1-plugins-bad/Config.in @@ -372,6 +372,7 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DIRECTFB config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WAYLAND bool "wayland" depends on !BR2_avr32 # wayland + depends on !BR2_PREFER_STATIC_LIB # wayland depends on BR2_TOOLCHAIN_HAS_THREADS # wayland select BR2_PACKAGE_WAYLAND help diff --git a/package/wayland/Config.in b/package/wayland/Config.in index c92f9ea1fc..cb10fac2f1 100644 --- a/package/wayland/Config.in +++ b/package/wayland/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_WAYLAND bool "wayland" depends on !BR2_avr32 # no epoll_create1, timerfd_create or timerfd_settime + depends on !BR2_PREFER_STATIC_LIB # dlfcn.h depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_LIBFFI select BR2_PACKAGE_EXPAT @@ -11,6 +12,6 @@ config BR2_PACKAGE_WAYLAND http://wayland.freedesktop.org/ -comment "wayland needs a toolchain w/ threads" +comment "wayland needs a toolchain w/ threads, dynamic library" depends on !BR2_avr32 - depends on !BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_PREFER_STATIC_LIB diff --git a/package/weston/Config.in b/package/weston/Config.in index dc7e23501d..fafdf950c5 100644 --- a/package/weston/Config.in +++ b/package/weston/Config.in @@ -1,7 +1,8 @@ -comment "weston needs udev and a toolchain w/ threads, headers >= 3.0" +comment "weston needs udev and a toolchain w/ threads, dynamic library, headers >= 3.0" depends on !BR2_avr32 depends on BR2_ARCH_HAS_ATOMICS - depends on !BR2_PACKAGE_HAS_UDEV || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 + depends on !BR2_PACKAGE_HAS_UDEV || !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 || !BR2_PREFER_STATIC_LIB config BR2_PACKAGE_WESTON bool "weston" @@ -14,6 +15,7 @@ config BR2_PACKAGE_WESTON select BR2_PACKAGE_MTDEV depends on BR2_PACKAGE_HAS_UDEV depends on !BR2_avr32 # wayland + depends on !BR2_PREFER_STATIC_LIB # wayland depends on BR2_TOOLCHAIN_HAS_THREADS # wayland depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 depends on BR2_ARCH_HAS_ATOMICS # cairo -- 2.30.2