Skip to content
Permalink
Browse files

wolfssl: fix build in busybox environments

The configure script broke when used in alpine-3.9 based docker containers. Fixed in wolfSSL >3.15.7.

Signed-off-by: Moritz Warning <moritzwarning@web.de>
  • Loading branch information...
mwarning authored and hauke committed Mar 5, 2019
1 parent 7fc4dd3 commit 3d3e04d8c8a9a9b436a4407ff132bb29e209f63a
@@ -0,0 +1,23 @@
From 42eacece82b6375a9f4bab3903a1a39f7d1dd579 Mon Sep 17 00:00:00 2001
From: John Safranek <john@wolfssl.com>
Date: Tue, 5 Mar 2019 09:26:30 -0800
Subject: [PATCH] AR flags configure update In at least one environment the
check for particular AR options was failing due to a bash script bug. Deleted
an extra pair of parenthesis triggering an arithmetic statement when
redundant grouping was desired.

---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@ AC_CONFIG_AUX_DIR([build-aux])
: ${CFLAGS=""}

# Test ar for the "U" option. Should be checked before the libtool macros.
-xxx_ar_flags=$((ar --help) 2>&1)
+xxx_ar_flags=$(ar --help 2>&1)
AS_CASE([$xxx_ar_flags],[*'use actual timestamps and uids/gids'*],[: ${AR_FLAGS="Ucru"}])

AC_PROG_CC
@@ -1,7 +1,7 @@
--- a/configure.ac
+++ b/configure.ac
@@ -4140,7 +4140,6 @@ AC_CONFIG_FILES([support/wolfssl.pc])
AC_CONFIG_FILES([rpm/spec])
@@ -4198,7 +4198,6 @@ AC_CONFIG_FILES([stamp-h], [echo timesta
AC_CONFIG_FILES([Makefile wolfssl/version.h wolfssl/options.h cyassl/options.h support/wolfssl.pc rpm/spec])

AX_CREATE_GENERIC_CONFIG
-AX_AM_JOBSERVER([yes])

0 comments on commit 3d3e04d

Please sign in to comment.
You can’t perform that action at this time.