Re: [PATCH weston 2/2] Fix armhf configure breakage due to missing libdrm_intel package
On Sat, 15 Aug 2015 19:20:59 -0700 Bryce Harrington br...@osg.samsung.com wrote: On Fri, Aug 14, 2015 at 12:53:25PM -0700, Bryce Harrington wrote: The buildbots discovered that recent changes break on Ubuntu 15.04's armhf images: configure:16137: checking for SIMPLE_DMABUF_CLIENT configure:16144: $PKG_CONFIG --exists --print-errors wayland-client libdrm libdrm_intel Package libdrm_intel was not found in the pkg-config search path. ... configure:16194: error: Package requirements (wayland-client libdrm libdrm_intel) were not met: No package 'libdrm_intel' found This patch was provided by Daniel Stone. I've not tested it other than verifying it does not cause build problems on x86_64. Acked-by: Bryce Harrington br...@osg.samsung.com Signed-off-by: Bryce Harrington br...@osg.samsung.com I went ahead and landed both of these. Hi Bryce, I would've given R-b for both. Only after seeing the comments in irc of something breaking here I actually tried these and noticed that the auto case for simple-dmabuf never ends up building the program. :-) Really hard to spot the issue from reading the configure.ac, combined with 'make clean' not removing the old built binary, if configure later disabled it. Fix coming soon from me or Daniel. Thanks, pq pgp_glyXWaFxq.pgp Description: OpenPGP digital signature ___ wayland-devel mailing list wayland-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/wayland-devel
Re: [PATCH weston 2/2] Fix armhf configure breakage due to missing libdrm_intel package
On Fri, Aug 14, 2015 at 12:53:25PM -0700, Bryce Harrington wrote: The buildbots discovered that recent changes break on Ubuntu 15.04's armhf images: configure:16137: checking for SIMPLE_DMABUF_CLIENT configure:16144: $PKG_CONFIG --exists --print-errors wayland-client libdrm libdrm_intel Package libdrm_intel was not found in the pkg-config search path. ... configure:16194: error: Package requirements (wayland-client libdrm libdrm_intel) were not met: No package 'libdrm_intel' found This patch was provided by Daniel Stone. I've not tested it other than verifying it does not cause build problems on x86_64. Acked-by: Bryce Harrington br...@osg.samsung.com Signed-off-by: Bryce Harrington br...@osg.samsung.com I went ahead and landed both of these. Bryce --- configure.ac | 12 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index e610e2d..64d2d13 100644 --- a/configure.ac +++ b/configure.ac @@ -341,11 +341,15 @@ fi AC_ARG_ENABLE(simple-intel-dmabuf-client, AS_HELP_STRING([--disable-simple-intel-dmabuf-client], [do not build the simple intel dmabuf client]),, - enable_simple_intel_dmabuf_client=yes) -AM_CONDITIONAL(BUILD_SIMPLE_INTEL_DMABUF_CLIENT, test x$enable_simple_intel_dmabuf_client = xyes) -if test x$enable_simple_intel_dmabuf_client = xyes; then - PKG_CHECK_MODULES(SIMPLE_DMABUF_CLIENT, [wayland-client libdrm libdrm_intel]) + enable_simple_intel_dmabuf_client=auto) +if ! test x$enable_simple_intel_dmabuf_client = xno; then + PKG_CHECK_MODULES(SIMPLE_DMABUF_CLIENT, [wayland-client libdrm libdrm_intel], + have_simple_dmabuf_client=yes, have_simple_dmabuf_client=no) + if test x$have_simple_dmabuf_client = xno -a x$enable_simple_intel_dmabuf_client = xyes; then +AC_MSG_ERROR([Intel dmabuf client explicitly enabled, but libdrm_intel couldn't be found]) + fi fi +AM_CONDITIONAL(BUILD_SIMPLE_INTEL_DMABUF_CLIENT, test x$enable_simple_intel_dmabuf_client = xyes) AC_ARG_ENABLE(clients, [ --enable-clients],, enable_clients=yes) AM_CONDITIONAL(BUILD_CLIENTS, test x$enable_clients = xyes) -- 1.9.1 ___ wayland-devel mailing list wayland-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/wayland-devel
[PATCH weston 2/2] Fix armhf configure breakage due to missing libdrm_intel package
The buildbots discovered that recent changes break on Ubuntu 15.04's armhf images: configure:16137: checking for SIMPLE_DMABUF_CLIENT configure:16144: $PKG_CONFIG --exists --print-errors wayland-client libdrm libdrm_intel Package libdrm_intel was not found in the pkg-config search path. ... configure:16194: error: Package requirements (wayland-client libdrm libdrm_intel) were not met: No package 'libdrm_intel' found This patch was provided by Daniel Stone. I've not tested it other than verifying it does not cause build problems on x86_64. Acked-by: Bryce Harrington br...@osg.samsung.com Signed-off-by: Bryce Harrington br...@osg.samsung.com --- configure.ac | 12 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index e610e2d..64d2d13 100644 --- a/configure.ac +++ b/configure.ac @@ -341,11 +341,15 @@ fi AC_ARG_ENABLE(simple-intel-dmabuf-client, AS_HELP_STRING([--disable-simple-intel-dmabuf-client], [do not build the simple intel dmabuf client]),, - enable_simple_intel_dmabuf_client=yes) -AM_CONDITIONAL(BUILD_SIMPLE_INTEL_DMABUF_CLIENT, test x$enable_simple_intel_dmabuf_client = xyes) -if test x$enable_simple_intel_dmabuf_client = xyes; then - PKG_CHECK_MODULES(SIMPLE_DMABUF_CLIENT, [wayland-client libdrm libdrm_intel]) + enable_simple_intel_dmabuf_client=auto) +if ! test x$enable_simple_intel_dmabuf_client = xno; then + PKG_CHECK_MODULES(SIMPLE_DMABUF_CLIENT, [wayland-client libdrm libdrm_intel], + have_simple_dmabuf_client=yes, have_simple_dmabuf_client=no) + if test x$have_simple_dmabuf_client = xno -a x$enable_simple_intel_dmabuf_client = xyes; then +AC_MSG_ERROR([Intel dmabuf client explicitly enabled, but libdrm_intel couldn't be found]) + fi fi +AM_CONDITIONAL(BUILD_SIMPLE_INTEL_DMABUF_CLIENT, test x$enable_simple_intel_dmabuf_client = xyes) AC_ARG_ENABLE(clients, [ --enable-clients],, enable_clients=yes) AM_CONDITIONAL(BUILD_CLIENTS, test x$enable_clients = xyes) -- 1.9.1 ___ wayland-devel mailing list wayland-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/wayland-devel
