From patchwork Wed Jan 22 01:58:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bobby Eshleman X-Patchwork-Id: 11344985 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id F2722159A for ; Wed, 22 Jan 2020 05:14:55 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C402824656 for ; Wed, 22 Jan 2020 05:14:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="KZ7qJ61h" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C402824656 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org 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 X-Inumbo-ID: f206561e-3cba-11ea-9fd7-bc764e2007e4 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) 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) 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) 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 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" 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 = $(CROSS_COMPILE)as -LD = $(CROSS_COMPILE)ld +LD ?= $(CROSS_COMPILE)ld ifeq ($(clang),y) -CC = $(CROSS_COMPILE)clang -CXX = $(CROSS_COMPILE)clang++ +CC ?= $(CROSS_COMPILE)clang +CXX ?= $(CROSS_COMPILE)clang++ LD_LTO = $(CROSS_COMPILE)llvm-ld else -CC = $(CROSS_COMPILE)gcc -CXX = $(CROSS_COMPILE)g++ +CC ?= $(CROSS_COMPILE)gcc +CXX ?= $(CROSS_COMPILE)g++ LD_LTO = $(CROSS_COMPILE)ld endif -CPP = $(CC) -E +CPP ?= $(CC) -E AR = $(CROSS_COMPILE)ar RANLIB = $(CROSS_COMPILE)ranlib NM = $(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="$SYSTEMD_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-daemon\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libsystemd-daemon") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libsystemd") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_SYSTEMD_CFLAGS=`$PKG_CONFIG --cflags "libsystemd-daemon" 2>/dev/null` + pkg_cv_SYSTEMD_CFLAGS=`$PKG_CONFIG --cflags "libsystemd" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -9274,12 +9274,12 @@ if test -n "$SYSTEMD_LIBS"; then pkg_cv_SYSTEMD_LIBS="$SYSTEMD_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-daemon\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libsystemd-daemon") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libsystemd") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_SYSTEMD_LIBS=`$PKG_CONFIG --libs "libsystemd-daemon" 2>/dev/null` + pkg_cv_SYSTEMD_LIBS=`$PKG_CONFIG --libs "libsystemd" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -9300,9 +9300,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd-daemon" 2>&1` + SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd" 2>&1` else - SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd-daemon" 2>&1` + SYSTEMD_PKG_ERRORS=`$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="$SYSTEMD_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-daemon\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libsystemd-daemon") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libsystemd") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_SYSTEMD_CFLAGS=`$PKG_CONFIG --cflags "libsystemd-daemon" 2>/dev/null` + pkg_cv_SYSTEMD_CFLAGS=`$PKG_CONFIG --cflags "libsystemd" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -9500,12 +9500,12 @@ if test -n "$SYSTEMD_LIBS"; then pkg_cv_SYSTEMD_LIBS="$SYSTEMD_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-daemon\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libsystemd-daemon") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libsystemd") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_SYSTEMD_LIBS=`$PKG_CONFIG --libs "libsystemd-daemon" 2>/dev/null` + pkg_cv_SYSTEMD_LIBS=`$PKG_CONFIG --libs "libsystemd" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -9526,9 +9526,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd-daemon" 2>&1` + SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd" 2>&1` else - SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd-daemon" 2>&1` + SYSTEMD_PKG_ERRORS=`$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 ?= $(LD) SEABIOS_EXTRAVERSION ?= "-Xen" ovmf-dir: - GIT=$(GIT) $(XEN_ROOT)/scripts/git-checkout.sh $(OVMF_UPSTREAM_URL) $(OVMF_UPSTREAM_REVISION) ovmf-dir + GIT="$(GIT)" $(XEN_ROOT)/scripts/git-checkout.sh $(OVMF_UPSTREAM_URL) $(OVMF_UPSTREAM_REVISION) ovmf-dir cp ovmf-makefile ovmf-dir/Makefile; seabios-dir: - GIT=$(GIT) $(XEN_ROOT)/scripts/git-checkout.sh $(SEABIOS_UPSTREAM_URL) $(SEABIOS_UPSTREAM_REVISION) seabios-dir + GIT="$(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=$(SEABIOSCC) LD=$(SEABIOSLD) + $(MAKE) -C seabios-dir olddefconfig CC="$(SEABIOSCC)" LD="$(SEABIOSLD)" rm -f seabios-dir/.version echo '$(SEABIOS_UPSTREAM_REVISION)' > seabios-dir/.version @@ -41,7 +41,7 @@ ifeq ($(CONFIG_ROMBIOS),y) false ; \ fi endif - $(MAKE) CC=$(CC) PYTHON=$(PYTHON) subdirs-$@ + $(MAKE) CC="$(CC)" PYTHON="$(PYTHON)" subdirs-$@ .PHONY: install install: all @@ -119,7 +119,7 @@ seabios-dir-force-update: seabios-dir subdir-clean-seabios-dir: set -e; if test -d seabios-dir/.; then \ - $(MAKE) -C seabios-dir CC=$(SEABIOSCC) LD=$(SEABIOSLD) clean; \ + $(MAKE) -C seabios-dir CC="$(SEABIOSCC)" LD="$(SEABIOSLD)" clean; \ fi subtree-force-update: @@ -135,4 +135,4 @@ subtree-force-update-all: $(MAKE) ovmf-dir-force-update subdir-all-seabios-dir: seabios-dir - $(MAKE) -C $< CC=$(SEABIOSCC) LD=$(SEABIOSLD) PYTHON=$(PYTHON) EXTRAVERSION=$(SEABIOS_EXTRAVERSION) all; + $(MAKE) -C $< CC="$(SEABIOSCC)" LD="$(SEABIOSLD)" PYTHON="$(PYTHON)" EXTRAVERSION="$(SEABIOS_EXTRAVERSION)" all;