Re: [Mesa-dev] [RFC][PATCH 2/5] Android.common.mk: define HAVE_TIMESPEC_GET
On Wed, Jul 25, 2018 at 5:34 AM, Emil Velikov wrote: > On 25 July 2018 at 00:21, John Stultz wrote: >> From: Sumit Semwal >> >> This is a forward port of a patch from the AOSP/master tree: >> https://android.googlesource.com/platform/external/mesa3d/+/bd30b663f55f8af73a0be4446349c5a2d4c641b0%5E%21/ >> >> Since https://android-review.googlesource.com/c/718518 added >> timespec_get() to bionic, mesa3d doesn't build due to redefinition >> of timespec_get(). >> > Is this bionic commit available all the way back to Android 5? > If not, you should conditionally add the define where needed - see > Android.mk for examples. Ack. Just added that. Thanks for the review/feedback! -john ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
Re: [Mesa-dev] [RFC][PATCH 2/5] Android.common.mk: define HAVE_TIMESPEC_GET
On 25 July 2018 at 00:21, John Stultz wrote: > From: Sumit Semwal > > This is a forward port of a patch from the AOSP/master tree: > https://android.googlesource.com/platform/external/mesa3d/+/bd30b663f55f8af73a0be4446349c5a2d4c641b0%5E%21/ > > Since https://android-review.googlesource.com/c/718518 added > timespec_get() to bionic, mesa3d doesn't build due to redefinition > of timespec_get(). > Is this bionic commit available all the way back to Android 5? If not, you should conditionally add the define where needed - see Android.mk for examples. -Emil ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
[Mesa-dev] [RFC][PATCH 2/5] Android.common.mk: define HAVE_TIMESPEC_GET
From: Sumit Semwal This is a forward port of a patch from the AOSP/master tree: https://android.googlesource.com/platform/external/mesa3d/+/bd30b663f55f8af73a0be4446349c5a2d4c641b0%5E%21/ Since https://android-review.googlesource.com/c/718518 added timespec_get() to bionic, mesa3d doesn't build due to redefinition of timespec_get(). Avoid redefinition by defining HAVE_TIMESPEC_GET flag. Test: build and boot tested db820c to UI. Cc: Rob Herring Cc: Alistair Strachan Cc: Marissa Wall Cc: Sumit Semwal Cc: Emil Velikov Cc: Rob Clark Signed-off-by: Sumit Semwal Signed-off-by: John Stultz --- Android.common.mk | 4 1 file changed, 4 insertions(+) diff --git a/Android.common.mk b/Android.common.mk index 397dc03..e7828af 100644 --- a/Android.common.mk +++ b/Android.common.mk @@ -89,6 +89,10 @@ LOCAL_CPPFLAGS += \ LOCAL_CONLYFLAGS += \ -std=c99 +# c11 timespec_get is part of bionic as well +# https://android-review.googlesource.com/c/718518 +LOCAL_CFLAGS += -DHAVE_TIMESPEC_GET + ifeq ($(strip $(MESA_ENABLE_ASM)),true) ifeq ($(TARGET_ARCH),x86) LOCAL_CFLAGS += \ -- 2.7.4 ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
