android: util/disk_cache: fix building errors in gallium drivers

Submitted by Mauro Rossi on July 21, 2018, 9:32 a.m.

Details

Message ID 20180721093246.26658-1-issor.oruam@gmail.com
State New
Headers show
Series "android: util/disk_cache: fix building errors in gallium drivers" ( rev: 1 ) in Mesa

Not browsing as part of any series.

Commit Message

Mauro Rossi July 21, 2018, 9:32 a.m.
This patch applies the necessary changes in Android.common.mk
as per automake rules, to avoid following building error:

external/mesa/src/gallium/drivers/nouveau/nouveau_screen.c:159:8:
error: implicit declaration of function 'disk_cache_get_function_timestamp'
is invalid in C99 [-Werror,-Wimplicit-function-declaration]
   if (disk_cache_get_function_timestamp(nouveau_disk_cache_create,
       ^
1 error generated.

Fixes: cc10b34 ("util/disk_cache: Fix disk_cache_get_function_timestamp with disabled cache.")
Signed-off-by: Mauro Rossi <issor.oruam@gmail.com>
---
 Android.common.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/Android.common.mk b/Android.common.mk
index 999e17789b..492a5fbeab 100644
--- a/Android.common.mk
+++ b/Android.common.mk
@@ -46,12 +46,12 @@  LOCAL_CFLAGS += \
 # here to fix the radeonsi build.
 LOCAL_CFLAGS += \
 	-DANDROID_API_LEVEL=$(PLATFORM_SDK_VERSION) \
-	-DENABLE_SHADER_CACHE \
 	-D__STDC_CONSTANT_MACROS \
 	-D__STDC_LIMIT_MACROS \
 	-DHAVE___BUILTIN_EXPECT \
 	-DHAVE___BUILTIN_FFS \
 	-DHAVE___BUILTIN_FFSLL \
+	-DHAVE_DLFCN_H \
 	-DHAVE_FUNC_ATTRIBUTE_FLATTEN \
 	-DHAVE_FUNC_ATTRIBUTE_UNUSED \
 	-DHAVE_FUNC_ATTRIBUTE_FORMAT \

Comments

ugh, yet another buildsystem.

Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>

On Sat, Jul 21, 2018 at 11:32 AM, Mauro Rossi <issor.oruam@gmail.com> wrote:
> This patch applies the necessary changes in Android.common.mk
> as per automake rules, to avoid following building error:
>
> external/mesa/src/gallium/drivers/nouveau/nouveau_screen.c:159:8:
> error: implicit declaration of function 'disk_cache_get_function_timestamp'
> is invalid in C99 [-Werror,-Wimplicit-function-declaration]
>    if (disk_cache_get_function_timestamp(nouveau_disk_cache_create,
>        ^
> 1 error generated.
>
> Fixes: cc10b34 ("util/disk_cache: Fix disk_cache_get_function_timestamp with disabled cache.")
> Signed-off-by: Mauro Rossi <issor.oruam@gmail.com>
> ---
>  Android.common.mk | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Android.common.mk b/Android.common.mk
> index 999e17789b..492a5fbeab 100644
> --- a/Android.common.mk
> +++ b/Android.common.mk
> @@ -46,12 +46,12 @@ LOCAL_CFLAGS += \
>  # here to fix the radeonsi build.
>  LOCAL_CFLAGS += \
>         -DANDROID_API_LEVEL=$(PLATFORM_SDK_VERSION) \
> -       -DENABLE_SHADER_CACHE \
>         -D__STDC_CONSTANT_MACROS \
>         -D__STDC_LIMIT_MACROS \
>         -DHAVE___BUILTIN_EXPECT \
>         -DHAVE___BUILTIN_FFS \
>         -DHAVE___BUILTIN_FFSLL \
> +       -DHAVE_DLFCN_H \
>         -DHAVE_FUNC_ATTRIBUTE_FLATTEN \
>         -DHAVE_FUNC_ATTRIBUTE_UNUSED \
>         -DHAVE_FUNC_ATTRIBUTE_FORMAT \
> --
> 2.17.1
>
On Sat, Jul 21, 2018 at 11:32 AM, Mauro Rossi <issor.oruam@gmail.com> wrote:
> This patch applies the necessary changes in Android.common.mk
> as per automake rules, to avoid following building error:
>
> external/mesa/src/gallium/drivers/nouveau/nouveau_screen.c:159:8:
> error: implicit declaration of function 'disk_cache_get_function_timestamp'
> is invalid in C99 [-Werror,-Wimplicit-function-declaration]
>    if (disk_cache_get_function_timestamp(nouveau_disk_cache_create,
>        ^
> 1 error generated.
>
> Fixes: cc10b34 ("util/disk_cache: Fix disk_cache_get_function_timestamp with disabled cache.")
> Signed-off-by: Mauro Rossi <issor.oruam@gmail.com>
> ---
>  Android.common.mk | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Android.common.mk b/Android.common.mk
> index 999e17789b..492a5fbeab 100644
> --- a/Android.common.mk
> +++ b/Android.common.mk
> @@ -46,12 +46,12 @@ LOCAL_CFLAGS += \
>  # here to fix the radeonsi build.
>  LOCAL_CFLAGS += \
>         -DANDROID_API_LEVEL=$(PLATFORM_SDK_VERSION) \
> -       -DENABLE_SHADER_CACHE \

On second thought, do you really want to remove this? It is not
necessary for it to work, the entire patch stuff was just for making
this work if not set.

>         -D__STDC_CONSTANT_MACROS \
>         -D__STDC_LIMIT_MACROS \
>         -DHAVE___BUILTIN_EXPECT \
>         -DHAVE___BUILTIN_FFS \
>         -DHAVE___BUILTIN_FFSLL \
> +       -DHAVE_DLFCN_H \
>         -DHAVE_FUNC_ATTRIBUTE_FLATTEN \
>         -DHAVE_FUNC_ATTRIBUTE_UNUSED \
>         -DHAVE_FUNC_ATTRIBUTE_FORMAT \
> --
> 2.17.1
>