Module: Mesa
Branch: master
Commit: 41b5620492d0a050cbed4c94486ef8d8a190c445
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=41b5620492d0a050cbed4c94486ef8d8a190c445

Author: Mauro Rossi <issor.or...@gmail.com>
Date:   Sat Feb 18 23:10:24 2017 +0100

android: define HAVE_DL_ITERATE_PHDR for build-id code

Required due to d4fa083 "util: Add utility build-id code."
to avoid following build error and warnings:

external/mesa/src/intel/vulkan/anv_device.c:60:32: error: incompatible integer 
to pointer conversion initializing 'const struct build_id_note *' with an 
expression of type 'int' [-Werror,-Wint-conversion]
   const struct build_id_note *note = build_id_find_nhdr("libvulkan_intel.so");
                               ^      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
external/mesa/src/intel/vulkan/anv_device.c:64:19: warning: implicit 
declaration of function 'build_id_length' is invalid in C99 
[-Wimplicit-function-declaration]
   unsigned len = build_id_length(note);
                  ^
external/mesa/src/intel/vulkan/anv_device.c:68:4: warning: implicit declaration 
of function 'build_id_read' is invalid in C99 [-Wimplicit-function-declaration]
   build_id_read(note, uuid, VK_UUID_SIZE);
   ^
3 warnings and 1 error generated.
[ 40% 1438/3588] target  C: libmesa_vulkan_common_32 <= 
external/mesa/src/intel/vulkan/anv_image.c
ninja: build stopped: subcommand failed.
build/core/ninja.mk:148: recipe for target 'ninja_wrapper' failed
make: *** [ninja_wrapper] Error 1

Fixes: d4fa083e11f ("util: Add utility build-id code.")
Reviewed-by: Tapani Pälli <tapani.pa...@intel.com>
Acked-by: Emil Velikov <emil.veli...@collabora.com>

---

 Android.common.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Android.common.mk b/Android.common.mk
index b03876d..611162a 100644
--- a/Android.common.mk
+++ b/Android.common.mk
@@ -60,6 +60,7 @@ LOCAL_CFLAGS += \
        -DHAVE___BUILTIN_UNREACHABLE \
        -DHAVE_PTHREAD=1 \
        -DHAVE_DLOPEN \
+       -DHAVE_DL_ITERATE_PHDR \
        -fvisibility=hidden \
        -Wno-sign-compare
 

_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to