From nobody Tue Nov 18 13:01:28 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1610629050; cv=none; d=zohomail.com; s=zohoarc; b=gQvRHlA/p6JsKOC6ZoRSKIPRcdQ8eTOtg74zJVmxnF+zpkUBhwU1QzfKL7zf1b2CksEmJsZVhsBsbFK+42CLM2g56SpFkYgVmPPWcvaqifizVz8ZMz7mW+7IiDKv30d/K693jYUSEm0mWQg0kVKBX81caVGdNa0luegU8SGNw8U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610629050; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=sD3K+rEI/dUxrODLlT/aKP7XaVY/poit2e3hAIqO+vI=; b=dhFHx6n2i1gADtZfxsriGY98SMdZus0xqDBswMYNI95n01bQA7jzVsyitlg4srfh5OyOihOq10rpdbYZmjGxeE4BHZoidY0u+eIyTHrgO2ZHvR3nBYMw7v8+i/iDkEaKpTbkFo2AWPpCy3ofRoGwW8CvsXmbcFvi6s+fcXvk6+g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1610629050564452.4085118078191; Thu, 14 Jan 2021 04:57:30 -0800 (PST) Received: from localhost ([::1]:56682 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l02Bs-0003hy-55 for importer@patchew.org; Thu, 14 Jan 2021 07:57:28 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41400) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l02Ay-0002Uo-Ro for qemu-devel@nongnu.org; Thu, 14 Jan 2021 07:56:32 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:30049) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l02Ax-0004ia-8X for qemu-devel@nongnu.org; Thu, 14 Jan 2021 07:56:32 -0500 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-588-Dq-12gXvOvKQ1FiaR5FYCA-1; Thu, 14 Jan 2021 07:56:26 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BBA23873088; Thu, 14 Jan 2021 12:56:25 +0000 (UTC) Received: from localhost (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6F6F727C50; Thu, 14 Jan 2021 12:56:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1610628990; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=sD3K+rEI/dUxrODLlT/aKP7XaVY/poit2e3hAIqO+vI=; b=D8lrbh+xPabJfHuNrEdUEX+iGzRyz8c+7byUzNxyTweR6+e7lRCC2uWqfJyXnw7Qrbl0kf 9+54qmY5i7vMIbB+6d6UTjeNNyboXOxBTp2IpdYrYy54YtXvuR/OINb1xGmtQnJBV2/fgS mMTzo6NXep2utWdCiK9af1GGaQF9RD8= X-MC-Unique: Dq-12gXvOvKQ1FiaR5FYCA-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Subject: [PATCH 1/5] build-sys: remove unused LIBS Date: Thu, 14 Jan 2021 16:56:01 +0400 Message-Id: <20210114125605.1227742-2-marcandre.lureau@redhat.com> In-Reply-To: <20210114125605.1227742-1-marcandre.lureau@redhat.com> References: <20210114125605.1227742-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=marcandre.lureau@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=63.128.21.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.248, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, j@getutm.app, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , samuel.thibault@ens-lyon.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Marc-Andr=C3=A9 Lureau Since meson switch and commit feabc71dfa58 ("configure: do not include dependency flags in QEMU_CFLAGS and LIBS"), LIBS is unused. Signed-off-by: Marc-Andr=C3=A9 Lureau Acked-by: Paolo Bonzini --- configure | 32 -------------------------------- 1 file changed, 32 deletions(-) diff --git a/configure b/configure index 155dda124c..64c09f7d58 100755 --- a/configure +++ b/configure @@ -3390,16 +3390,6 @@ else for pthread_lib in $PTHREADLIBS_LIST; do if compile_prog "" "$pthread_lib" ; then pthread=3Dyes - found=3Dno - for lib_entry in $LIBS; do - if test "$lib_entry" =3D "$pthread_lib"; then - found=3Dyes - break - fi - done - if test "$found" =3D "no"; then - LIBS=3D"$pthread_lib $LIBS" - fi break fi done @@ -4087,28 +4077,6 @@ if compile_prog "" "" ; then bswap_h=3Dyes fi =20 -########################################## -# Do we need librt -# uClibc provides 2 versions of clock_gettime(), one with realtime -# support and one without. This means that the clock_gettime() don't -# need -lrt. We still need it for timer_create() so we check for this -# function in addition. -cat > $TMPC < -#include -int main(void) { - timer_create(CLOCK_REALTIME, NULL, NULL); - return clock_gettime(CLOCK_REALTIME, NULL); -} -EOF - -if compile_prog "" "" ; then - : -# we need pthread for static linking. use previous pthread test result -elif compile_prog "" "$pthread_lib -lrt" ; then - LIBS=3D"$LIBS -lrt" -fi - # Check whether we have openpty() in either libc or libutil cat > $TMPC << EOF extern int openpty(int *am, int *as, char *name, void *termp, void *winp); --=20 2.29.0 From nobody Tue Nov 18 13:01:28 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1610629169; cv=none; d=zohomail.com; s=zohoarc; b=W0wZJJdCXYkfHlFzTl1NCuztAA9r+Yyn1nSIIt30FRw9YJyfyi2Fpuo2Z6aICCvjvLLZqSLQxjJ6QdV8BpCn6BhDSqVSQVkZChfHkm3QmgN0W62zc//uwtVUZ9CantGgZC9OZBWT+6lhI/pYEmDlAt3fob8WkJwr0u5EhWwWS9U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610629169; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=+Ux396mYQBTCvp5/kSAVhG9XTdqPPnR/Uj7bslWuHNc=; b=JBuryEE5uz9sAWRqLNGk/4QReg+evdOQ62TB3aK/XVsiHrkBcznFT7+YdU9O519SkFph2B7qg7l2Iec1KL+XPZ9rkUxre30pHijbLtJXiEKHbioji3FPilck3PVG8t0cC7PFpNzcvKIUd5FHFU9rBM67trLHewSO5DLo2jvhbhc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1610629169770663.3993781041053; Thu, 14 Jan 2021 04:59:29 -0800 (PST) Received: from localhost ([::1]:36356 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l02Dm-0006xc-MK for importer@patchew.org; Thu, 14 Jan 2021 07:59:26 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41510) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l02BC-0002qx-TS for qemu-devel@nongnu.org; Thu, 14 Jan 2021 07:56:46 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:42020) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l02BB-0004pB-BO for qemu-devel@nongnu.org; Thu, 14 Jan 2021 07:56:46 -0500 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-520-MGW7hugNP3mwtpkV2Xqj8w-1; Thu, 14 Jan 2021 07:56:40 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 18E6280A5C5; Thu, 14 Jan 2021 12:56:31 +0000 (UTC) Received: from localhost (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2456060867; Thu, 14 Jan 2021 12:56:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1610629004; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+Ux396mYQBTCvp5/kSAVhG9XTdqPPnR/Uj7bslWuHNc=; b=hAfcDPGKCUq7fezdcebKLHj1Aj8+wHBR1L1aGj7lix21K8FvN10ggLXOK3n9Xjv/7uNvFY KKNtt/DoR4QXObO1LV7/qLA6h5JVe/jNKhlqR+5AMj963asDNhR36Zn5dTeuo+vO0FcWtq Lz6Xbg02mUOtekxfcEosVibyIRBWCKk= X-MC-Unique: MGW7hugNP3mwtpkV2Xqj8w-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Subject: [PATCH 2/5] build-sys: set global arguments for cflags/ldflags Date: Thu, 14 Jan 2021 16:56:02 +0400 Message-Id: <20210114125605.1227742-3-marcandre.lureau@redhat.com> In-Reply-To: <20210114125605.1227742-1-marcandre.lureau@redhat.com> References: <20210114125605.1227742-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=marcandre.lureau@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=63.128.21.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.248, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, j@getutm.app, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , samuel.thibault@ens-lyon.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Marc-Andr=C3=A9 Lureau As we want subprojects to share those arguments Signed-off-by: Marc-Andr=C3=A9 Lureau Acked-by: Paolo Bonzini --- meson.build | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/meson.build b/meson.build index 3d889857a0..a4adf06997 100644 --- a/meson.build +++ b/meson.build @@ -100,12 +100,12 @@ if 'CONFIG_FUZZ' in config_host native: false, language: ['c', 'cpp', 'objc'= ]) endif =20 -add_project_arguments(config_host['QEMU_CFLAGS'].split(), - native: false, language: ['c', 'objc']) -add_project_arguments(config_host['QEMU_CXXFLAGS'].split(), - native: false, language: 'cpp') -add_project_link_arguments(config_host['QEMU_LDFLAGS'].split(), - native: false, language: ['c', 'cpp', 'objc']) +add_global_arguments(config_host['QEMU_CFLAGS'].split(), + native: false, language: ['c', 'objc']) +add_global_arguments(config_host['QEMU_CXXFLAGS'].split(), + native: false, language: 'cpp') +add_global_link_arguments(config_host['QEMU_LDFLAGS'].split(), + native: false, language: ['c', 'cpp', 'objc']) =20 if targetos =3D=3D 'linux' add_project_arguments('-isystem', meson.current_source_dir() / 'linux-he= aders', @@ -1019,8 +1019,8 @@ if get_option('cfi') error('-fno-sanitize-trap=3Dcfi-icall is not supported by the compil= er') endif endif - add_project_arguments(cfi_flags, native: false, language: ['c', 'cpp', '= objc']) - add_project_link_arguments(cfi_flags, native: false, language: ['c', 'cp= p', 'objc']) + add_global_arguments(cfi_flags, native: false, language: ['c', 'cpp', 'o= bjc']) + add_global_link_arguments(cfi_flags, native: false, language: ['c', 'cpp= ', 'objc']) endif =20 ################# --=20 2.29.0 From nobody Tue Nov 18 13:01:28 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1610629159; cv=none; d=zohomail.com; s=zohoarc; b=JBNeoESId3LErg+slJIXhKih0SWS5y0+M8oQ4yR5mojFPbMXfSWnrXdaOEBR04+1n7H4/cIGWX9GqU8925dGfYgb6pKfSpkC8AGePllgp6nPjfnLgUoN8pGvTjilcs+PGA8uuX3TjaSht8PHlQ7qSOHgcE6IPllsaVOjy2SSvbM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610629159; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=c24s2IPEAdbnCxHoUQfcfNtXo9wRvaZyUY3nUeoK2Vc=; b=WWnCcPmTT4MILtTj3hfqMvgI+YZEfWLH60J1QzId6454MWUb4vUcnmT8zvlfFXN50D95hqaQ7YZOiKQOmFCj0d224LBXaO9cHj7Vw0lD1LVPghacrwpObwLZhOz8VzQpKeLwmZZ0C6sRhrkwJg/whknLvOR5F+jVVhP/YEdPeag= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1610629159175535.1994892017864; Thu, 14 Jan 2021 04:59:19 -0800 (PST) Received: from localhost ([::1]:35594 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l02De-0006eI-52 for importer@patchew.org; Thu, 14 Jan 2021 07:59:18 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41502) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l02BC-0002pf-4A for qemu-devel@nongnu.org; Thu, 14 Jan 2021 07:56:46 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:50476) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l02B9-0004oQ-TG for qemu-devel@nongnu.org; Thu, 14 Jan 2021 07:56:45 -0500 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-203-rLtyBkLhOD-QRrwx7fBmXQ-1; Thu, 14 Jan 2021 07:56:40 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B9E33100E450; Thu, 14 Jan 2021 12:56:36 +0000 (UTC) Received: from localhost (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8416A648A1; Thu, 14 Jan 2021 12:56:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1610629003; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=c24s2IPEAdbnCxHoUQfcfNtXo9wRvaZyUY3nUeoK2Vc=; b=XuHOaq/ZNYfWB3JB/rXZRo0Y7vSCYZpaBy+BAfF8WHjDFmgiAP/loBDGhsdWWL3IjtkotQ FuG+DsciAMkMsc9iNKhtFGXmErT2GIhVnqw1dYDD+aF+QNLnJXcYKG96t9pH3dXKuQ/GXW 9lpG1X1qzK3LlnTRas9z/eGDo5ViIVY= X-MC-Unique: rLtyBkLhOD-QRrwx7fBmXQ-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Subject: [PATCH 3/5] build-sys: add libvhost-user missing dependencies Date: Thu, 14 Jan 2021 16:56:03 +0400 Message-Id: <20210114125605.1227742-4-marcandre.lureau@redhat.com> In-Reply-To: <20210114125605.1227742-1-marcandre.lureau@redhat.com> References: <20210114125605.1227742-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=marcandre.lureau@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.248, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, j@getutm.app, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , samuel.thibault@ens-lyon.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Marc-Andr=C3=A9 Lureau This help fixing static compilation issues. Signed-off-by: Marc-Andr=C3=A9 Lureau Acked-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- subprojects/libvhost-user/meson.build | 3 +++ 1 file changed, 3 insertions(+) diff --git a/subprojects/libvhost-user/meson.build b/subprojects/libvhost-u= ser/meson.build index c5d85c11d7..b03446e7cd 100644 --- a/subprojects/libvhost-user/meson.build +++ b/subprojects/libvhost-user/meson.build @@ -2,12 +2,14 @@ project('libvhost-user', 'c', license: 'GPL-2.0-or-later', default_options: ['c_std=3Dgnu99']) =20 +threads =3D dependency('threads') glib =3D dependency('glib-2.0') inc =3D include_directories('../../include', '../../linux-headers') =20 vhost_user =3D static_library('vhost-user', files('libvhost-user.c'), include_directories: inc, + dependencies: threads, c_args: '-D_GNU_SOURCE') =20 executable('link-test', files('link-test.c'), @@ -21,4 +23,5 @@ vhost_user_glib =3D static_library('vhost-user-glib', dependencies: glib) =20 vhost_user_dep =3D declare_dependency(link_with: vhost_user_glib, + dependencies: glib, include_directories: include_directori= es('.')) --=20 2.29.0 From nobody Tue Nov 18 13:01:28 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1610629086; cv=none; d=zohomail.com; s=zohoarc; b=ehjc8eBQBXP7we++9roLJ5EqmXJp0StQ5/ODaunmzVw9M2tnf2SJCIYVQ/fbB9tZC+BTgZ07HHzaox3nI2FY7U5DQCCbIxLNb6xVqrfzctktR7cHAc72icZdWxHFWb+tJDHoyZHpK3ZgN1oS5sFpTAcK69ENsthgzjUSaP1cPoQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610629086; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Z3UTpVZUCbF+UfdbAeLEovXZeobzPoeJ1rpTsNje78Q=; b=QpfoXhBS/ZvWyP1a1Or0+buK2deC45ZhnGdZWEpqmJlhhKkpQ2Foy5Ijjbbq0eMp21VvP4Jo1silxYhzxjVeN531xyvQEtAPasEMqu777PSbF6j0RsUf9WeHV20xEssi8Eqr8I9gPqk4di6IPtw5ByorFimZS9muCjzXWKNFRlc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1610629086125889.0544648063038; Thu, 14 Jan 2021 04:58:06 -0800 (PST) Received: from localhost ([::1]:58824 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l02CS-0004a7-1W for importer@patchew.org; Thu, 14 Jan 2021 07:58:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41552) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l02BF-0002w7-Mv for qemu-devel@nongnu.org; Thu, 14 Jan 2021 07:56:49 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:51890) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l02BD-0004qj-TO for qemu-devel@nongnu.org; Thu, 14 Jan 2021 07:56:49 -0500 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-320-9QWPoy18PReeLGZVoK7NIg-1; Thu, 14 Jan 2021 07:56:44 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AE367423C0; Thu, 14 Jan 2021 12:56:41 +0000 (UTC) Received: from localhost (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9AE0360867; Thu, 14 Jan 2021 12:56:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1610629007; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Z3UTpVZUCbF+UfdbAeLEovXZeobzPoeJ1rpTsNje78Q=; b=IoKR87Z2vuNDM6/8i76bYf43YS8k4AjX1L6dNjXc0SaovNw2hpJajC6RAB2WZUxCaHvt+9 GfJY2Oy9Kswhw7u9BWNpAzk6tENWR+oUhwpjp9cNk8QwXlhTSoaP4vw5uE1SOY6HT85ShJ PDHDLghXZ2/W2jqCV8SjRSaLzEcLZjA= X-MC-Unique: 9QWPoy18PReeLGZVoK7NIg-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Subject: [PATCH 4/5] slirp: update to git master Date: Thu, 14 Jan 2021 16:56:04 +0400 Message-Id: <20210114125605.1227742-5-marcandre.lureau@redhat.com> In-Reply-To: <20210114125605.1227742-1-marcandre.lureau@redhat.com> References: <20210114125605.1227742-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=marcandre.lureau@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=63.128.21.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.248, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, j@getutm.app, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , samuel.thibault@ens-lyon.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Marc-Andr=C3=A9 Lureau git cherry-diff: Commits on bacb71f1c3ed5f40e393afd8be81bedfba13a401 branch that is not on 8= f43a99191afb47ca3f3c6972f6306209f367ece branch + 1021b0dc38d39f1dc95a296fe3e05a24a087cdc6 disable_dns option + 0f94ceec752592e4ac632a24e3c64a97dd09bf4c limit vnameserver_addr to port 53 + b57bafa852ef16b133907a13678ec69e9531f177 libslirp.h: fix SlirpConfig v3 d= ocumentation + 1abf18b2b5edb462797629ed47ad4515a195686e Update CHANGELOG + ff4ecf9b6c6542b24b4ac6ea178be9d44e159f79 Release v4.3.0 + 21f1d933050a40d62612c6274c32de60b811d9ea changelog: post-release + 376187c4b14c795763d472214812826eebe7e9c2 Release v4.3.1 + 73336e08902a7e826f7d960453df037380266186 changelog: post-release + 5c1c9d43be61571608e9b14615045b67b830daf5 udp, udp6, icmp: handle TTL value + 73ed49ab71998d4288e71e954ef6214b70f23d79 icmp, icmp6: Add icmp_forward_er= ror and icmp6_forward_error + 7a4840a57ec7dbc37cca1ab96f058a9610b26950 udp, udp6, icmp, icmp6: Enable f= orwarding errors on Linux + e9b2bc19ae652a2907f247e621b2e4773bdd2aab TCPIPHDR_DELTA: Fix potential ne= gative value + 39f9a363eec082f04513413046321abd04163148 .gitlab-ci: add a Coverity stage + 1b0093b973cfa0dc041522e5d4e6f576b2df642e sosendoob: better document what = urgc is used for + 5b9ad89ebbb8afa50162c9156fabd5fc56291088 Add G_GNUC_PRINTF to local funct= ion slirp_vsnprintf + 8a808aa493980e212b4d5f5465330905c8294e59 meson: remove meson-dist script + 0b669b5fbe4d3c25a682a67f1059d8633c963b3d meson: support compiling as subp= roject + 9f82a47b81f2864422b82c1e40e51a2ed9c6ac32 Add DNS resolving for iOS + c0eac03e8ce1b9a743231f2fe21e7cb579fc9339 Remove the QEMU-special make bui= ld-system + 1bfd4d9368f9fa2e4f0731e1266bec05bbc83a80 socket: consume empty packets + 92413be68914f8cae2f5bad4bf3ab8491dcbc5d7 Release v4.4.0 + 07e8cfac69766081871ab620d9f16a630543d302 changelog: post-release + 4c4e035813313d02b63fdeb920d56fb2fdc0a5b1 Remove some needless (void)casts Signed-off-by: Marc-Andr=C3=A9 Lureau Acked-by: Paolo Bonzini --- slirp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/slirp b/slirp index 8f43a99191..bacb71f1c3 160000 --- a/slirp +++ b/slirp @@ -1 +1 @@ -Subproject commit 8f43a99191afb47ca3f3c6972f6306209f367ece +Subproject commit bacb71f1c3ed5f40e393afd8be81bedfba13a401 --=20 2.29.0 From nobody Tue Nov 18 13:01:28 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1610629136; cv=none; d=zohomail.com; s=zohoarc; b=gvldHL5oTc7tQspffBIPtrRzXgu/iU8HdugsTzMLhtyZLMA5XgN7eY3hXSKu0FprREPdANFWShydzk3Wvu1hx8NViX9W9iSERS0/Ko2WXN8v96JHsjWKELhICil0Y8/Gp8a+LY8EC5OprhKnD/O4IDRQDfb49lO31CIo8jSvANo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610629136; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=7bi7M6sFiTeSLDO9o5rxARuw7tLtXIltjoyENfz9lds=; b=JFIisKgDoEnTHiqyOKdfpJ8bh9dm7fX27XTrauU89aeO8CBgh1XFeJvrEbdbtT1X93lBFsha5sueXaCqy1ThD3j4S9tH/A5LKsHDJQIJjtBZWyzRqjBQmonAIuf9HUrX3BR/rlQGNNW3INQ+ZPSQ/vdXGyOALSufP/lNzzzV3YI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1610629136862699.6710332865536; Thu, 14 Jan 2021 04:58:56 -0800 (PST) Received: from localhost ([::1]:33348 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l02DH-0005k3-OH for importer@patchew.org; Thu, 14 Jan 2021 07:58:55 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41572) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l02BN-0003Dj-AK for qemu-devel@nongnu.org; Thu, 14 Jan 2021 07:56:57 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:54503) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l02BL-0004tH-4u for qemu-devel@nongnu.org; Thu, 14 Jan 2021 07:56:57 -0500 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-412-ln8QJ7mKMrqWhH5fST2dWA-1; Thu, 14 Jan 2021 07:56:48 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3B10A84A606; Thu, 14 Jan 2021 12:56:47 +0000 (UTC) Received: from localhost (unknown [10.36.110.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id CECEE63BA7; Thu, 14 Jan 2021 12:56:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1610629014; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7bi7M6sFiTeSLDO9o5rxARuw7tLtXIltjoyENfz9lds=; b=OLxQbl9VqO8VxQvdc8g1M0J3qzwiLQk4KDoUOhQsEWEDAT8w6Fp08LYqNGcsJpEA6aezT4 xn9BHkArV1MYOAz4zxdnLbtiJcX8hM9FWAgu1z5VUNbD/DqDZETmRxEsWb+8/UAYVcdY4I 60jmCeaL3EJABoTdcwm0pjVB49M3k98= X-MC-Unique: ln8QJ7mKMrqWhH5fST2dWA-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Subject: [PATCH 5/5] build-sys: make libslirp a meson subproject Date: Thu, 14 Jan 2021 16:56:05 +0400 Message-Id: <20210114125605.1227742-6-marcandre.lureau@redhat.com> In-Reply-To: <20210114125605.1227742-1-marcandre.lureau@redhat.com> References: <20210114125605.1227742-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=marcandre.lureau@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=63.128.21.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.248, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, j@getutm.app, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , samuel.thibault@ens-lyon.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Marc-Andr=C3=A9 Lureau Remove the manual build. Signed-off-by: Marc-Andr=C3=A9 Lureau Acked-by: Paolo Bonzini --- configure | 2 +- meson.build | 62 +++-------------------------------- .gitmodules | 6 ++-- slirp =3D> subprojects/libslirp | 0 4 files changed, 8 insertions(+), 62 deletions(-) rename slirp =3D> subprojects/libslirp (100%) diff --git a/configure b/configure index 64c09f7d58..e2ed041f66 100755 --- a/configure +++ b/configure @@ -5210,7 +5210,7 @@ case "$slirp" in auto | enabled | internal) # Simpler to always update submodule, even if not needed. if test -e "${source_path}/.git" && test $git_update =3D 'yes' ; then - git_submodules=3D"${git_submodules} slirp" + git_submodules=3D"${git_submodules} subprojects/libslirp" fi ;; esac diff --git a/meson.build b/meson.build index a4adf06997..5f1121d135 100644 --- a/meson.build +++ b/meson.build @@ -1457,7 +1457,7 @@ slirp_opt =3D 'disabled' if have_system slirp_opt =3D get_option('slirp') if slirp_opt in ['enabled', 'auto', 'system'] - have_internal =3D fs.exists(meson.current_source_dir() / 'slirp/meson.= build') + have_internal =3D fs.exists(meson.current_source_dir() / 'subprojects/= libslirp/meson.build') slirp =3D dependency('slirp', static: enable_static, method: 'pkg-config', required: slirp_opt =3D=3D 'system' or @@ -1471,63 +1471,9 @@ if have_system endif endif if slirp_opt =3D=3D 'internal' - slirp_deps =3D [] - if targetos =3D=3D 'windows' - slirp_deps =3D cc.find_library('iphlpapi') - endif - slirp_conf =3D configuration_data() - slirp_conf.set('SLIRP_MAJOR_VERSION', meson.project_version().split('.= ')[0]) - slirp_conf.set('SLIRP_MINOR_VERSION', meson.project_version().split('.= ')[1]) - slirp_conf.set('SLIRP_MICRO_VERSION', meson.project_version().split('.= ')[2]) - slirp_conf.set_quoted('SLIRP_VERSION_STRING', meson.project_version()) - slirp_cargs =3D ['-DG_LOG_DOMAIN=3D"Slirp"'] - slirp_files =3D [ - 'slirp/src/arp_table.c', - 'slirp/src/bootp.c', - 'slirp/src/cksum.c', - 'slirp/src/dhcpv6.c', - 'slirp/src/dnssearch.c', - 'slirp/src/if.c', - 'slirp/src/ip6_icmp.c', - 'slirp/src/ip6_input.c', - 'slirp/src/ip6_output.c', - 'slirp/src/ip_icmp.c', - 'slirp/src/ip_input.c', - 'slirp/src/ip_output.c', - 'slirp/src/mbuf.c', - 'slirp/src/misc.c', - 'slirp/src/ncsi.c', - 'slirp/src/ndp_table.c', - 'slirp/src/sbuf.c', - 'slirp/src/slirp.c', - 'slirp/src/socket.c', - 'slirp/src/state.c', - 'slirp/src/stream.c', - 'slirp/src/tcp_input.c', - 'slirp/src/tcp_output.c', - 'slirp/src/tcp_subr.c', - 'slirp/src/tcp_timer.c', - 'slirp/src/tftp.c', - 'slirp/src/udp.c', - 'slirp/src/udp6.c', - 'slirp/src/util.c', - 'slirp/src/version.c', - 'slirp/src/vmstate.c', - ] - - configure_file( - input : 'slirp/src/libslirp-version.h.in', - output : 'libslirp-version.h', - configuration: slirp_conf) - - slirp_inc =3D include_directories('slirp', 'slirp/src') - libslirp =3D static_library('slirp', - sources: slirp_files, - c_args: slirp_cargs, - include_directories: slirp_inc) - slirp =3D declare_dependency(link_with: libslirp, - dependencies: slirp_deps, - include_directories: slirp_inc) + libslirp =3D subproject('libslirp', + default_options: ['default_library=3Dstatic']) + slirp =3D libslirp.get_variable('libslirp_dep') endif endif =20 diff --git a/.gitmodules b/.gitmodules index 2bdeeacef8..80fd9c7199 100644 --- a/.gitmodules +++ b/.gitmodules @@ -49,9 +49,6 @@ [submodule "roms/edk2"] path =3D roms/edk2 url =3D https://git.qemu.org/git/edk2.git -[submodule "slirp"] - path =3D slirp - url =3D https://git.qemu.org/git/libslirp.git [submodule "roms/opensbi"] path =3D roms/opensbi url =3D https://git.qemu.org/git/opensbi.git @@ -64,3 +61,6 @@ [submodule "roms/vbootrom"] path =3D roms/vbootrom url =3D https://git.qemu.org/git/vbootrom.git +[submodule "subprojects/libslirp"] + path =3D subprojects/libslirp + url =3D https://git.qemu.org/git/libslirp.git diff --git a/slirp b/subprojects/libslirp similarity index 100% rename from slirp rename to subprojects/libslirp --=20 2.29.0