From nobody Fri Apr 26 00:06:58 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1552499099413853.0958666177769; Wed, 13 Mar 2019 10:44:59 -0700 (PDT) Received: from localhost ([127.0.0.1]:48586 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h47vw-0004ws-Jb for importer@patchew.org; Wed, 13 Mar 2019 13:44:52 -0400 Received: from eggs.gnu.org ([209.51.188.92]:41810) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h47ok-0007Mk-Mt for qemu-devel@nongnu.org; Wed, 13 Mar 2019 13:37:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h47jg-0007JR-7t for qemu-devel@nongnu.org; Wed, 13 Mar 2019 13:32:12 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49388) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h47jg-0007JA-0j for qemu-devel@nongnu.org; Wed, 13 Mar 2019 13:32:12 -0400 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 mx1.redhat.com (Postfix) with ESMTPS id DFC2D3DE05; Wed, 13 Mar 2019 17:32:10 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-112-69.ams2.redhat.com [10.36.112.69]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6ABF4282D2; Wed, 13 Mar 2019 17:32:01 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Date: Wed, 13 Mar 2019 17:31:57 +0000 Message-Id: <20190313173157.30504-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Wed, 13 Mar 2019 17:32:11 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH] configure: remove slirp submodule support that doesn't exist yet 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: , Cc: Peter Maydell , Samuel Thibault , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" The slirp code is not yet split off into a separate repository, so configuring QEMU to use slirp as a submodule is premature. This causes the non-existant "slirp" to be requested from git when syncing submodules. This in turn appears to be cause of non-deterministic failures some developers are seeing with QEMU's submodule sync process. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Stefano Garzarella --- NB, this change should be reverted only once slirp exists in the .git-modules file. configure | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/configure b/configure index cab830a4c9..355eebfc5d 100755 --- a/configure +++ b/configure @@ -1109,8 +1109,6 @@ for opt do ;; --disable-slirp) slirp=3D"no" ;; - --enable-slirp=3Dgit) slirp=3D"git" - ;; --enable-slirp=3Dsystem) slirp=3D"system" ;; --disable-vde) vde=3D"no" @@ -5780,8 +5778,6 @@ case "$slirp" in "" | yes) if $pkg_config slirp; then slirp=3Dsystem - elif test -e "${source_path}/.git" && test $git_update =3D 'yes' ; then - slirp=3Dgit elif test -e "${source_path}/slirp/Makefile" ; then slirp=3Dinternal elif test -z "$slirp" ; then @@ -5799,10 +5795,7 @@ case "$slirp" in esac =20 case "$slirp" in - git | internal) - if test "$slirp" =3D git; then - git_submodules=3D"${git_submodules} slirp" - fi + internal) mkdir -p slirp slirp_cflags=3D"-I\$(SRC_PATH)/slirp/src -I\$(BUILD_DIR)/slirp/src" slirp_libs=3D"-L\$(BUILD_DIR)/slirp -lslirp" @@ -6464,7 +6457,7 @@ if test "$slirp" !=3D "no"; then echo "SLIRP_CFLAGS=3D$slirp_cflags" >> $config_host_mak echo "SLIRP_LIBS=3D$slirp_libs" >> $config_host_mak fi -if [ "$slirp" =3D "git" -o "$slirp" =3D "internal" ]; then +if [ "$slirp" =3D "internal" ]; then echo "config-host.h: subdir-slirp" >> $config_host_mak fi if test "$vde" =3D "yes" ; then --=20 2.20.1