From b9bc48dd6300b08adccd757fce2a2f6d09572b29 Mon Sep 17 00:00:00 2001 From: Sebastian Sumpf Date: Mon, 21 Aug 2017 14:22:58 +0200 Subject: [PATCH] mesa: split lib and API (headers) Issue #2507. --- repos/libports/lib/import/import-mesa.mk | 2 +- repos/libports/lib/import/import-mesa_api.mk | 1 + repos/libports/lib/mk/mesa.inc | 2 +- repos/libports/lib/mk/mesa_api.mk | 1 + repos/libports/ports/mesa.hash | 2 +- repos/libports/ports/mesa.port | 3 +++ 6 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 repos/libports/lib/import/import-mesa_api.mk create mode 100644 repos/libports/lib/mk/mesa_api.mk diff --git a/repos/libports/lib/import/import-mesa.mk b/repos/libports/lib/import/import-mesa.mk index 8e88697f48..e19073e6ca 100644 --- a/repos/libports/lib/import/import-mesa.mk +++ b/repos/libports/lib/import/import-mesa.mk @@ -1 +1 @@ -INC_DIR += $(call select_from_ports,mesa)/src/lib/mesa/include +include $(call select_from_repositories,lib/import/import-mesa_api.mk) diff --git a/repos/libports/lib/import/import-mesa_api.mk b/repos/libports/lib/import/import-mesa_api.mk new file mode 100644 index 0000000000..dbbf3ec0ff --- /dev/null +++ b/repos/libports/lib/import/import-mesa_api.mk @@ -0,0 +1 @@ +INC_DIR += $(call select_from_ports,mesa)/include/mesa diff --git a/repos/libports/lib/mk/mesa.inc b/repos/libports/lib/mk/mesa.inc index 54933f635b..a89c4108fd 100644 --- a/repos/libports/lib/mk/mesa.inc +++ b/repos/libports/lib/mk/mesa.inc @@ -1,5 +1,5 @@ SHARED_LIB = yes -LIBS = libc stdcxx expat glapi pthread +LIBS = libc stdcxx expat glapi pthread mesa_api include $(REP_DIR)/lib/mk/mesa-common.inc diff --git a/repos/libports/lib/mk/mesa_api.mk b/repos/libports/lib/mk/mesa_api.mk new file mode 100644 index 0000000000..b0dc81c759 --- /dev/null +++ b/repos/libports/lib/mk/mesa_api.mk @@ -0,0 +1 @@ +# stub mk file diff --git a/repos/libports/ports/mesa.hash b/repos/libports/ports/mesa.hash index 2b7d81f586..4254279be0 100644 --- a/repos/libports/ports/mesa.hash +++ b/repos/libports/ports/mesa.hash @@ -1 +1 @@ -d82577300e8dcb9b7ce5a5a8c16c5121e9f67cfc +599f6a13e280b5410f5b7e7730f571fd1a73037b diff --git a/repos/libports/ports/mesa.port b/repos/libports/ports/mesa.port index 11ec9ed13a..035168495e 100644 --- a/repos/libports/ports/mesa.port +++ b/repos/libports/ports/mesa.port @@ -14,6 +14,9 @@ HASH_INPUT += $(REP_DIR)/src/lib/mesa/files.list PATCHES := src/lib/mesa/patches/egl.patch PATCH_OPT := -p1 +DIRS := include/mesa +DIR_CONTENT(include/mesa) = $(wildcard src/lib/mesa/include/*) + # # Check for tools #