From patchwork Mon May 6 17:33:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 163420 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:81:0:0:0:0 with SMTP id l1csp254861ilm; Mon, 6 May 2019 10:36:57 -0700 (PDT) X-Google-Smtp-Source: APXvYqxTKIy44vkH5MgqgH5yhU38QVhBtFmXSKEEEIhJZkkygBCwKcKg/4OAolrPwttmDi6Pq6/c X-Received: by 2002:a1c:c18c:: with SMTP id r134mr6941742wmf.124.1557164217871; Mon, 06 May 2019 10:36:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557164217; cv=none; d=google.com; s=arc-20160816; b=IBmV74ONq8SbBM7vKASzt4q6/jSMF/zwt1AO2tM1d70azgReDT+VZpslVBfWBX360/ v1xonkaxwQluFnksJFmvSR0zH9jcbEjOmb7cY04NgrVElPK8z/8wvzrTodghbQVqcFTG hSA5/AH9eAqpEwFItEx/L9Ovl1xqEj22KdZlUyZzAi3rui5+M/uqooIZdYlGi65/3Wrz M8TkuFEnJry6V8JomDxkPUW5+a8xr7tRAKOZtgsWbTCJ0Y2VojusqyDY/El18VOWVqEA mMtvh+HFEF2N5xhslVAj4owFhekO/tn8BZJHAFKPhylsYPb9swlVRJK/M7YQAPtdZoHc FuTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=3IcDqOxNxFpx6A0tMNvu47gM3lLo8oZJFxC0ZgDmPNI=; b=vTqUx+V8uIK+c+E7xYn0gtUJvb0tXqOBxom3+WNddvvgIcWreEEab/K1V0J1TUVhe/ 0jCp4h+jtMHNTDq+bJdYa+BqjdoYPoTPvyGbZV6NiVE37RTW/BRMBMP5RGSdTXd9s6rK tqNyT2qMWqKLww/1JCCARbkNa1qCK5sdwDGvTlZVl0zbQ7IafKDWGhG9D9K/QNGj1kyj 68+lz+IPkdHIMfPg8swu8SSwbMIEgIv7g9M8EADUrumJdM4jSAkVuRii3ip3sG+2w5VU qBQhEvctRAMxTdpAq6+10r6cG5FPBhKNw6AXvCeytGDxJO/5xl0aM+PgKJFy/4gYfREe J8/Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=oKjjQI7X; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id i17si1913260wro.79.2019.05.06.10.36.57 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 06 May 2019 10:36:57 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=oKjjQI7X; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:59932 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hNhXs-0004Ch-Rn for patch@linaro.org; Mon, 06 May 2019 13:36:56 -0400 Received: from eggs.gnu.org ([209.51.188.92]:39736) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hNhV5-0000xO-1B for qemu-devel@nongnu.org; Mon, 06 May 2019 13:34:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hNhV2-0001EU-VC for qemu-devel@nongnu.org; Mon, 06 May 2019 13:34:02 -0400 Received: from mail-pl1-x631.google.com ([2607:f8b0:4864:20::631]:46467) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hNhV0-0001CZ-W6 for qemu-devel@nongnu.org; Mon, 06 May 2019 13:33:59 -0400 Received: by mail-pl1-x631.google.com with SMTP id bi2so6693377plb.13 for ; Mon, 06 May 2019 10:33:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references; bh=3IcDqOxNxFpx6A0tMNvu47gM3lLo8oZJFxC0ZgDmPNI=; b=oKjjQI7XVRe+sFhrMIATJOL1VyUY+fzx97cMBhwu57e9IPvhP/GSvaazc9Td3vfuEq WzCBcx1EBJXNwmeAkEmX4FSZq8F606fSiynWx4V5g22ZSdG+n/7Z5VwbkSQjH4jtnoCa mvMyDQmv/spUO+bejio3bvbJo3ilzQgkZuJJlUPRwT98ubZzZRY7CJ0dIDZi05MjXW5m xzbxVbl++L1EvLlAglY7Jw0DGGFFFfjnfEJrKBeLbKY6Oikt3oujCBkrwKNTqWX07uOZ k2A6uWHAb69W7UdtXBTHEEJp+dHAupyu9WvvRIajrj7GmN1S+z3bWzXt40sKDkHWXEk2 WGNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=3IcDqOxNxFpx6A0tMNvu47gM3lLo8oZJFxC0ZgDmPNI=; b=SceXMgQ7JRHlq160tbrN15DlQ4drdp8aMsqgngvK9saoCVP6DCvneHvtaqKgIkgyob /X7hE8Ny6Vf/w+2K5mqeGZT74XLsOnQ6YByh2Gmr5W3fJtaLuGuGGpBqqO9nr/HByWw4 GU3yuVGb5KqsdZlR9n4D0mq5vDn7D3tGuqASB5htAiOmb0RtyEf/raEN1f5S52/suIU6 8IFkO3C0Q4e26t10/JGuuevl+jcXlNX7ov8t92/4dfsdXzHUKK2Snx6wQO5H1TxjMsGU gQlfE+jORkNWWn3/jDiYl7aWUzF0+J7c5UW+dicrG1b99P2jwSrDuT2C0caHDOyB43Jy PTNg== X-Gm-Message-State: APjAAAW/k+C+FfrIrZdjYsUzsPnnFCcvzj1LV6Z4E90twIaAuBXrjZai ZUkHikAuazJ/t/3+2j6zHQyxSRIUmJE= X-Received: by 2002:a17:902:5982:: with SMTP id p2mr1790959pli.197.1557164036766; Mon, 06 May 2019 10:33:56 -0700 (PDT) Received: from localhost.localdomain (97-113-189-189.tukw.qwest.net. [97.113.189.189]) by smtp.gmail.com with ESMTPSA id k9sm2268839pfa.180.2019.05.06.10.33.55 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 May 2019 10:33:56 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 6 May 2019 10:33:30 -0700 Message-Id: <20190506173353.32206-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190506173353.32206-1-richard.henderson@linaro.org> References: <20190506173353.32206-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::631 Subject: [Qemu-devel] [PATCH v4 01/24] configure: Link test before auto-enabling gnutls X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" At least ubuntu 18.04 does not package static gnutls libraries. Signed-off-by: Richard Henderson --- configure | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) -- 2.17.1 Reviewed-by: Laurent Vivier diff --git a/configure b/configure index 5b183c2e39..daadfe9ad4 100755 --- a/configure +++ b/configure @@ -2784,17 +2784,24 @@ fi # GNUTLS probe if test "$gnutls" != "no"; then + pass="no" if $pkg_config --exists "gnutls >= 3.1.18"; then gnutls_cflags=$($pkg_config --cflags gnutls) gnutls_libs=$($pkg_config --libs gnutls) - libs_softmmu="$gnutls_libs $libs_softmmu" - libs_tools="$gnutls_libs $libs_tools" - QEMU_CFLAGS="$QEMU_CFLAGS $gnutls_cflags" - gnutls="yes" - elif test "$gnutls" = "yes"; then + # Packaging for the static libraries is not always correct. + # At least ubuntu 18.04 ships only shared libraries. + write_c_skeleton + if compile_prog "" "$gnutls_libs" ; then + libs_softmmu="$gnutls_libs $libs_softmmu" + libs_tools="$gnutls_libs $libs_tools" + QEMU_CFLAGS="$QEMU_CFLAGS $gnutls_cflags" + pass="yes" + fi + fi + if test "$pass" = "no" && test "$gnutls" = "yes"; then feature_not_found "gnutls" "Install gnutls devel >= 3.1.18" else - gnutls="no" + gnutls="$pass" fi fi