[PATCH 2/2] tools/libressl: switch to compiling with cmake

[Rosen Penev]

Massive speed boost.

From:

Executed in   23.78 secs   fish           external
   usr time   31.03 secs    0.00 micros   31.03 secs
   sys time   15.96 secs  624.00 micros   15.96 secs

To:

Executed in    9.64 secs   fish           external
   usr time   10.03 secs  571.00 micros   10.03 secs
   sys time    3.76 secs   41.00 micros    3.76 secs

This is with ccache enabled. Without:

From:

Executed in   32.99 secs   fish           external
   usr time   85.33 secs    0.00 micros   85.33 secs
   sys time   23.19 secs  684.00 micros   23.19 secs

To:

Executed in   14.44 secs   fish           external
   usr time   53.29 secs  595.00 micros   53.29 secs
   sys time   10.99 secs   40.00 micros   10.99 secs

Signed-off-by: Rosen Penev <rosenp at gmail.com>
---
 tools/libressl/Makefile | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/tools/libressl/Makefile b/tools/libressl/Makefile
index dbd8ca4d1a..c8d9c493a9 100644
--- a/tools/libressl/Makefile
+++ b/tools/libressl/Makefile
@@ -22,12 +22,17 @@ PKG_SOURCE_URL:=http://mirror.ox.ac.uk/pub/OpenBSD/LibreSSL \
 HOST_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/host-build.mk
+include $(INCLUDE_DIR)/cmake.mk
 
-HOST_CONFIGURE_ARGS += --enable-static --disable-shared --disable-tests
-HOST_CFLAGS += $(FPIC)
+CMAKE_HOST_OPTIONS += \
+	-DLIBRESSL_APPS=OFF \
+	-DLIBRESSL_SKIP_INSTALL=OFF \
+	-DLIBRESSL_TESTS=OFF \
+	-DENABLE_EXTRATESTS=OFF \
+	-DENABLE_NC=OFF
 
 ifeq ($(GNU_HOST_NAME),x86_64-linux-gnux32)
-HOST_CONFIGURE_ARGS += --disable-asm
+CMAKE_HOST_OPTIONS += -DENABLE_ASM=OFF
 endif
 
 $(eval $(call HostBuild))
-- 
2.29.2