From 02f3b965b9259d9a4cf677a345224a19077ea9db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20S=C3=B6ntgen?= Date: Fri, 15 Jul 2022 17:12:21 +0200 Subject: [PATCH] mesa/etnaviv: move to arm_v8 spec Issue #4559. --- repos/libports/lib/mk/{ => spec/arm_v8}/etnaviv.mk | 0 repos/libports/lib/mk/{ => spec/arm_v8}/mesa_gpu-etnaviv.mk | 0 repos/libports/recipes/src/mesa/content.mk | 4 ++-- repos/libports/src/lib/mesa/etnaviv/target.mk | 4 +++- 4 files changed, 5 insertions(+), 3 deletions(-) rename repos/libports/lib/mk/{ => spec/arm_v8}/etnaviv.mk (100%) rename repos/libports/lib/mk/{ => spec/arm_v8}/mesa_gpu-etnaviv.mk (100%) diff --git a/repos/libports/lib/mk/etnaviv.mk b/repos/libports/lib/mk/spec/arm_v8/etnaviv.mk similarity index 100% rename from repos/libports/lib/mk/etnaviv.mk rename to repos/libports/lib/mk/spec/arm_v8/etnaviv.mk diff --git a/repos/libports/lib/mk/mesa_gpu-etnaviv.mk b/repos/libports/lib/mk/spec/arm_v8/mesa_gpu-etnaviv.mk similarity index 100% rename from repos/libports/lib/mk/mesa_gpu-etnaviv.mk rename to repos/libports/lib/mk/spec/arm_v8/mesa_gpu-etnaviv.mk diff --git a/repos/libports/recipes/src/mesa/content.mk b/repos/libports/recipes/src/mesa/content.mk index 95f4c16cad..8c55501d84 100644 --- a/repos/libports/recipes/src/mesa/content.mk +++ b/repos/libports/recipes/src/mesa/content.mk @@ -3,9 +3,7 @@ all: content MIRROR_FROM_REP_DIR := \ lib/mk/egl.mk \ - lib/mk/mesa_gpu-etnaviv.mk \ lib/mk/mesa_gpu-softpipe.mk \ - lib/mk/etnaviv.mk \ lib/mk/iris_gen.inc \ lib/mk/isl_gen.inc \ lib/mk/glapi.mk \ @@ -13,7 +11,9 @@ MIRROR_FROM_REP_DIR := \ lib/mk/mesa_api.mk \ lib/mk/mesa-common.inc \ lib/mk/softpipe.mk \ + lib/mk/spec/arm_v8/etnaviv.mk \ lib/mk/spec/arm_v8/mesa.mk \ + lib/mk/spec/arm_v8/mesa_gpu-etnaviv.mk \ lib/mk/spec/x86/mesa_gpu-iris.mk \ lib/mk/spec/x86/iris.mk \ lib/mk/spec/x86/iris_gen110.mk \ diff --git a/repos/libports/src/lib/mesa/etnaviv/target.mk b/repos/libports/src/lib/mesa/etnaviv/target.mk index 0037f20053..7a8d51a642 100644 --- a/repos/libports/src/lib/mesa/etnaviv/target.mk +++ b/repos/libports/src/lib/mesa/etnaviv/target.mk @@ -1 +1,3 @@ -LIBS := mesa_gpu-etnaviv +REQUIRES := arm_v8a +TARGET := dummy-mesa_gpu-etnaviv +LIBS := mesa_gpu-etnaviv