From patchwork Thu Sep 29 11:42:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 610603 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp907911pvb; Thu, 29 Sep 2022 06:59:40 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5w2lWKtTdNZYBCw64OJHIk1qTJRsQS+fZwGFsZYVPX+z87/praUxvn9pHC2+iPcW8f934M X-Received: by 2002:a05:6214:b6a:b0:4ad:68bf:1b8b with SMTP id ey10-20020a0562140b6a00b004ad68bf1b8bmr2720068qvb.2.1664459980312; Thu, 29 Sep 2022 06:59:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664459980; cv=none; d=google.com; s=arc-20160816; b=reeXpYL8kqaleMAUVCrE33tQza2ojaB35jDpUSH3q0BX4ORynWLJX2TvInas/EPbTO E4bkRWY56i9crCX3YHN+QS8ofHWSSJAdScvCCjKa4W7xek5SUSwS/y0LKTQ3MazyvSub QnfY48ZS1OjAlDZwqMmnP17sMoUD9vbjS3QPIOQpswliUnH625eOMMjhZfmI8xeAygIF DhVp/6QXrvU91S3gC6K5+bhg/lhFxwM2E4EyscBTZeMP8QvuDrimm4BA/1MZbl8+DUxV UCOZkfsfpus80c1bgLsGX4NMkaD3HzsJ9stbwWjQKdWdVsyv/W8ZD5CDA2TzQgWcogEN 1ufQ== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=bFMnPZI39K0sB6qljzVqyj/PiofPOyUCvNvoHy9FtII=; b=ttvvlg1ckQXOdSS03rzSRln9RS/bHQ6sUmpGLrw8OXH9bLdtKaFbxSX51NbkQoFvhI /p+nwqrPXcbVmDzWWnCdsd2To8AFkQGs9C8IJiXW2bVoFdvdwYzkrXBCMkglrI81wijI lVjms5Pi6bWPNM5/0xnE2v16O1oVpTH7t4gVoH6U72wkRA3nBXv34CHszOv2UGkpctkA CbKpedyJYYtemuHZZVL/8oRV3jLeZgzT5Cra1HFGJ/adOszwg6Lpy4t1jGMwZE4xlaiS GOJQi02DGTwkrggu7js+D7IoHxnh6j5PAXhDeM7x5zyxVxkoU4GYYVPN0+LpGmrZ6M+i O5rg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="H2Y/5hKO"; 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=pass (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 a26-20020ac84d9a000000b0035cf72a3281si1155769qtw.498.2022.09.29.06.59.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 29 Sep 2022 06:59:40 -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=pass header.i=@linaro.org header.s=google header.b="H2Y/5hKO"; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:52416 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1odu4h-0006Cn-PT for patch@linaro.org; Thu, 29 Sep 2022 09:59:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47450) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ods3C-0000N8-7O for qemu-devel@nongnu.org; Thu, 29 Sep 2022 07:50:05 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:36431) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ods39-0002Nh-LF for qemu-devel@nongnu.org; Thu, 29 Sep 2022 07:49:57 -0400 Received: by mail-wr1-x430.google.com with SMTP id v28so1797831wrd.3 for ; Thu, 29 Sep 2022 04:49:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=bFMnPZI39K0sB6qljzVqyj/PiofPOyUCvNvoHy9FtII=; b=H2Y/5hKOM+NSy48gfZkRDqv2/blKE764JkctH3C0hh30XbmeFWnFyd/d6rtAOuONOy tYBleGGc900bBPY5BqX1n+QWQDvuNnYpI0oCiHeXHBIUnHPJVOvWC9lQQhhZ16HY675Z l25qlJ4iFKnzp9pnWobUS0Pf26pRvF8IGMRSoovq0jni72Ja2u6uXHAmWUVhkjQNjPFd QwctNTCvU6P1SxilnXdnerjdb4KKrl0EpC1Wdo3eNNiPrTh7jlYXPtUJN7j7QLjfY3SY 2uDWGPmqC+Z/0laQJxutbGHuq+MlUR38LZFkrRh9Tf32OqOwycj4GFShXCOi2te/ANlI O5kA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=bFMnPZI39K0sB6qljzVqyj/PiofPOyUCvNvoHy9FtII=; b=ejV9HZIAObCs48bE2J0bDIVAgGrHm1FYmftax7V4IZCX16x+ImRPNJtnQMiYwZhY9l 3cVX5lHtI4KFyvaCIVNfWR/Cn477TRS09unOUKXsfoomQ+5KSG2S53dMbLQtgeQrFONc mxD5cTSiyKXH8OIdjLwEXcehRy7nIz1zPMUGOEIw0y9yZ4O7Yiwy4MpmGQKTEKw6TN08 kC1yHkqHl2asrr2nBHPrTBUpzdwp7tmrTagWkcOlsh6yE2b95G+d6XvyHvKfVLFG8ftA meqrXH0xncK6dpadMnpu3zj1ojtnTDjkefwvvlfz/SxQtS1zf3+s3iPlxNEDOOPG2uSQ XJsA== X-Gm-Message-State: ACrzQf0wxc2nSBFHISnva6Ym95GjL+yzGl26FB5dbJik4ReGIpycUjaj H/M2H7pNGx2qqoR9Gl3Oh871a29P6t6H2w== X-Received: by 2002:adf:ed50:0:b0:22c:c749:8b81 with SMTP id u16-20020adfed50000000b0022cc7498b81mr1925896wro.644.1664452194283; Thu, 29 Sep 2022 04:49:54 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id b4-20020a05600c150400b003a5c999cd1asm4909352wmg.14.2022.09.29.04.49.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Sep 2022 04:49:51 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 359E51FFBB; Thu, 29 Sep 2022 12:42:34 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, minyihh@uci.edu, ma.mandourr@gmail.com, Luke.Craig@ll.mit.edu, cota@braap.org, aaron@os.amperecomputing.com, kuhn.chenqun@huawei.com, robhenry@microsoft.com, mahmoudabdalghany@outlook.com, =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH v1 25/51] configure: move tests/tcg/Makefile.prereqs to root build directory Date: Thu, 29 Sep 2022 12:42:05 +0100 Message-Id: <20220929114231.583801-26-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220929114231.583801-1-alex.bennee@linaro.org> References: <20220929114231.583801-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x430.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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.29 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" From: Paolo Bonzini It will not be specific to tests/tcg anymore, since it will be possible to build firmware using container-based cross compilers too. Signed-off-by: Paolo Bonzini Signed-off-by: Alex Bennée --- configure | 15 +++++++-------- Makefile | 5 ++++- tests/Makefile.include | 3 --- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/configure b/configure index ceb1213292..cbeac99b2b 100755 --- a/configure +++ b/configure @@ -2185,6 +2185,7 @@ write_target_makefile() { } write_container_target_makefile() { + echo "$1: docker-image-$container_image" >> Makefile.prereqs echo "EXTRA_CFLAGS=$target_cflags" if test -n "$container_cross_cc"; then echo "CC=$docker_py cc --cc $container_cross_cc -i qemu/$container_image -s $source_path --" @@ -2297,6 +2298,8 @@ for f in $LINKS ; do fi done +echo "# Automatically generated by configure - do not modify" > Makefile.prereqs + # Mac OS X ships with a broken assembler roms= if test "$targetos" != "darwin" && test "$targetos" != "sunos" && \ @@ -2524,10 +2527,7 @@ if test "$safe_stack" = "yes"; then fi # tests/tcg configuration -(makefile=tests/tcg/Makefile.prereqs -echo "# Automatically generated by configure - do not modify" > $makefile - -config_host_mak=tests/tcg/config-host.mak +(config_host_mak=tests/tcg/config-host.mak mkdir -p tests/tcg echo "# Automatically generated by configure - do not modify" > $config_host_mak echo "SRC_PATH=$source_path" >> $config_host_mak @@ -2565,8 +2565,7 @@ for target in $target_list; do write_target_makefile >> "$config_target_mak" elif test -n "$container_image"; then build_static=y - echo "build-tcg-tests-$target: docker-image-$container_image" >> $makefile - write_container_target_makefile >> "$config_target_mak" + write_container_target_makefile build-tcg-tests-$target >> "$config_target_mak" got_cross_cc=yes fi if test $got_cross_cc = yes; then @@ -2576,11 +2575,11 @@ for target in $target_list; do echo "TARGET=$target" >> "$config_target_mak" echo "QEMU=$PWD/$qemu" >> "$config_target_mak" echo "BUILD_STATIC=$build_static" >> "$config_target_mak" - echo "run-tcg-tests-$target: $qemu\$(EXESUF)" >> $makefile + echo "run-tcg-tests-$target: $qemu\$(EXESUF)" >> Makefile.prereqs tcg_tests_targets="$tcg_tests_targets $target" fi done -echo "TCG_TESTS_TARGETS=$tcg_tests_targets" >> $makefile) +echo "TCG_TESTS_TARGETS=$tcg_tests_targets" >> config-host.mak) if test "$skip_meson" = no; then cross="config-meson.cross.new" diff --git a/Makefile b/Makefile index 0fcde48bec..357592ad39 100644 --- a/Makefile +++ b/Makefile @@ -42,6 +42,9 @@ configure: ; ifneq ($(wildcard config-host.mak),) include config-host.mak +include Makefile.prereqs +Makefile.prereqs: config-host.mak + git-submodule-update: .git-submodule-status: git-submodule-update config-host.mak Makefile: .git-submodule-status @@ -217,7 +220,7 @@ qemu-%.tar.bz2: distclean: clean recurse-distclean -$(quiet-@)test -f build.ninja && $(NINJA) $(NINJAFLAGS) -t clean -g || : - rm -f config-host.mak qemu-bundle + rm -f config-host.mak Makefile.prereqs qemu-bundle rm -f tests/tcg/config-*.mak rm -f config.status rm -f roms/seabios/config.mak diff --git a/tests/Makefile.include b/tests/Makefile.include index 9ed67721e2..9422ddaece 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -36,9 +36,6 @@ export SRC_PATH SPEED = quick --include tests/tcg/Makefile.prereqs -tests/tcg/Makefile.prereqs: config-host.mak - # Per guest TCG tests BUILD_TCG_TARGET_RULES=$(patsubst %,build-tcg-tests-%, $(TCG_TESTS_TARGETS)) CLEAN_TCG_TARGET_RULES=$(patsubst %,clean-tcg-tests-%, $(TCG_TESTS_TARGETS))