From 6eef7e318112119bbe29a1b363ae57f543142762 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Fri, 5 Mar 2021 13:14:47 +0100
Subject: [PATCH] libtls: clean up template

---
 srcpkgs/libtls/template | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/srcpkgs/libtls/template b/srcpkgs/libtls/template
index 6fc7d91a35..cd3d70faa0 100644
--- a/srcpkgs/libtls/template
+++ b/srcpkgs/libtls/template
@@ -4,7 +4,8 @@ version=3.2.4
 revision=1
 wrksrc="libressl-${version}"
 build_style=gnu-configure
-#configure_args="$(vopt_enable asm)"
+configure_args="$(vopt_enable asm)"
+hostmakedepends="automake libtool"
 short_desc="Version of the TLS/crypto stack forked from OpenSSL"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="OpenSSL, ISC"
@@ -18,17 +19,13 @@ replaces="libtls20>0"
 build_options="asm"
 desc_option_asm="Use platform assembly for faster crypto"
 
+build_options_default="asm"
+
 if [ "$build_option_asm" ]; then
 	distfiles+=" https://github.com/q66/libressl-portable-asm/archive/v${_lssl_asm_ver}.tar.gz"
 	checksum+=" e1c76178c4deb1cd20a0cd7ba553d6607f8131acb2e0844223f797e42f0d6f60"
 fi
 
-# only enable asm for full chroots by default
-# otherwise we'd be introducing an autotools dependency on the host
-if [ "$CHROOT_READY" ]; then
-	build_options_default="asm"
-fi
-
 case "$XBPS_TARGET_MACHINE" in
 	# disable ssp
 	i686-musl) configure_args+=" --disable-hardening";;
@@ -36,21 +33,12 @@ case "$XBPS_TARGET_MACHINE" in
 	armv5*) configure_args+=" --disable-asm";;
 esac
 
-if [ "$CROSS_BUILD" -o "$build_option_asm" ]; then
-	_regen_build=yes
-fi
-
-if [ -n "$_regen_build" ]; then
-	hostmakedepends=" automake libtool"
-fi
-
 post_extract() {
 	[ -z "$build_option_asm" ] && return 0
 	mv ../libressl-portable-asm-${_lssl_asm_ver} .
 }
 
 pre_configure() {
-	[ -z "$_regen_build" ] && return 0
 	if [ "$build_option_asm" ]; then
 		./libressl-portable-asm-${_lssl_asm_ver}/patch_libressl.sh .
 	fi