From patchwork Sat Jul 25 10:23:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1336228 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.137; helo=fraxinus.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=Ma753HAI; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BDMc42Mjcz9sPf for ; Sat, 25 Jul 2020 20:23:48 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 8447C862CA; Sat, 25 Jul 2020 10:23:45 +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 SDR45aGbXXe1; Sat, 25 Jul 2020 10:23:44 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id D8C8D861AF; Sat, 25 Jul 2020 10:23:43 +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 666321BF5EA for ; Sat, 25 Jul 2020 10:23:42 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 5DECE20789 for ; Sat, 25 Jul 2020 10:23:42 +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 ICZBYdHJJ7AG for ; Sat, 25 Jul 2020 10:23:41 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by silver.osuosl.org (Postfix) with ESMTPS id E12A9204F5 for ; Sat, 25 Jul 2020 10:23:40 +0000 (UTC) Received: by mail-wr1-f46.google.com with SMTP id f2so10387962wrp.7 for ; Sat, 25 Jul 2020 03:23:40 -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=LqQLDNfCJ9nRSwEaW8PJDymkXDkc+Ssh3+0wnhFAue4=; b=Ma753HAIHiWR2UipP3wI8wvDttRImNvwl5+vDQfjoS1f9yu6ToBqiqGuwMSVKv0cw2 fMoB/pY07YDr3LPO1n1pSCQVDZy+mj4isd8TUP+QqkVmz1XDGbP8/FTocHKtaB+5DCBB yrhom7eGtNU26U7QWamFy0gDzgGKFR6gaxQe7m+JW3IOE+LJRpPpQI4839zX6e5XZGOv 6SqPZSxcpbGebZkLUfjOfSxyw8Xj3lxnCA6JkKYD4asts8TQHvyBt34KZQQP4rZF3Udr gR+s3pmqGwt9pRIVTCaku2LoRU+Em195i/Npuqouy1AgtouBLOnBzXzi/OAjNuZeBnaP rB1A== 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=LqQLDNfCJ9nRSwEaW8PJDymkXDkc+Ssh3+0wnhFAue4=; b=qEv5qLjlEJgMnAlfwVqkkfY8cetiC6htAIm1X7lzkNvTZVctd/AgcLOpu6k4yltpxu 3dV6b0/Ze3ZJP/gtwp8KHo7fO1/KO5fEbmysnnRcTxMGiO8QTC7I5khKjYiwuOvdB01o LKy9MJgtfkh2wpwuprs5UDoEDE8Hi9JX4gGBHUg3uW6MaouvjFW5xIsVdlT9ifn9uEyb MyQ3i5YHINEJHcz48bYeYFDG/GrUUUQLKNaEQL7y9L36p95h1MAtRWtQ+QCIGx9iPJPb McrMMmjUn/vXuQc+oPFqVgiMvRCLtjHi4yTqFk6iWnBYWi5BUPR+UkDePgk6KtV9wB4q qhUg== X-Gm-Message-State: AOAM532yuijSIR1QvPoULLNqBGaa2MtwrP44bMzCexObNhUx+hX1vKwR 6/lYX57i+txXY9JyjJ0gaJUgmIwA X-Google-Smtp-Source: ABdhPJyKVjnm5eXMO8857WMMGcOgMCGeyF0v3R3kl8cWia577wOHC0GMq8Ds9AU1FxrHU1r5NbOUrQ== X-Received: by 2002:a5d:5647:: with SMTP id j7mr11816596wrw.242.1595672618829; Sat, 25 Jul 2020 03:23:38 -0700 (PDT) Received: from kali.home (lfbn-ren-1-2132-33.w92-167.abo.wanadoo.fr. [92.167.211.33]) by smtp.gmail.com with ESMTPSA id b23sm10230732wmd.37.2020.07.25.03.23.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Jul 2020 03:23:38 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Sat, 25 Jul 2020 12:23:22 +0200 Message-Id: <20200725102322.1197842-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/libzip: fix build with cmake < 3.16 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: Bartosz Golaszewski , Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Fixes: - http://autobuild.buildroot.org/results/7e996aebafa4c690ff130b7d18e5b09c7b255829 Signed-off-by: Fabrice Fontaine --- ...001-Add-FindGnuTLS-cmake-from-3-17-3.patch | 103 ++++++++++++++++++ 1 file changed, 103 insertions(+) create mode 100644 package/libzip/0001-Add-FindGnuTLS-cmake-from-3-17-3.patch diff --git a/package/libzip/0001-Add-FindGnuTLS-cmake-from-3-17-3.patch b/package/libzip/0001-Add-FindGnuTLS-cmake-from-3-17-3.patch new file mode 100644 index 0000000000..30bc201048 --- /dev/null +++ b/package/libzip/0001-Add-FindGnuTLS-cmake-from-3-17-3.patch @@ -0,0 +1,103 @@ +From 73f6f8ebff678a0847e6b197b574082cc285b528 Mon Sep 17 00:00:00 2001 +From: Thomas Klausner +Date: Sat, 25 Jul 2020 12:03:29 +0200 +Subject: [PATCH] Add FindGnuTLS.cmake from 3.17.3. + +Addresses #199 + +[Retrieved from: +https://github.com/nih-at/libzip/commit/73f6f8ebff678a0847e6b197b574082cc285b528] +Signed-off-by: Fabrice Fontaine +--- + cmake-compat/FindGnuTLS.cmake | 82 +++++++++++++++++++++++++++++++++++ + 1 file changed, 82 insertions(+) + create mode 100644 cmake-compat/FindGnuTLS.cmake + +diff --git a/cmake-compat/FindGnuTLS.cmake b/cmake-compat/FindGnuTLS.cmake +new file mode 100644 +index 00000000..819f0001 +--- /dev/null ++++ b/cmake-compat/FindGnuTLS.cmake +@@ -0,0 +1,82 @@ ++# Distributed under the OSI-approved BSD 3-Clause License. See accompanying ++# file Copyright.txt or https://cmake.org/licensing for details. ++ ++#[=======================================================================[.rst: ++FindGnuTLS ++---------- ++ ++Find the GNU Transport Layer Security library (gnutls) ++ ++IMPORTED Targets ++^^^^^^^^^^^^^^^^ ++ ++This module defines :prop_tgt:`IMPORTED` target ``GnuTLS::GnuTLS``, if ++gnutls has been found. ++ ++Result Variables ++^^^^^^^^^^^^^^^^ ++ ++``GNUTLS_FOUND`` ++ System has gnutls ++``GNUTLS_INCLUDE_DIR`` ++ The gnutls include directory ++``GNUTLS_LIBRARIES`` ++ The libraries needed to use gnutls ++``GNUTLS_DEFINITIONS`` ++ Compiler switches required for using gnutls ++``GNUTLS_VERSION`` ++ version of gnutls. ++#]=======================================================================] ++ ++# Note that this doesn't try to find the gnutls-extra package. ++ ++ ++if (GNUTLS_INCLUDE_DIR AND GNUTLS_LIBRARY) ++ # in cache already ++ set(gnutls_FIND_QUIETLY TRUE) ++endif () ++ ++if (NOT WIN32) ++ # try using pkg-config to get the directories and then use these values ++ # in the find_path() and find_library() calls ++ # also fills in GNUTLS_DEFINITIONS, although that isn't normally useful ++ find_package(PkgConfig QUIET) ++ PKG_CHECK_MODULES(PC_GNUTLS QUIET gnutls) ++ set(GNUTLS_DEFINITIONS ${PC_GNUTLS_CFLAGS_OTHER}) ++ set(GNUTLS_VERSION ${PC_GNUTLS_VERSION}) ++ # keep for backward compatibility ++ set(GNUTLS_VERSION_STRING ${PC_GNUTLS_VERSION}) ++endif () ++ ++find_path(GNUTLS_INCLUDE_DIR gnutls/gnutls.h ++ HINTS ++ ${PC_GNUTLS_INCLUDEDIR} ++ ${PC_GNUTLS_INCLUDE_DIRS} ++ ) ++ ++find_library(GNUTLS_LIBRARY NAMES gnutls libgnutls ++ HINTS ++ ${PC_GNUTLS_LIBDIR} ++ ${PC_GNUTLS_LIBRARY_DIRS} ++ ) ++ ++mark_as_advanced(GNUTLS_INCLUDE_DIR GNUTLS_LIBRARY) ++ ++include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) ++FIND_PACKAGE_HANDLE_STANDARD_ARGS(GnuTLS ++ REQUIRED_VARS GNUTLS_LIBRARY GNUTLS_INCLUDE_DIR ++ VERSION_VAR GNUTLS_VERSION_STRING) ++ ++if(GNUTLS_FOUND) ++ set(GNUTLS_LIBRARIES ${GNUTLS_LIBRARY}) ++ set(GNUTLS_INCLUDE_DIRS ${GNUTLS_INCLUDE_DIR}) ++ ++ if(NOT TARGET GnuTLS::GnuTLS) ++ add_library(GnuTLS::GnuTLS UNKNOWN IMPORTED) ++ set_target_properties(GnuTLS::GnuTLS PROPERTIES ++ INTERFACE_INCLUDE_DIRECTORIES "${GNUTLS_INCLUDE_DIRS}" ++ INTERFACE_COMPILE_DEFINITIONS "${GNUTLS_DEFINITIONS}" ++ IMPORTED_LINK_INTERFACE_LANGUAGES "C" ++ IMPORTED_LOCATION "${GNUTLS_LIBRARIES}") ++ endif() ++endif()