From 53227141836ad790058d91e1390da71a579da698 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20S=C3=B6ntgen?= Date: Thu, 21 Aug 2014 12:40:42 +0200 Subject: [PATCH] libssl: use platform specific mk files Instead of checking the target platform in the mk file use the common pattern of providing a mk file for each platform. Fixes #1236. --- repos/libports/lib/mk/arm/libssl.mk | 4 ++++ repos/libports/lib/mk/{libssl.mk => libssl.inc} | 11 ----------- repos/libports/lib/mk/x86_32/libssl.mk | 4 ++++ repos/libports/lib/mk/x86_64/libssl.mk | 4 ++++ 4 files changed, 12 insertions(+), 11 deletions(-) create mode 100644 repos/libports/lib/mk/arm/libssl.mk rename repos/libports/lib/mk/{libssl.mk => libssl.inc} (73%) create mode 100644 repos/libports/lib/mk/x86_32/libssl.mk create mode 100644 repos/libports/lib/mk/x86_64/libssl.mk diff --git a/repos/libports/lib/mk/arm/libssl.mk b/repos/libports/lib/mk/arm/libssl.mk new file mode 100644 index 000000000..4a02f72bb --- /dev/null +++ b/repos/libports/lib/mk/arm/libssl.mk @@ -0,0 +1,4 @@ +include $(REP_DIR)/lib/mk/libssl.inc + +INC_DIR += $(REP_DIR)/src/lib/openssl/arm +INC_DIR += $(LIBSSL_PORT_DIR)/src/lib/openssl/arm diff --git a/repos/libports/lib/mk/libssl.mk b/repos/libports/lib/mk/libssl.inc similarity index 73% rename from repos/libports/lib/mk/libssl.mk rename to repos/libports/lib/mk/libssl.inc index d4155a1b0..04d624700 100644 --- a/repos/libports/lib/mk/libssl.mk +++ b/repos/libports/lib/mk/libssl.inc @@ -15,17 +15,6 @@ SRC_C = s2_meth.c s2_srvr.c s2_clnt.c s2_lib.c s2_enc.c s2_pkt.c \ INC_DIR += $(LIBSSL_PORT_DIR)/include/openssl INC_DIR += $(LIBSSL_PORT_DIR)/src/lib/openssl/crypto - -ifeq ($(filter-out $(SPECS),x86_32),) -TARGET_CPUARCH=x86_32 -else ifeq ($(filter-out $(SPECS),x86_64),) -TARGET_CPUARCH=x86_64 -else ifeq ($(filter-out $(SPECS),arm),) -TARGET_CPUARCH=arm -endif - -INC_DIR += $(REP_DIR)/src/lib/openssl/$(TARGET_CPUARCH)/ -INC_DIR += $(LIBSSL_PORT_DIR)/src/lib/openssl/$(TARGET_CPUARCH)/ INC_DIR += $(LIBSSL_PORT_DIR)/include vpath %.c $(LIBSSL_PORT_DIR)/src/lib/openssl/ssl diff --git a/repos/libports/lib/mk/x86_32/libssl.mk b/repos/libports/lib/mk/x86_32/libssl.mk new file mode 100644 index 000000000..f5bd7b680 --- /dev/null +++ b/repos/libports/lib/mk/x86_32/libssl.mk @@ -0,0 +1,4 @@ +include $(REP_DIR)/lib/mk/libssl.inc + +INC_DIR += $(REP_DIR)/src/lib/openssl/x86_32 +INC_DIR += $(LIBSSL_PORT_DIR)/src/lib/openssl/x86_32 diff --git a/repos/libports/lib/mk/x86_64/libssl.mk b/repos/libports/lib/mk/x86_64/libssl.mk new file mode 100644 index 000000000..789778635 --- /dev/null +++ b/repos/libports/lib/mk/x86_64/libssl.mk @@ -0,0 +1,4 @@ +include $(REP_DIR)/lib/mk/libssl.inc + +INC_DIR += $(REP_DIR)/src/lib/openssl/x86_64 +INC_DIR += $(LIBSSL_PORT_DIR)/src/lib/openssl/x86_64