Attachment 131300 Details for Bug 100978 – [patch] Define GBM_BO_MAP only when symbol is found

[patch] [patch] Define GBM_BO_MAP only when symbol is found

define-GBM_BO_MAP-only-when-symbol-is-found.patch (text/plain), 1.90 KB, created by Daniel Díaz on 2017-05-10 19:15:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Díaz

Created: 2017-05-10 19:15:43 UTC

Size: 1.90 KB

patch

obsolete

>From c9ecc6235a19e046b2f5500a297876caf1cc0e6c Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Daniel=20D=C3=ADaz?= <daniel.diaz@linaro.org>
>Date: Thu, 4 May 2017 00:57:39 -0500
>Subject: [PATCH] CMake: define GBM_BO_MAP only when symbol is found
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>gbm_bo_map() and _unmap() have been added recently to Mesa,
>and this update may not have reached all implementations of
>GBM, such as the one provided by Mali r6, where said
>definitions can be found in the header file but not in the
>library itself. This leads to errors like the following when
>linking:
>  ../../../../lib/libpiglitutil_gl.so.0: undefined reference to `gbm_bo_unmap'
>  ../../../../lib/libpiglitutil_gl.so.0: undefined reference to `gbm_bo_map'
>  collect2: error: ld returned 1 exit status
>  make[2]: *** [bin/point-sprite] Error 1
>
>Instead of relying on the header file, actually try to link
>using that symbol to determine if PIGLIT_HAS_GBM_BO_MAP
>should be defined.
>
>Signed-off-by: Daniel DÃaz <daniel.diaz@linaro.org>
>---
> CMakeLists.txt | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
>diff --git a/CMakeLists.txt b/CMakeLists.txt
>index 983f4a3..2e5512a 100644
>--- a/CMakeLists.txt
>+++ b/CMakeLists.txt
>@@ -141,10 +141,14 @@ IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
> 	if(GBM_FOUND)
> 		set(PIGLIT_HAS_GBM True)
> 		add_definitions(-DPIGLIT_HAS_GBM)
>-		if (GBM_VERSION VERSION_EQUAL "12.1" OR GBM_VERSION VERSION_GREATER "12.1")
>-			set(PIGLIT_HAS_GBM_BO_MAP True)
>+		set(OLD_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
>+		set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} gbm)
>+		CHECK_FUNCTION_EXISTS(gbm_bo_map PIGLIT_HAS_GBM_BO_MAP)
>+		if (PIGLIT_HAS_GBM_BO_MAP)
> 			add_definitions(-DPIGLIT_HAS_GBM_BO_MAP)
> 		endif()
>+		set(CMAKE_REQUIRED_LIBRARIES ${OLD_REQUIRED_LIBRARIES})
>+
> 	endif(GBM_FOUND)
> 
> 	pkg_check_modules(WAYLAND QUIET wayland-client wayland-egl)
>-- 
>1.9.1
>

Actions: View | Splinter Review

Attachments on bug 100978: 131300

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.