From patchwork Mon Sep 14 09:24:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 11773387 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 1ECAE618 for ; Mon, 14 Sep 2020 09:25:57 +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 DA70E204FD for ; Mon, 14 Sep 2020 09:25:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=citrix.com header.i=@citrix.com header.b="HANrBVzW" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DA70E204FD Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=citrix.com Authentication-Results: mail.kernel.org; spf=pass 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.92) (envelope-from ) id 1kHkjM-00070V-Hx; Mon, 14 Sep 2020 09:25:00 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kHkjM-00070O-0n for xen-devel@lists.xenproject.org; Mon, 14 Sep 2020 09:25:00 +0000 X-Inumbo-ID: a046c954-db43-44f2-b19e-2f76cc1068eb Received: from esa6.hc3370-68.iphmx.com (unknown [216.71.155.175]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id a046c954-db43-44f2-b19e-2f76cc1068eb; Mon, 14 Sep 2020 09:24:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1600075489; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=wamgop3LxIhBnrdiDDz4m99Y366IRcEkMxrXUbowTR4=; b=HANrBVzWzvPp4PLiQVbnQFkiUEZb90vm/uCwlVoF/0O4LPsksKn6uxcT 1nHv6Ch171QAit4z/7u2xuAHc9P4mNNg9/5ckeuYJf++V7smcQ74GwLCY KBN6XWpfG2+zxgPBXDLZ44OQeipO7wjlJFK1Pk94HHoAdZaCZbi1XenYP E=; Authentication-Results: esa6.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: mRG/iXQlX3apjjUT3C0FvTWC532oOHIGLdmQq3v89r2fcN57LTxOu6cTygsmha4UmyN3MomdHr mSrOsuOC4abMnW3iAS7mRrWc4r00wKeqF+hH9sxfzij7RjWcPm7Ozo7ZyQk81blXqrmuvpcbGN a+s6w01T3UPcmPbKSCg3NEAujmx8bZzJhkTCdYyAGF3F7oc53Ek7ru67OC9ffXUKwf8fnzDM4N ymrT1R9kEP96VWOzM9p8wWiKbrHs2Xek3ulu7XzB2+8pjzZDRtQN7xhTg1PnEyMYQvD79QdPnj ZjE= X-SBRS: 2.7 X-MesageID: 26906972 X-Ironport-Server: esa6.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.76,425,1592884800"; d="scan'208";a="26906972" From: Andrew Cooper To: Xen-devel CC: Andrew Cooper , Juergen Gross , Ian Jackson , Wei Liu Subject: [PATCH 1/2] tools/libs/vchan: Don't run the headers check Date: Mon, 14 Sep 2020 10:24:19 +0100 Message-ID: <20200914092420.20900-2-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20200914092420.20900-1-andrew.cooper3@citrix.com> References: <20200914092420.20900-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" There was never a headers check previously, and CentOS 6 can't cope with the anonymous union in struct libxenvchan. cc1: warnings being treated as errors ... tools/include/libxenvchan.h:75: error: declaration does not declare anything make[6]: *** [headers.chk] Error 1 Fixes: 8ab2429f12 ("tools: split libxenvchan into new tools/libs/vchan directory") Signed-off-by: Andrew Cooper Acked-by: Wei Liu --- CC: Juergen Gross CC: Ian Jackson CC: Wei Liu --- tools/libs/vchan/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/libs/vchan/Makefile b/tools/libs/vchan/Makefile index 87ff608f45..5e18d5b196 100644 --- a/tools/libs/vchan/Makefile +++ b/tools/libs/vchan/Makefile @@ -8,6 +8,8 @@ LIBHEADER := libxenvchan.h SRCS-y += init.c SRCS-y += io.c +NO_HEADERS_CHK := y + include $(XEN_ROOT)/tools/libs/libs.mk $(PKG_CONFIG_LOCAL): PKG_CONFIG_INCDIR = $(XEN_libxenvchan)/include From patchwork Mon Sep 14 09:24:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 11773389 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 853DB618 for ; Mon, 14 Sep 2020 09:25:58 +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 4B231204FD for ; Mon, 14 Sep 2020 09:25:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=citrix.com header.i=@citrix.com header.b="X9iwPYjf" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4B231204FD Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=citrix.com Authentication-Results: mail.kernel.org; spf=pass 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.92) (envelope-from ) id 1kHkjH-0006za-9K; Mon, 14 Sep 2020 09:24:55 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kHkjG-0006zG-FF for xen-devel@lists.xenproject.org; Mon, 14 Sep 2020 09:24:54 +0000 X-Inumbo-ID: 22664564-07aa-45e6-bf13-546f610c7823 Received: from esa3.hc3370-68.iphmx.com (unknown [216.71.145.155]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 22664564-07aa-45e6-bf13-546f610c7823; Mon, 14 Sep 2020 09:24:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1600075479; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=xvFoKyqtIsUHfw6wHWA+qUio8zOrim09FJUlarkXOrU=; b=X9iwPYjfXc9g7QhDJbd2kVNFyX8cDUg5RWyNVD7eybyT5BkN/R6SAo+K +bGxNnJYL0P0YtXAQC270RpLUTzeL3GSri0lXeP8+APAdanlqSmO/msJV Qw4+4LKU792WwYluexJYtwyfpxhLNSb0nwp+Qv7+gO9OK91Mn2lb4quBh A=; Authentication-Results: esa3.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: vE1XTDUAdG6L9Q7iPLjGqI9XrlGFypNbakarcgwR4J64q2OKygrXOak7GmOCzIGKvOESIaHrba Dg1oJN77jK6X4TQQG6J2pySYHDiWggogFmPe3TKY4WZzrsdA1qDGs4HiXMECuBPTmXCxZL13zY 2Jo+uLgcrZejMHxSgwyaQKh3ND7bssTnm2c33Lyk+ZOWwKSrJ3Sfkwun0ofvhnaBKEsvcunF3P MTeZru0kEmzRYXIko2SPEqMZAQipIiRetHbFoW8YqyJGlWEQUDyNVVO3UUwm5kjH1yEfO9pe1f hsE= X-SBRS: 2.7 X-MesageID: 26592536 X-Ironport-Server: esa3.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.76,425,1592884800"; d="scan'208";a="26592536" From: Andrew Cooper To: Xen-devel CC: Andrew Cooper , Juergen Gross , Ian Jackson , Wei Liu Subject: [PATCH 2/2] tools/Makefile: Drop the use of $(file ...) Date: Mon, 14 Sep 2020 10:24:20 +0100 Message-ID: <20200914092420.20900-3-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20200914092420.20900-1-andrew.cooper3@citrix.com> References: <20200914092420.20900-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" It is only available in make 4.0 and later, and not for example in CentOS 7. Rewrite the logic to use echo and shell redirection, using a single capture group to avoid having 12 different processes in quick succession each appending one line to the file. Fixes: 52dbd6f07cea7a ("tools: generate pkg-config files from make variables") Signed-off-by: Andrew Cooper Acked-by: Wei Liu --- CC: Juergen Gross CC: Ian Jackson CC: Wei Liu --- tools/Rules.mk | 52 ++++++++++++++++++++++++++++------------------------ 1 file changed, 28 insertions(+), 24 deletions(-) diff --git a/tools/Rules.mk b/tools/Rules.mk index 4fd91fa444..a71abb2e4f 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -186,29 +186,33 @@ $(PKG_CONFIG_DIR): mkdir -p $(PKG_CONFIG_DIR) $(PKG_CONFIG_DIR)/%.pc: Makefile $(XEN_ROOT)/tools/Rules.mk $(PKG_CONFIG_DIR) - $(file >$@,prefix=$(PKG_CONFIG_PREFIX)) - $(file >>$@,includedir=$(PKG_CONFIG_INCDIR)) - $(file >>$@,libdir=$(PKG_CONFIG_LIBDIR)) - $(foreach var,$(PKG_CONFIG_VARS),$(file >>$@,$(var))) - $(file >>$@,) - $(file >>$@,Name: $(PKG_CONFIG_NAME)) - $(file >>$@,Description: $(PKG_CONFIG_DESC)) - $(file >>$@,Version: $(PKG_CONFIG_VERSION)) - $(file >>$@,Cflags: -I$${includedir} $(CFLAGS_xeninclude)) - $(file >>$@,Libs: -L$${libdir} $(PKG_CONFIG_USELIBS) -l$(PKG_CONFIG_LIB)) - $(file >>$@,Libs.private: $(PKG_CONFIG_LIBSPRIV)) - $(file >>$@,Requires.private: $(PKG_CONFIG_REQPRIV)) + { \ + echo "prefix=$(PKG_CONFIG_PREFIX)"; \ + echo "includedir=$(PKG_CONFIG_INCDIR)"; \ + echo "libdir=$(PKG_CONFIG_LIBDIR)"; \ + $(foreach var,$(PKG_CONFIG_VARS),echo $(var);) \ + echo ""; \ + echo "Name: $(PKG_CONFIG_NAME)"; \ + echo "Description: $(PKG_CONFIG_DESC)"; \ + echo "Version: $(PKG_CONFIG_VERSION)"; \ + echo "Cflags: -I\$${includedir} $(CFLAGS_xeninclude)"; \ + echo "Libs: -L\$${libdir} $(PKG_CONFIG_USELIBS) -l$(PKG_CONFIG_LIB)"; \ + echo "Libs.private: $(PKG_CONFIG_LIBSPRIV)"; \ + echo "Requires.private: $(PKG_CONFIG_REQPRIV)"; \ + } > $@ %.pc: Makefile $(XEN_ROOT)/tools/Rules.mk - $(file >$@,prefix=$(PKG_CONFIG_PREFIX)) - $(file >>$@,includedir=$(PKG_CONFIG_INCDIR)) - $(file >>$@,libdir=$(PKG_CONFIG_LIBDIR)) - $(foreach var,$(PKG_CONFIG_VARS),$(file >>$@,$(var))) - $(file >>$@,) - $(file >>$@,Name: $(PKG_CONFIG_NAME)) - $(file >>$@,Description: $(PKG_CONFIG_DESC)) - $(file >>$@,Version: $(PKG_CONFIG_VERSION)) - $(file >>$@,Cflags: -I$${includedir}) - $(file >>$@,Libs: -L$${libdir} -l$(PKG_CONFIG_LIB)) - $(file >>$@,Libs.private: $(PKG_CONFIG_LIBSPRIV)) - $(file >>$@,Requires.private: $(PKG_CONFIG_REQPRIV)) + { \ + echo "prefix=$(PKG_CONFIG_PREFIX)"; \ + echo "includedir=$(PKG_CONFIG_INCDIR)"; \ + echo "libdir=$(PKG_CONFIG_LIBDIR)"; \ + $(foreach var,$(PKG_CONFIG_VARS),echo $(var);) \ + echo ""; \ + echo "Name: $(PKG_CONFIG_NAME)"; \ + echo "Description: $(PKG_CONFIG_DESC)"; \ + echo "Version: $(PKG_CONFIG_VERSION)"; \ + echo "Cflags: -I\$${includedir}"; \ + echo "Libs: -L\$${libdir} -l$(PKG_CONFIG_LIB)"; \ + echo "Libs.private: $(PKG_CONFIG_LIBSPRIV)"; \ + echo "Requires.private: $(PKG_CONFIG_REQPRIV)"; \ + } > $@