From patchwork Sat Nov 3 15:28:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 992653 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.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.b="NedA191k"; 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 42nNBM6n1kzB4dt for ; Sun, 4 Nov 2018 02:28:27 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id AF8E787A38; Sat, 3 Nov 2018 15:28:25 +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 VfmVmLrp4hrJ; Sat, 3 Nov 2018 15:28:24 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 288A687931; Sat, 3 Nov 2018 15:28:24 +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 67E281BF294 for ; Sat, 3 Nov 2018 15:28:23 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 659B98647B for ; Sat, 3 Nov 2018 15:28:23 +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 rvXRBIJpKB-V for ; Sat, 3 Nov 2018 15:28:22 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by hemlock.osuosl.org (Postfix) with ESMTPS id 9B5B4861AF for ; Sat, 3 Nov 2018 15:28:22 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id z16-v6so4893986wrv.2 for ; Sat, 03 Nov 2018 08:28:22 -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; bh=QNI9NeEgtl3DZUtqcuaNOVFBPa5dy7cysbd/XPh0LO4=; b=NedA191kKqMSZkBYvQJhZ1UReTlSuJl+eK2Mcu3X88wHO4HQvgbrrOk9OyySBxXUYC jT1+bIQ8YLxR25/vXV4v06ayZXwHjQYHFPPQO7cj7P+vM/GfQvuErlv3woBkTQWLEDnh H7Npkj0kpny9GXrxhi4aqhWaV/Mf+mSzSaubqhLALOcNmv1MXmWRD6VL9kil5X7ALKyp BqMevCF+kG9NV3fFyh64VGcNikBM9uy1DTNkCZ1Hzwyi7QPdWMt4SgJPkYV1d1eZejX3 FtvNTN3+iQyiBUAhm29tB8Psz6iN1unFiqLEZn0LV5QZRaHRJtDAU0dQE5TVMiweUD3O 8ynw== 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; bh=QNI9NeEgtl3DZUtqcuaNOVFBPa5dy7cysbd/XPh0LO4=; b=nXQVauc/uf25MS1vaCpouPayolnFBI4pFY4e2xOnpkmT0QEwETA5OLMg8QNujKlMqX 7Lnlvpk98q2TeNceyYQbzJv4ZxQpsjQsrY5WCDhO4jJ7SsEjHIcQBuQ1ZopRfpAd+IOY jB+QBry1nI6vmFpmir0kQdp7dT86fUz+Pbul+xuolWL3P9T+CqgqpXNPp6C4Ls3TY0/8 RbU3pSxLXfxZBECaTNMJ9f3yRSeGLa2hkTsOq1KtdXpAWjlfRxIXt6OpoMxlfgHX7rUA wlsubzVlNGJugUIkS7EP8lNXXocKW4olKr/RIO/hEG+OQZJaIYgLY0U2Bdfr6NOBpH4B iF6w== X-Gm-Message-State: AGRZ1gJ6aO50gU+10fLXjxogdWFl6hHC/uu5A1BJpOLQ6wqSmQGLdXVS RHitaWNNfYGMnAO/woajfjQ1TEHGTkk= X-Google-Smtp-Source: AJdET5cwQrUXq/A0eWHQw1rcmoA07B8D6XumiLLVGw+2EHQOXX4dsQjFR6E4vVijf9/wvc7Q7ob+Rw== X-Received: by 2002:a5d:45c3:: with SMTP id b3-v6mr13394893wrs.296.1541258900531; Sat, 03 Nov 2018 08:28:20 -0700 (PDT) Received: from localhost.localdomain (arennes-656-1-360-24.w2-11.abo.wanadoo.fr. [2.11.112.24]) by smtp.gmail.com with ESMTPSA id o188-v6sm10483436wmg.9.2018.11.03.08.28.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 03 Nov 2018 08:28:19 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Sat, 3 Nov 2018 16:28:11 +0100 Message-Id: <20181103152811.6532-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [Buildroot] [PATCH 1/1] libssh2: update second patch 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: Fabrice Fontaine MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" curl can be statically linked with mbedtls, in this case build will fail on: kex.c:(.text+0x1be0): undefined reference to `mbedtls_mpi_read_binary' This is due to the fact that CURL_LIBRARIES does not contain mbedtls library: CURL_LIBRARIES:INTERNAL=curl;cares;ssh2;ssh2;z;ssl;crypto;z;z;crypto;z;z;ssl;z;z;crypto;z even if libcurl.pc is correct: Libs.private: -lcares -lssh2 -L/home/fabrice/buildroot/output/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib -lssh2 /home/fabrice/buildroot/output/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libmbedcrypto.a /home/fabrice/buildroot/output/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libmbedcrypto.a -L/home/fabrice/buildroot/output/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib -L/home/fabrice/buildroot/output/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib -lz -lssl -lcrypto -lssl -lz -lz -lcrypto -lz -lz This full library path is added by the second patch on libssh2 so update it to replace $LIBMBDEDCRYPTO by $LTLIBMBEDCRYPTO as suggested by Thomas during review of https://patchwork.ozlabs.org/patch/989339 Fixes: - http://autobuild.buildroot.org/results/dc7810d5d5c62658837cdd2faae6fe3390f968a2 Signed-off-by: Fabrice Fontaine --- package/libssh2/0002-acinclude.m4-add-mbedtls-to-LIBS.patch | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/package/libssh2/0002-acinclude.m4-add-mbedtls-to-LIBS.patch b/package/libssh2/0002-acinclude.m4-add-mbedtls-to-LIBS.patch index 76e08c51a9..b74c6c9c48 100644 --- a/package/libssh2/0002-acinclude.m4-add-mbedtls-to-LIBS.patch +++ b/package/libssh2/0002-acinclude.m4-add-mbedtls-to-LIBS.patch @@ -8,6 +8,10 @@ libssh2.pc contains correct info for the benefit of pkg-config users. Static link with libssh2 requires this information. Signed-off-by: Baruch Siach +Signed-off-by: Fabrice Fontaine +[Replace $LIBMBEDCRYTO by $LTLIBMBEDCRYPTO to avoid adding a full +library path to libssh2.pc as it raises build failures on some packages +such as xerces] --- Upstream status: https://github.com/libssh2/libssh2/pull/242 @@ -22,7 +26,7 @@ index c0e89a1a0c98..02c70845d27c 100644 [mbedtls], [ LIBSSH2_LIB_HAVE_LINKFLAGS([mbedcrypto], [], [#include ], [ AC_DEFINE(LIBSSH2_MBEDTLS, 1, [Use $1]) -+ LIBS="$LIBS $LIBMBEDCRYPTO" ++ LIBS="$LIBS $LTLIBMBEDCRYPTO" found_crypto="$1" support_clear_memory=yes ])