Mesa (staging/21.3): android: define cpp_rtti=false because libLLVM is built w/o RTTI (v2)

[GitLab Mirror]

Module: Mesa
Branch: staging/21.3
Commit: 8086310d5664fc688158f5b760d639bc12f05547
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8086310d5664fc688158f5b760d639bc12f05547

Author: Mauro Rossi <issor.oruam at gmail.com>
Date:   Sat Nov 20 00:47:18 2021 +0100

android: define cpp_rtti=false because libLLVM is built w/o RTTI (v2)

libLLVM for Android is built without RTTI, but after commit ad86267
mesa inherits meson default RTTI enabled state.

cpp_rtti=false is added to meson options in android/mesa3d_cross.mk

(v2) Add Fixes tag and use spaces instead of tabs for aligning the trailing \

Signed-off-by: Mauro Rossi <issor.oruam at gmail.com>
Fixes: ad862674 ("meson: Don't override built-in cpp_rtti option, error if it's invalid")
Cc: "21.3" "21.2" mesa-stable
Reviewed-by: Marijn Suijten <marijn.suijten at somainline.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13901>
(cherry picked from commit 1ba231fb75be5bffd806cbd09ac285d1f8f15e3d)

---

 .pick_status.json       | 2 +-
 android/mesa3d_cross.mk | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index def42b7c883..396fe37cb5a 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -4,7 +4,7 @@
         "description": "android: define cpp_rtti=false because libLLVM is built w/o RTTI (v2)",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "ad8626741236c312b08fcdf445fd806cf46b628f"
     },
diff --git a/android/mesa3d_cross.mk b/android/mesa3d_cross.mk
index 3e0622159fe..e211cb8f269 100644
--- a/android/mesa3d_cross.mk
+++ b/android/mesa3d_cross.mk
@@ -93,6 +93,7 @@ MESON_GEN_NINJA := \
 	-Dvulkan-drivers=$(subst $(space),$(comma),$(subst radeon,amd,$(BOARD_MESA3D_VULKAN_DRIVERS)))   \
 	-Dgbm=enabled                                                                \
 	-Degl=enabled                                                                \
+	-Dcpp_rtti=false                                                             \
 
 MESON_BUILD := PATH=/usr/bin:/bin:/sbin:$$PATH ninja -C $(MESON_OUT_DIR)/build