From 2ebf5095f20bfbe63a2c9e8cf79c804612dae110 Mon Sep 17 00:00:00 2001 From: SooChan Lim Date: Fri, 22 Aug 2014 21:00:47 +0900 Subject: [PATCH] do not build drm_slp_bufmgr when the arch is x86_64 Change-Id: If916e37be147b71be2e20155328b95787cf59801 --- Makefile.am | 8 +++++++- configure.ac | 7 +++++++ packaging/libtbm.spec | 7 ++++++- 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index a11ecfd..1146497 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,10 @@ -SUBDIRS = src drm_slp +SUBDIRS = + +if HOST_CPU_X86_64 +SUBDIRS += src +else +SUBDIRS += src drm_slp +endif pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libtbm.pc diff --git a/configure.ac b/configure.ac index 4f49c76..1c3b43f 100644 --- a/configure.ac +++ b/configure.ac @@ -101,8 +101,15 @@ else AC_DEFINE(HAVE_WAYLAND,1,[The window system is WAYLAND.]) fi +HOST_CPU_X86_64=no +case $host_cpu in + x86_64*|amd64*) + HOST_CPU_X86_64=yes +esac + AM_CONDITIONAL(HAVE_TBM_PLATFORM_X11, test "x$TBM_PLATFORM" = "xX11") AM_CONDITIONAL(HAVE_TBM_PLATFORM_WAYLAND, test "x$TBM_PLATFORM" = "xWAYLAND") +AM_CONDITIONAL(HOST_CPU_X86_64, test "x$HOST_CPU_X86_64" = "xyes") AC_OUTPUT([ src/Makefile diff --git a/packaging/libtbm.spec b/packaging/libtbm.spec index 66cf919..ffbaeff 100644 --- a/packaging/libtbm.spec +++ b/packaging/libtbm.spec @@ -69,7 +69,10 @@ rm -rf %{buildroot} %defattr(-,root,root,-) /usr/share/license/%{name} %{_libdir}/libtbm.so.* +%ifarch x86_64 +%else %{_libdir}/libdrm_slp.so.* +%endif %files devel %defattr(-,root,root,-) @@ -80,6 +83,8 @@ rm -rf %{buildroot} %{_includedir}/tbm_bufmgr_backend.h %{_includedir}/tbm_type.h %{_libdir}/libtbm.so +%ifarch x86_64 +%else %{_libdir}/libdrm_slp.so +%endif %{_libdir}/pkgconfig/libtbm.pc - -- 2.7.4