From patchwork Sun Aug 30 19:20:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1354016 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.138; helo=whitealder.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=PJf5K8EZ; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Bfjq36GTWz9sTK for ; Mon, 31 Aug 2020 05:20:47 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 2D5378588C; Sun, 30 Aug 2020 19:20:45 +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 3ACGbdGI3MOC; Sun, 30 Aug 2020 19:20:43 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 35B8285727; Sun, 30 Aug 2020 19:20:43 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 791D51BF3ED for ; Sun, 30 Aug 2020 19:20:41 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 71C368715D for ; Sun, 30 Aug 2020 19:20:41 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id dMrY3+qMNJJN for ; Sun, 30 Aug 2020 19:20:40 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by hemlock.osuosl.org (Postfix) with ESMTPS id C7BF0848DB for ; Sun, 30 Aug 2020 19:20:39 +0000 (UTC) Received: by mail-wm1-f46.google.com with SMTP id t14so3459224wmi.3 for ; Sun, 30 Aug 2020 12:20:39 -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=uPvkhKu9E3e17Tll55+geBc6WZxfoNL07jdssdpQgiU=; b=PJf5K8EZlzAOxbpPz/EETzXoyex+qaxilma7hGBhLdF9ePyB/kuZwB/dyIaRTxdssC AkL0/yrgcJuQMyQ1pxQ9kiNPuoxWj18lok6yNCo86V9rhOVRJhEKErS8UoZGQfL3149d OhzNaCCMU1RwkXXwuue0+DAgjEtqPL4Pclva8C7TAOCh3gB+Z7TwmwEuzmUnk9LdduiT EBwOPHBElN3AA33jKO0FDnxzDYuyQTNp7POjYi3YdW2EQiH2LfZI7yHS0oBNRaaDI5JF efTuvF+bqdx/iFo/Nv5xxqhjhEy8idVGoVjc9QcPtt1HNUzA92Wn7qZb1n75SoWOeNxO 6Xyg== 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=uPvkhKu9E3e17Tll55+geBc6WZxfoNL07jdssdpQgiU=; b=YAldWPPXE6yM2t6qtCM257d2EKyrN+GqBAt6oR+8YGZsx1siZgEUBedmBA8aTzp7xW SNStePWjruZSa6ULvXDTx1szpyrocH1g5qKCV75ZgXoETQiN99lWr6/ZGvQWwpSOqu/H 8DgPvti+0N7XqaaPvZVfGXT46ofab6F68LiLWn8mbnfysB4XdBkViz5CigWK4vmfq3/p VwN0BHDJD+r70DWfxvfmqjZyRaavEM3OZSFrKtCoyF7XaSP5pd++5afiOo3qgQYlYhF3 s/y5QegGXy05Ia4+J5TxKDol8hSqgNE4c6TYR/ns+VYuqmd1XO28dnPWo1MmI7yk0Ovk X7KA== X-Gm-Message-State: AOAM533JiK8+ElXGtkZaSqh5bvPWLLEVVcEPEelVZuq2AGBkRbKQtqS7 z2FEKzNiGlIPxBwGzWj/3nbi4jfB+fw= X-Google-Smtp-Source: ABdhPJynfB8yAQSXuHhlN2iOQLFG6FYXrphh5+ZeE551HazIvgdEYRjrYZ1PSlSWs10sX820zo6uxw== X-Received: by 2002:a05:600c:2d1:: with SMTP id 17mr7865386wmn.15.1598815237826; Sun, 30 Aug 2020 12:20:37 -0700 (PDT) Received: from kali.home (2a01cb0881b76d00c2afd0dfa851d2b9.ipv6.abo.wanadoo.fr. [2a01:cb08:81b7:6d00:c2af:d0df:a851:d2b9]) by smtp.gmail.com with ESMTPSA id r15sm226151wmn.24.2020.08.30.12.20.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 Aug 2020 12:20:36 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Sun, 30 Aug 2020 21:20:29 +0200 Message-Id: <20200830192029.1009973-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/rtty: fix build with mbedtls but without 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/a0ebffe58bbf14cab74b7d2111d4d88a9c725273 Signed-off-by: Fabrice Fontaine --- ...xt-fix-build-with-mbedtls-but-withou.patch | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 package/rtty/0001-src-CMakeLists.txt-fix-build-with-mbedtls-but-withou.patch diff --git a/package/rtty/0001-src-CMakeLists.txt-fix-build-with-mbedtls-but-withou.patch b/package/rtty/0001-src-CMakeLists.txt-fix-build-with-mbedtls-but-withou.patch new file mode 100644 index 0000000000..b7275462af --- /dev/null +++ b/package/rtty/0001-src-CMakeLists.txt-fix-build-with-mbedtls-but-withou.patch @@ -0,0 +1,47 @@ +From 0982308255dd3fd70e7b93aa88a8f3c5b9c1b845 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sun, 30 Aug 2020 21:15:06 +0200 +Subject: [PATCH] src/CMakeLists.txt: fix build with mbedtls but without zlib + +Building with mbedtls but without zlib will result in the following +build failure: + +-- Found MbedTLS: /home/peko/autobuild/instance-0/output-1/per-package/rtty/host/powerpc64-buildroot-linux-gnu/sysroot/usr/lib/libmbedtls.so (found version "2.16.7") +-- Could NOT find ZLIB (missing: ZLIB_LIBRARY ZLIB_INCLUDE_DIR) +-- Select MbedTLS(PolarSSL) as the SSL backend +CMake Error: The following variables are used in this project, but they are set to NOTFOUND. +Please set them or make sure they are set and tested correctly in the CMake files: +ZLIB_LIBRARY + linked by target "rtty" in directory /home/peko/autobuild/instance-0/output-1/build/rtty-7.1.4/src + +-- Configuring incomplete, errors occurred! + +Fixes: + - http://autobuild.buildroot.org/results/a0ebffe58bbf14cab74b7d2111d4d88a9c725273 + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/zhaojh329/rtty/pull/77] +--- + src/CMakeLists.txt | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 10f6626..d09e848 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -77,7 +77,11 @@ else() + elseif(RTTY_USE_MBEDTLS) + set(SSL_NAME "MbedTLS(PolarSSL)") + set(SSL_INC ${MBEDTLS_INCLUDE_DIR}) +- set(SSL_LIB ${MBEDTLS_LIBRARIES} ${ZLIB_LIBRARIES}) ++ if(ZLIB_FOUND) ++ set(SSL_LIB ${MBEDTLS_LIBRARIES} ${ZLIB_LIBRARIES}) ++ else() ++ set(SSL_LIB ${MBEDTLS_LIBRARIES}) ++ endif() + set(RTTY_HAVE_MBEDTLS_CONFIG 1) + endif() + +-- +2.28.0 +