From patchwork Sat Feb 9 16:18:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 1039250 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=t-online.de Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43xcfx6dKtz9sMr for ; Sun, 10 Feb 2019 03:18:33 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id A5B6422E1C; Sat, 9 Feb 2019 16:18:30 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Ztkcf3vMjp6m; Sat, 9 Feb 2019 16:18:29 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 5AC4C22201; Sat, 9 Feb 2019 16:18:29 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 2B4341BF5F8 for ; Sat, 9 Feb 2019 16:18:28 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 2815285DC4 for ; Sat, 9 Feb 2019 16:18:28 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id QLC0c8vHnIWe for ; Sat, 9 Feb 2019 16:18:21 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout11.t-online.de (mailout11.t-online.de [194.25.134.85]) by fraxinus.osuosl.org (Postfix) with ESMTPS id F0D0785F94 for ; Sat, 9 Feb 2019 16:18:20 +0000 (UTC) Received: from fwd22.aul.t-online.de (fwd22.aul.t-online.de [172.20.26.127]) by mailout11.t-online.de (Postfix) with SMTP id B62454215D6E for ; Sat, 9 Feb 2019 17:18:18 +0100 (CET) Received: from fli4l.lan.fli4l (bjn1GUZCohsqWpJukqVcMdw0UZE1VOW4YvN4u85gHXrzlcSjp4mqOm3aGjVcbqvgOZ@[84.161.191.15]) by fwd22.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1gsVKX-1Prfu40; Sat, 9 Feb 2019 17:18:13 +0100 Received: from mahler.lan.fli4l ([192.168.1.1]:37840 helo=kuhls.lan.fli4l) by fli4l.lan.fli4l with esmtp (Exim 4.91) (envelope-from ) id 1gsVKW-0002ul-Hp for buildroot@buildroot.org; Sat, 09 Feb 2019 17:18:13 +0100 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sat, 9 Feb 2019 17:18:12 +0100 Message-Id: <20190209161812.30610-1-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-ID: bjn1GUZCohsqWpJukqVcMdw0UZE1VOW4YvN4u85gHXrzlcSjp4mqOm3aGjVcbqvgOZ X-TOI-MSGID: d3b2bb2e-1525-4a6b-8b27-1384e16bc834 Subject: [Buildroot] [PATCH 1/1] package/tor: fix static build X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" A static build fails at configure checking for SSL_SESSION_get_master_key... no This activates code incompatible with libopenssl in tortls_internal.h which leads to a build error: In file included from src/lib/tls/tortls_openssl.c:61:0: ./src/lib/tls/tortls_internal.h:48:8: error: conflicting types for 'SSL_SESSION_get_master_key' size_t SSL_SESSION_get_master_key(struct ssl_session_st *s, The configure check fails because libz is not used for linking: http://autobuild.buildroot.net/results/ad2/ad213cc1c2fb1849e8b46223be6d159fa3dcddc8//tor-0.3.5.7/config.log /data/buildroot/buildroot-test/instance-0/output/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libcrypto.a(c_zlib.o): In function `zlib_stateful_expand_block': c_zlib.c:(.text+0x40): undefined reference to `inflate' This patch add -lz when needed and fixes http://autobuild.buildroot.net/results/ad2/ad213cc1c2fb1849e8b46223be6d159fa3dcddc8/ Signed-off-by: Bernd Kuhls --- package/tor/tor.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/tor/tor.mk b/package/tor/tor.mk index 99568fe1b2..98ab246171 100644 --- a/package/tor/tor.mk +++ b/package/tor/tor.mk @@ -24,6 +24,7 @@ TOR_CONF_OPTS += \ --enable-static-openssl \ --enable-static-tor \ --enable-static-zlib +TOR_LIBS += -lz endif ifeq ($(BR2_PACKAGE_LIBCAP),y) @@ -48,8 +49,9 @@ endif TOR_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -TOR_CONF_ENV += LIBS=-latomic +TOR_LIBS += -latomic endif +TOR_CONF_ENV += LIBS="$(TOR_LIBS)" define TOR_INSTALL_CONF $(INSTALL) -D -m 644 $(@D)/src/config/torrc.minimal \