From nobody Mon Feb 9 09:29:01 2026 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=none (zohomail.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1579670086; cv=none; d=zohomail.com; s=zohoarc; b=mYow/xHmAN+HLMaSDI85W3Q5SHysfH8DTRz0V53935tBMnEpC6TfME5yKZj9NU8RXZZLx9OvEMcrmEO6epJLtglkHDqU88gtWmMLb+EU+vGZ5BteGtl6iWPRv4KJnK2vpWzJGWYMD7LZgQ2JpaGGqz0ip4Dz9qJr0GxtRhiS384= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579670086; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=9NAeaJNzxmOfLots0YH9siR4yhS1ZpARyF6l5oApT2g=; b=YVgGM0syrrmI2lS3oV9F8fbPRoExgn1NhTleB8SQ9M+i00n6ZiaL7iSU08U6S+h/DPTJWF3gqNWDgjuEbtKc0po5PvHz5aWAYwsGvZxqfCW4WLorASCdFK6td2f4+7obc04eFhicRhX2mrCNNgLndBq7I3SFbwSpsFsDdk3lAYw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=none (zohomail.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1579670086706455.9205175686751; Tue, 21 Jan 2020 21:14:46 -0800 (PST) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iu8L5-00055l-Dw; Wed, 22 Jan 2020 05:14:03 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iu5Jd-00064k-Vd for xen-devel@lists.xenproject.org; Wed, 22 Jan 2020 02:00:22 +0000 Received: from mail-yw1-xc44.google.com (unknown [2607:f8b0:4864:20::c44]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id f206561e-3cba-11ea-9fd7-bc764e2007e4; Wed, 22 Jan 2020 02:00:21 +0000 (UTC) Received: by mail-yw1-xc44.google.com with SMTP id h126so2498177ywc.6 for ; Tue, 21 Jan 2020 18:00:21 -0800 (PST) Received: from bobbye-pc.knology.net ([216.186.244.35]) by smtp.gmail.com with ESMTPSA id q185sm17504248ywh.61.2020.01.21.18.00.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jan 2020 18:00:19 -0800 (PST) X-Inumbo-ID: f206561e-3cba-11ea-9fd7-bc764e2007e4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=OhWLm7MUE0n8wggr9oTizpnqoagwpEEXFCTRserYyYQ=; b=KZ7qJ61hJnG8JyscKHuqto6VxiWpTfXPMWe8JiqkByFaLZ8fN3pL9xqgDV5RLQ45db 2eW9JMTleJbHaITIHMEYZ5hd99MCT1uXCyMqclVggvzRhmZRwAqU0YuWdLEMq+7kFv7m 5tGi4BblfNPw78K/ZLxahab40stawkARlfsZEIA08dIiRnVB7jZGgrzkeJ0nGcA+2Ruw AHr6/CU8upKCLOGctbrPtR+7M6ng95gWhvC4LFZt0m/y7qavaMO2QV2a7rCqx8ffQ3x8 5mimeL8CgtTfBMZT6jLpTKaX2r2bdJWQXCMbWx3x68mawjqHH8kT39SxhIAN3eR+G0JT olaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=OhWLm7MUE0n8wggr9oTizpnqoagwpEEXFCTRserYyYQ=; b=nnY2MqaNQ7EsRvOtnLqdsNstLmcWOf8C7vpYtWPp+/59gSAjRXX7bhFax7gArZUgID vPq3iIyYOlQIX9y5QIkh/iuiecwFJGK3bUnNFYxkfTC8WIjJAK8vaHlt5wr3xycIa9Eu ZIS4tTFT/yg3LLW58cXyEF/sunmov7t7QvtKy4K1mis7kg3wWePxqIOV3q1U5W9HZtxX KhLfWPtNkCXEsw9uTN0B8Xjfi87vexVDCIzFyKhjzSLkxiYULcQfPcC90maFcG8cZDwZ Hf32n8XRgld9+/33+l3Sd9xyb2PA6OnEoIUOS3IypEVo0RrMndsa/0zqRYaKraNd71K0 JwlQ== X-Gm-Message-State: APjAAAXDW1H3tAkQoqUtInqlM9L2fc1RmtxgElZ2shNbNuwtCmiZXRVQ dtMhA6lmFwGlfD2TfqVhc1ZWRQLI2Gwa6Q== X-Google-Smtp-Source: APXvYqzPYBZzgDwE37oiOZ2qkxObgsDuU/35gcarFQr+jZvopv5s50EEEsur8GVNsEYaCPSNRi/SKA== X-Received: by 2002:a81:a642:: with SMTP id d63mr5908536ywh.202.1579658420304; Tue, 21 Jan 2020 18:00:20 -0800 (PST) From: Bobby Eshleman To: xen-devel@lists.xenproject.org Date: Tue, 21 Jan 2020 19:58:40 -0600 Message-Id: <3392cd8cd0c86983a9070536791b61f99be31529.1579615303.git.bobbyeshleman@gmail.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: References: MIME-Version: 1.0 X-Mailman-Approved-At: Wed, 22 Jan 2020 05:14:01 +0000 Subject: [Xen-devel] [RFC XEN PATCH 01/23] HACK: OE Build changes X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Bobby Eshleman , Stefano Stabellini , Julien Grall , Wei Liu , Konrad Rzeszutek Wilk , George Dunlap , Andrew Cooper , Ian Jackson , Bobby Eshleman , Dan Robertson , Alistair Francis Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Alistair Francis Signed-off-by: Alistair Francis --- config/StdGNU.mk | 12 ++++++------ tools/configure | 32 ++++++++++++++++---------------- tools/firmware/Makefile | 12 ++++++------ 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/config/StdGNU.mk b/config/StdGNU.mk index 039274ea61..a5bbde1e02 100644 --- a/config/StdGNU.mk +++ b/config/StdGNU.mk @@ -1,15 +1,15 @@ AS =3D $(CROSS_COMPILE)as -LD =3D $(CROSS_COMPILE)ld +LD ?=3D $(CROSS_COMPILE)ld ifeq ($(clang),y) -CC =3D $(CROSS_COMPILE)clang -CXX =3D $(CROSS_COMPILE)clang++ +CC ?=3D $(CROSS_COMPILE)clang +CXX ?=3D $(CROSS_COMPILE)clang++ LD_LTO =3D $(CROSS_COMPILE)llvm-ld else -CC =3D $(CROSS_COMPILE)gcc -CXX =3D $(CROSS_COMPILE)g++ +CC ?=3D $(CROSS_COMPILE)gcc +CXX ?=3D $(CROSS_COMPILE)g++ LD_LTO =3D $(CROSS_COMPILE)ld endif -CPP =3D $(CC) -E +CPP ?=3D $(CC) -E AR =3D $(CROSS_COMPILE)ar RANLIB =3D $(CROSS_COMPILE)ranlib NM =3D $(CROSS_COMPILE)nm diff --git a/tools/configure b/tools/configure index 977a8837c3..59946c1524 100755 --- a/tools/configure +++ b/tools/configure @@ -9257,12 +9257,12 @@ if test -n "$SYSTEMD_CFLAGS"; then pkg_cv_SYSTEMD_CFLAGS=3D"$SYSTEMD_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --pri= nt-errors \"libsystemd-daemon\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libsystemd-daemon") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --pri= nt-errors \"libsystemd\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libsystemd") 2>&5 ac_status=3D$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? =3D $ac_status" >&5 test $ac_status =3D 0; }; then - pkg_cv_SYSTEMD_CFLAGS=3D`$PKG_CONFIG --cflags "libsystemd-daemon" 2>/dev= /null` + pkg_cv_SYSTEMD_CFLAGS=3D`$PKG_CONFIG --cflags "libsystemd" 2>/dev/null` test "x$?" !=3D "x0" && pkg_failed=3Dyes else pkg_failed=3Dyes @@ -9274,12 +9274,12 @@ if test -n "$SYSTEMD_LIBS"; then pkg_cv_SYSTEMD_LIBS=3D"$SYSTEMD_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --pri= nt-errors \"libsystemd-daemon\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libsystemd-daemon") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --pri= nt-errors \"libsystemd\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libsystemd") 2>&5 ac_status=3D$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? =3D $ac_status" >&5 test $ac_status =3D 0; }; then - pkg_cv_SYSTEMD_LIBS=3D`$PKG_CONFIG --libs "libsystemd-daemon" 2>/dev/nul= l` + pkg_cv_SYSTEMD_LIBS=3D`$PKG_CONFIG --libs "libsystemd" 2>/dev/null` test "x$?" !=3D "x0" && pkg_failed=3Dyes else pkg_failed=3Dyes @@ -9300,9 +9300,9 @@ else _pkg_short_errors_supported=3Dno fi if test $_pkg_short_errors_supported =3D yes; then - SYSTEMD_PKG_ERRORS=3D`$PKG_CONFIG --short-errors --print-errors -= -cflags --libs "libsystemd-daemon" 2>&1` + SYSTEMD_PKG_ERRORS=3D`$PKG_CONFIG --short-errors --print-errors -= -cflags --libs "libsystemd" 2>&1` else - SYSTEMD_PKG_ERRORS=3D`$PKG_CONFIG --print-errors --cflags --libs = "libsystemd-daemon" 2>&1` + SYSTEMD_PKG_ERRORS=3D`$PKG_CONFIG --print-errors --cflags --libs = "libsystemd" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$SYSTEMD_PKG_ERRORS" >&5 @@ -9483,12 +9483,12 @@ if test -n "$SYSTEMD_CFLAGS"; then pkg_cv_SYSTEMD_CFLAGS=3D"$SYSTEMD_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --pri= nt-errors \"libsystemd-daemon\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libsystemd-daemon") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --pri= nt-errors \"libsystemd\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libsystemd") 2>&5 ac_status=3D$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? =3D $ac_status" >&5 test $ac_status =3D 0; }; then - pkg_cv_SYSTEMD_CFLAGS=3D`$PKG_CONFIG --cflags "libsystemd-daemon" 2>/dev= /null` + pkg_cv_SYSTEMD_CFLAGS=3D`$PKG_CONFIG --cflags "libsystemd" 2>/dev/null` test "x$?" !=3D "x0" && pkg_failed=3Dyes else pkg_failed=3Dyes @@ -9500,12 +9500,12 @@ if test -n "$SYSTEMD_LIBS"; then pkg_cv_SYSTEMD_LIBS=3D"$SYSTEMD_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --pri= nt-errors \"libsystemd-daemon\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libsystemd-daemon") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --pri= nt-errors \"libsystemd\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libsystemd") 2>&5 ac_status=3D$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? =3D $ac_status" >&5 test $ac_status =3D 0; }; then - pkg_cv_SYSTEMD_LIBS=3D`$PKG_CONFIG --libs "libsystemd-daemon" 2>/dev/nul= l` + pkg_cv_SYSTEMD_LIBS=3D`$PKG_CONFIG --libs "libsystemd" 2>/dev/null` test "x$?" !=3D "x0" && pkg_failed=3Dyes else pkg_failed=3Dyes @@ -9526,9 +9526,9 @@ else _pkg_short_errors_supported=3Dno fi if test $_pkg_short_errors_supported =3D yes; then - SYSTEMD_PKG_ERRORS=3D`$PKG_CONFIG --short-errors --print-errors -= -cflags --libs "libsystemd-daemon" 2>&1` + SYSTEMD_PKG_ERRORS=3D`$PKG_CONFIG --short-errors --print-errors -= -cflags --libs "libsystemd" 2>&1` else - SYSTEMD_PKG_ERRORS=3D`$PKG_CONFIG --print-errors --cflags --libs = "libsystemd-daemon" 2>&1` + SYSTEMD_PKG_ERRORS=3D`$PKG_CONFIG --print-errors --cflags --libs = "libsystemd" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$SYSTEMD_PKG_ERRORS" >&5 diff --git a/tools/firmware/Makefile b/tools/firmware/Makefile index 809a5fd025..87cbe7e091 100644 --- a/tools/firmware/Makefile +++ b/tools/firmware/Makefile @@ -20,13 +20,13 @@ SEABIOSLD ?=3D $(LD) SEABIOS_EXTRAVERSION ?=3D "-Xen" =20 ovmf-dir: - GIT=3D$(GIT) $(XEN_ROOT)/scripts/git-checkout.sh $(OVMF_UPSTREAM_URL) $(O= VMF_UPSTREAM_REVISION) ovmf-dir + GIT=3D"$(GIT)" $(XEN_ROOT)/scripts/git-checkout.sh $(OVMF_UPSTREAM_URL) $= (OVMF_UPSTREAM_REVISION) ovmf-dir cp ovmf-makefile ovmf-dir/Makefile; =20 seabios-dir: - GIT=3D$(GIT) $(XEN_ROOT)/scripts/git-checkout.sh $(SEABIOS_UPSTREAM_URL) = $(SEABIOS_UPSTREAM_REVISION) seabios-dir + GIT=3D"$(GIT)" $(XEN_ROOT)/scripts/git-checkout.sh $(SEABIOS_UPSTREAM_URL= ) $(SEABIOS_UPSTREAM_REVISION) seabios-dir cp seabios-config seabios-dir/.config; - $(MAKE) -C seabios-dir olddefconfig CC=3D$(SEABIOSCC) LD=3D$(SEABIOSLD) + $(MAKE) -C seabios-dir olddefconfig CC=3D"$(SEABIOSCC)" LD=3D"$(SEABIOSLD= )" rm -f seabios-dir/.version echo '$(SEABIOS_UPSTREAM_REVISION)' > seabios-dir/.version =20 @@ -41,7 +41,7 @@ ifeq ($(CONFIG_ROMBIOS),y) false ; \ fi endif - $(MAKE) CC=3D$(CC) PYTHON=3D$(PYTHON) subdirs-$@ + $(MAKE) CC=3D"$(CC)" PYTHON=3D"$(PYTHON)" subdirs-$@ =20 .PHONY: install install: all @@ -119,7 +119,7 @@ seabios-dir-force-update: seabios-dir =20 subdir-clean-seabios-dir: set -e; if test -d seabios-dir/.; then \ - $(MAKE) -C seabios-dir CC=3D$(SEABIOSCC) LD=3D$(SEABIOSLD) clean; \ + $(MAKE) -C seabios-dir CC=3D"$(SEABIOSCC)" LD=3D"$(SEABIOSLD)" clean; \ fi =20 subtree-force-update: @@ -135,4 +135,4 @@ subtree-force-update-all: $(MAKE) ovmf-dir-force-update =20 subdir-all-seabios-dir: seabios-dir - $(MAKE) -C $< CC=3D$(SEABIOSCC) LD=3D$(SEABIOSLD) PYTHON=3D$(PYTHON) EXTR= AVERSION=3D$(SEABIOS_EXTRAVERSION) all; + $(MAKE) -C $< CC=3D"$(SEABIOSCC)" LD=3D"$(SEABIOSLD)" PYTHON=3D"$(PYTHON)= " EXTRAVERSION=3D"$(SEABIOS_EXTRAVERSION)" all; --=20 2.25.0 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel