From patchwork Sat Dec 24 19:10:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baruch Siach X-Patchwork-Id: 708682 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tmFGT5j04z9t1F for ; Sun, 25 Dec 2016 06:10:56 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 3F03684BE6; Sat, 24 Dec 2016 19:10:54 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id rT9Gx3j0XZeE; Sat, 24 Dec 2016 19:10:53 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id EB12084BCA; Sat, 24 Dec 2016 19:10:52 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 908C51C1FD6 for ; Sat, 24 Dec 2016 19:10:51 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 8F16C84BCA for ; Sat, 24 Dec 2016 19:10:51 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id jPthk72oXnPX for ; Sat, 24 Dec 2016 19:10:51 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mx.tkos.co.il (guitar.tcltek.co.il [192.115.133.116]) by whitealder.osuosl.org (Postfix) with ESMTPS id C2A5684B62 for ; Sat, 24 Dec 2016 19:10:50 +0000 (UTC) Received: from tarshish.tkos.co.il (unknown [10.0.8.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx.tkos.co.il (Postfix) with ESMTPSA id 08693440538; Sat, 24 Dec 2016 21:10:31 +0200 (IST) From: Baruch Siach To: buildroot@busybox.net Date: Sat, 24 Dec 2016 21:10:42 +0200 Message-Id: X-Mailer: git-send-email 2.11.0 Subject: [Buildroot] [PATCH] stunnel: fix static link X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" zlib is a dependency of OpenSSL. Take that into account when linking statically. Fixes: http://autobuild.buildroot.net/results/dfe/dfe7c82c7976912378e33e03ea4c677bee6a778d/ http://autobuild.buildroot.net/results/48c/48cb55428613e91abfe8e71456182082d9eabb75/ http://autobuild.buildroot.net/results/810/81029efad8b9e2f48c26a7b20f62c90844fc86df/ and many more. Signed-off-by: Baruch Siach --- package/stunnel/stunnel.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/stunnel/stunnel.mk b/package/stunnel/stunnel.mk index 5e35d672683b..f98e7b59eb2a 100644 --- a/package/stunnel/stunnel.mk +++ b/package/stunnel/stunnel.mk @@ -11,7 +11,8 @@ STUNNEL_DEPENDENCIES = openssl STUNNEL_CONF_OPTS = --with-ssl=$(STAGING_DIR)/usr --with-threads=fork \ --disable-libwrap STUNNEL_CONF_ENV = \ - ax_cv_check_cflags___fstack_protector=$(if $(BR2_TOOLCHAIN_HAS_SSP),yes,no) + ax_cv_check_cflags___fstack_protector=$(if $(BR2_TOOLCHAIN_HAS_SSP),yes,no) \ + LIBS=$(if $(BR2_STATIC_LIBS),-lz) STUNNEL_LICENSE = GPLv2+ STUNNEL_LICENSE_FILES = COPYING COPYRIGHT.GPL