From nobody Fri Mar 29 08:50:40 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1617717301; cv=none; d=zohomail.com; s=zohoarc; b=EWPYdNXSoKfQxitzdHAqaYM0as5JILR90KCyCSrkfj5Lr8WYLrHCVfW2xge1PaOIjf1LTE/l4HSBqgbNwAN1OXAHS33baBBtF3NF0d1SmQNqipA4GgwaCS9WhFQY8XC80S+2kITdUoWCOmtCMQcog4RY8xwsl3/rTH2H8DDD1QA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617717301; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=CydJH1ve8qC0HNFVlL2xxR4DtHZN1HzgO/eBl0J/B0Y=; b=InIS7u+sWXDkIfctFad7F3oKj1HHcySAWLc9k8cA0FMtgbj1c0QqWf6wTd4DGI+hmq0010R8hNPE2E2iE/aPgTOHO19ZvOeQzVoyuqzvWmt3oU/+PqYlo2G8Ndou0BhwsZZgYxrnaOch5XOTkhLiGEG0qS2mg54ey32GH2zX09M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1617717301575387.6085221043073; Tue, 6 Apr 2021 06:55:01 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-419-FFIFn2MTMZyi63N5JpPTdQ-1; Tue, 06 Apr 2021 09:54:57 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2948A12C8A6; Tue, 6 Apr 2021 13:54:19 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EC81C5D9E3; Tue, 6 Apr 2021 13:54:16 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 805A34BB7C; Tue, 6 Apr 2021 13:54:12 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 136DqWOJ011223 for ; Tue, 6 Apr 2021 09:52:32 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6A38617D6B; Tue, 6 Apr 2021 13:52:32 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.40.195.59]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8A0A860C3C for ; Tue, 6 Apr 2021 13:52:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1617717300; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=CydJH1ve8qC0HNFVlL2xxR4DtHZN1HzgO/eBl0J/B0Y=; b=OWoJKkfFY7r3lP9+/MXZLEeviLsxbbQouYIfDnR4ID3V3EreGqytt6QaIzo9LMsAFLI3ru ILhGaTUAMINUcYTjZM0QlLJyFne2NxX0QS2BOX8am6IcqHJ3dbsn1l7C+OTLsO4ZUY2LXt UdwLIbLCauHCePgODHGOPxhVsj04CiA= X-MC-Unique: FFIFn2MTMZyi63N5JpPTdQ-1 From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH] meson: Drop readline kludge Date: Tue, 6 Apr 2021 15:52:15 +0200 Message-Id: <20210406135215.33955-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Both FreeBSD ports and Homebrew on macOS have readline 8.1 now, and that version contains a correct pkg-config file so the kludge is no longer necessary. Signed-off-by: Andrea Bolognani Reviewed-by: J=C3=A1n Tomko --- Only took a couple of years :) Test pipeline: https://gitlab.com/abologna/libvirt/-/pipelines/282088714 meson.build | 31 ------------------------------- 1 file changed, 31 deletions(-) diff --git a/meson.build b/meson.build index b827bd9275..cd88e26f9a 100644 --- a/meson.build +++ b/meson.build @@ -1268,37 +1268,6 @@ else readline_dep =3D dependency('', required: false) endif if readline_dep.found() - # Gross kludge for readline include path obtained through pkg-config. - # - # As of 8.0, upstream readline.pc has -I${includedir}/readline among - # its Cflags, which is clearly wrong. This does not affect Linux - # because ${includedir} is already part of the default include path, - # but on other platforms that's not the case and the result is that - # can't be located, causing the build to fail. - # A patch solving this issue has already been posted upstream, so once - # the fix has landed in FreeBSD ports and macOS homebrew we can safely - # drop the kludge and rely on pkg-config alone on those platforms. - # - # [1] https://lists.gnu.org/archive/html/bug-readline/2019-04/msg00007.h= tml - if readline_dep.type_name() =3D=3D 'pkgconfig' and host_machine.system()= !=3D 'linux' - pkg_config_prog =3D find_program('pkg-config') - rc =3D run_command(pkg_config_prog, '--cflags', 'readline', check: tru= e) - cflags =3D rc.stdout().strip() - if cflags.contains('include/readline') - rc =3D run_command( - 'python3', '-c', - 'print("@0@".replace("@1@", "@2@"))'.format( - cflags, 'include/readline', 'include', - ), - check: true, - ) - readline_dep =3D declare_dependency( - compile_args: rc.stdout().strip().split(), - dependencies: [ readline_dep ], - ) - endif - endif - # We need this to avoid compilation issues with modern compilers. # See 9ea3424a178 for a more detailed explanation readline_dep =3D declare_dependency( --=20 2.26.3