From dea6609612fe8a40813214a5ed6aeded22d589dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20S=C3=B6ntgen?= Date: Fri, 8 Mar 2024 15:42:18 +0100 Subject: [PATCH] import-openssl.mk: provide file named after api For now this import file is solely there to satisfy the mechansim in Goa that collects and incorporates import files for used APIs. Issue genodelabs/goa#81. --- repos/libports/lib/import/import-libcrypto.mk | 4 ++-- repos/libports/lib/import/import-libssl.mk | 4 ++-- repos/libports/lib/import/import-openssl.mk | 2 ++ repos/libports/recipes/api/openssl/content.mk | 1 + 4 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 repos/libports/lib/import/import-openssl.mk diff --git a/repos/libports/lib/import/import-libcrypto.mk b/repos/libports/lib/import/import-libcrypto.mk index 3878ca4a8c..bd8a17b9d3 100644 --- a/repos/libports/lib/import/import-libcrypto.mk +++ b/repos/libports/lib/import/import-libcrypto.mk @@ -1,9 +1,9 @@ LIB_OPENSSL_DIR = $(call select_from_repositories,src/lib/openssl) -ARCH = $(filter 32bit 64bit,$(SPECS)) - OPENSSL_DIR := $(call select_from_ports,openssl) +ARCH = $(filter 32bit 64bit,$(SPECS)) + INC_DIR += $(OPENSSL_DIR)/include INC_DIR += $(LIB_OPENSSL_DIR)/spec/$(ARCH) diff --git a/repos/libports/lib/import/import-libssl.mk b/repos/libports/lib/import/import-libssl.mk index 54ea68acce..1c50108524 100644 --- a/repos/libports/lib/import/import-libssl.mk +++ b/repos/libports/lib/import/import-libssl.mk @@ -2,9 +2,9 @@ LIB_OPENSSL_DIR = $(call select_from_repositories,src/lib/openssl) OPENSSL_DIR := $(call select_from_ports,openssl) -LIBS += libcrypto - ARCH = $(filter 32bit 64bit,$(SPECS)) INC_DIR += $(OPENSSL_DIR)/include INC_DIR += $(LIB_OPENSSL_DIR)/spec/$(ARCH) + +LIBS += libcrypto diff --git a/repos/libports/lib/import/import-openssl.mk b/repos/libports/lib/import/import-openssl.mk new file mode 100644 index 0000000000..1d772e77e0 --- /dev/null +++ b/repos/libports/lib/import/import-openssl.mk @@ -0,0 +1,2 @@ +include $(call select_from_repositories,lib/import/import-libcrypto.mk) +include $(call select_from_repositories,lib/import/import-libssl.mk) diff --git a/repos/libports/recipes/api/openssl/content.mk b/repos/libports/recipes/api/openssl/content.mk index 952d5b981c..056cdc7317 100644 --- a/repos/libports/recipes/api/openssl/content.mk +++ b/repos/libports/recipes/api/openssl/content.mk @@ -1,6 +1,7 @@ MIRROR_FROM_REP_DIR := \ lib/import/import-libcrypto.mk \ lib/import/import-libssl.mk \ + lib/import/import-openssl.mk \ lib/symbols/libcrypto \ lib/symbols/libssl