From patchwork Sat May 9 19:29:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1286839 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) 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=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=mkJCfzj+; dkim-atps=neutral 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 49KHKb6BsMz9sPF for ; Sun, 10 May 2020 05:28:03 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 49113203F1; Sat, 9 May 2020 19:28:02 +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 QCYIYDKNXguZ; Sat, 9 May 2020 19:28:00 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id A82DD203D5; Sat, 9 May 2020 19:28:00 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 459F01BF83A for ; Sat, 9 May 2020 19:27:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 3C180203D5 for ; Sat, 9 May 2020 19:27:59 +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 boF8VgS9VDtT for ; Sat, 9 May 2020 19:27:58 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by silver.osuosl.org (Postfix) with ESMTPS id 010E4203C4 for ; Sat, 9 May 2020 19:27:57 +0000 (UTC) Received: by mail-wm1-f66.google.com with SMTP id m12so8703718wmc.0 for ; Sat, 09 May 2020 12:27:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=2CROQ15q3VBvMiEnYvAkb1eak0bocvqIxvUqybitsDI=; b=mkJCfzj+5x+yfKw3pABr9Tzo7amoz8kml/yWfl8HfNxrUVpb1UYhivRUJ8k9c1Ovp4 ORR1wODpmwz7QjnGej0HPMdYUFl6DotJsQkP4Q5g1fOsz1t4FV8HGl3lvMYpwiHxJpQF nxB0xAuJPsDXfnBXCKctxweZqmPyM7pALUF4bXgAb3nfToCQ9vJLY+QvpaNkEA9SonbO UqMHszsqm68NNpCfEnCNgx+56bD69+y0JRbOSTlQtN2S+TSdSMvlNkiyt1VvbZd38yCH vAMcORUG++VJK43fDyfciXbrayxQ8/YKLs0jSO9hhq+RAJ3xyWr04F7BIQb6mzUCSEWx ZKwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=2CROQ15q3VBvMiEnYvAkb1eak0bocvqIxvUqybitsDI=; b=Ms70cK5JUiYC3bGe3ws590WJhW1sevp+lVfwrMZN1blf2Q9y0Q9UVRdrOeppYjy5ZH 7nkK5ctZQG5BbZs/aWHBPMv8JVyD8RnwECO0NeaC6fKpa7PNFgfT/KAO7zGD+7/A8RcY 5PnQzCadU7bLBZqmfpYXhUILtofUS+xmAGu0TbZmoRy++dmvZWlLSHc9MYNVWXDtdy6L qXFhTOTsfbBluoIB7czvrxcxfilj2x1NfF+7W9hin93eSSjOIv6huErPZIWV9fDkUuSm DGMhEYs5vYJ+tG3/9SSMoR2F2p+81qOpL6wJS9Ww8s/VdodogOgel++NV3d1PpAZJhQx NhCg== X-Gm-Message-State: AGi0PubGyq7J9RHnXT2d48zORXMFCcIJWh5HIguybm66rMyOd1JpF0VQ q38bJA3T+UepWS4qGMvfp+4b5gMj X-Google-Smtp-Source: APiQypL9+CrSk7TlTG+MjinBpC9L/zStpDbzJDxdho3nxCI66CvqYqbFdfaaNdo3MSdoqKqJ/aijiQ== X-Received: by 2002:a1c:4d07:: with SMTP id o7mr24134117wmh.59.1589052476185; Sat, 09 May 2020 12:27:56 -0700 (PDT) Received: from kali.home (lfbn-ren-1-403-35.w2-10.abo.wanadoo.fr. [2.10.23.35]) by smtp.gmail.com with ESMTPSA id c17sm9488823wrn.59.2020.05.09.12.27.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 May 2020 12:27:55 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Sat, 9 May 2020 21:29:21 +0200 Message-Id: <20200509192921.3451413-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/rtty: fix static build with mbedtls and zlib 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: , Cc: Jianhui Zhao , Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Fixes: - http://autobuild.buildroot.org/results/61de143cdde1f0a9e734f46e9c68ce3504989890 Signed-off-by: Fabrice Fontaine --- ...xt-fix-static-build-with-mbedtls-and.patch | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 package/rtty/0001-src-CMakeLists.txt-fix-static-build-with-mbedtls-and.patch diff --git a/package/rtty/0001-src-CMakeLists.txt-fix-static-build-with-mbedtls-and.patch b/package/rtty/0001-src-CMakeLists.txt-fix-static-build-with-mbedtls-and.patch new file mode 100644 index 0000000000..f33a5eaae9 --- /dev/null +++ b/package/rtty/0001-src-CMakeLists.txt-fix-static-build-with-mbedtls-and.patch @@ -0,0 +1,47 @@ +From 7b8efe11dbafce97971dc130bf6cc1756f34ce07 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 2 May 2020 21:02:53 +0200 +Subject: [PATCH] src/CMakeLists.txt: fix static build with mbedtls and zlib + +Static build with a zlib-enabled mbedtls fails on: + +[100%] Linking C executable rtty +/home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/microblazeel-buildroot-linux-uclibc/8.3.0/../../../../microblazeel-buildroot-linux-uclibc/bin/ld: +/home/buildroot/autobuild/instance-2/output-1/host/microblazeel-buildroot-linux-uclibc/sysroot/usr/lib/libmbedtls.a(ssl_tls.c.o): +in function `mbedtls_ssl_transform_free.part.24': +(.text+0x1724): undefined reference to `deflateEnd' + +As mbedtls does not provide a pkg-config file, search for zlib and link +with it if necessary + +Fixes: + - http://autobuild.buildroot.org/results/61de143cdde1f0a9e734f46e9c68ce3504989890 + +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/zhaojh329/rtty/commit/7b8efe11dbafce97971dc130bf6cc1756f34ce07] +--- + src/CMakeLists.txt | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 9bb3097..d69c665 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -36,6 +36,7 @@ else() + endif() + find_package(WolfSSL) + find_package(MbedTLS) ++ find_package(ZLIB) + + if(RTTY_USE_OPENSSL) + if (NOT OPENSSL_FOUND) +@@ -76,7 +77,7 @@ else() + elseif(RTTY_USE_MBEDTLS) + set(SSL_NAME "MbedTLS(PolarSSL)") + set(SSL_INC ${MBEDTLS_INCLUDE_DIR}) +- set(SSL_LIB ${MBEDTLS_LIBRARIES}) ++ set(SSL_LIB ${MBEDTLS_LIBRARIES} ${ZLIB_LIBRARIES}) + set(RTTY_HAVE_MBEDTLS_CONFIG 1) + endif() +