From patchwork Mon Oct 19 07:21:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 11843679 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 362FA61C for ; Mon, 19 Oct 2020 07:22: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 F1A3A22276 for ; Mon, 19 Oct 2020 07:22:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b="euWyR9e0" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F1A3A22276 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=suse.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.8599.23036 (Exim 4.92) (envelope-from ) id 1kUPTn-0005Uy-5n; Mon, 19 Oct 2020 07:21:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 8599.23036; Mon, 19 Oct 2020 07:21:15 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kUPTn-0005Ur-2g; Mon, 19 Oct 2020 07:21:15 +0000 Received: by outflank-mailman (input) for mailman id 8599; Mon, 19 Oct 2020 07:21:13 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kUPTl-0005Um-95 for xen-devel@lists.xenproject.org; Mon, 19 Oct 2020 07:21:13 +0000 Received: from mx2.suse.de (unknown [195.135.220.15]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id e4da4b60-e98a-4069-ae32-3e024146e9c9; Mon, 19 Oct 2020 07:21:09 +0000 (UTC) Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 6FF97AC2F; Mon, 19 Oct 2020 07:21:08 +0000 (UTC) Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kUPTl-0005Um-95 for xen-devel@lists.xenproject.org; Mon, 19 Oct 2020 07:21:13 +0000 X-Inumbo-ID: e4da4b60-e98a-4069-ae32-3e024146e9c9 Received: from mx2.suse.de (unknown [195.135.220.15]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id e4da4b60-e98a-4069-ae32-3e024146e9c9; Mon, 19 Oct 2020 07:21:09 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1603092068; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=teGLCrcUKZL1AHCBSXxSaZpkvLlDxc0tV0m8ZZiUxoA=; b=euWyR9e0hN7uo1YDG9zpjzrssDrV7zHfebwHXQYbo/+weTHYYclaWlqvVJPsBnGO6jAHdd GsNl2OBB8/kl1qhTH7uT330sic+iV/VUw9IbXoql2TNAcSe6lM0QsktDmhB7qq/rK/Mr7n eqm1IxE3Pw92Q6OJzi3MW7HQMsF5P84= Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 6FF97AC2F; Mon, 19 Oct 2020 07:21:08 +0000 (UTC) Subject: [PATCH 1/2] tools/libs: fix header symlinking rule From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Ian Jackson , Wei Liu References: <2c9a0407-1bd1-6898-d1e3-9be4c869684b@suse.com> Message-ID: Date: Mon, 19 Oct 2020 09:21:08 +0200 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.12.1 MIME-Version: 1.0 In-Reply-To: <2c9a0407-1bd1-6898-d1e3-9be4c869684b@suse.com> Content-Language: en-US Unlike pattern rules, ordinary rules with multiple targets have their commands executed once per target. Hence when $(LIBHEADERS) expands to more than just one item, multiple identical commands would have been issued, which have been observed to cause build failures relatively frequently after libx{c,l} code was moved to tools/libs/{ctrl,light}/. Use a static pattern rule instead. Signed-off-by: Jan Beulich --- I'm aware Jürgen has a series pending to entirely remove the rule in question, but this being an isolated fix which ought to be easier to review, I thought I'd still post it. Re-basing his series over this change should be straightforward. However, for the above reason I'm not bothering getting right the theoretical case of headers in subdirs of the respective include/ being mentioned in $(LIBHEADER). --- a/tools/libs/libs.mk +++ b/tools/libs/libs.mk @@ -79,8 +79,8 @@ headers.chk: $(LIBHEADERSGLOB) $(AUTOINC libxen$(LIBNAME).map: echo 'VERS_$(MAJOR).$(MINOR) { global: *; };' >$@ -$(LIBHEADERSGLOB): $(LIBHEADERS) - for i in $(realpath $(LIBHEADERS)); do ln -sf $$i $(XEN_ROOT)/tools/include; done +$(LIBHEADERSGLOB): $(XEN_ROOT)/tools/include/%.h: include/%.h + ln -sf $(CURDIR)/$< $(XEN_ROOT)/tools/include/ lib$(LIB_FILE_NAME).a: $(LIB_OBJS) $(AR) rc $@ $^ From patchwork Mon Oct 19 07:21:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 11843681 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 6553714B4 for ; Mon, 19 Oct 2020 07:23:23 +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 270ED22276 for ; Mon, 19 Oct 2020 07:23:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b="nwKqcS7k" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 270ED22276 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=suse.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.8601.23048 (Exim 4.92) (envelope-from ) id 1kUPUE-0005bP-Es; Mon, 19 Oct 2020 07:21:42 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 8601.23048; Mon, 19 Oct 2020 07:21:42 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kUPUE-0005bI-BF; Mon, 19 Oct 2020 07:21:42 +0000 Received: by outflank-mailman (input) for mailman id 8601; Mon, 19 Oct 2020 07:21:40 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kUPUC-0005b8-Mc for xen-devel@lists.xenproject.org; Mon, 19 Oct 2020 07:21:40 +0000 Received: from mx2.suse.de (unknown [195.135.220.15]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id d53d7282-ed35-47c9-9f7f-68a60b4a4cf4; Mon, 19 Oct 2020 07:21:39 +0000 (UTC) Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id A3956AB0E; Mon, 19 Oct 2020 07:21:38 +0000 (UTC) Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kUPUC-0005b8-Mc for xen-devel@lists.xenproject.org; Mon, 19 Oct 2020 07:21:40 +0000 X-Inumbo-ID: d53d7282-ed35-47c9-9f7f-68a60b4a4cf4 Received: from mx2.suse.de (unknown [195.135.220.15]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id d53d7282-ed35-47c9-9f7f-68a60b4a4cf4; Mon, 19 Oct 2020 07:21:39 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1603092098; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QX2MHQbpg3wjWq1A1IoLHU+ocuPAEaIOhlM4GNE6C+o=; b=nwKqcS7kPpBWrpUpyuCJRoOpTcJV4fStXdAlG/L0Itto5ZgeKpA3nMTpinwb0tfCwiWZTT 8AasZKgHHN+d5OjmabWLIHtbWx+0mTC193mBun4lhksol/AqiOy7cm/ihfdcfxTOxMBT2Y DcXJu06Gdr31Kpw6VJoEgHo9EqSX+7w= Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id A3956AB0E; Mon, 19 Oct 2020 07:21:38 +0000 (UTC) Subject: [PATCH 2/2] tools/libs: fix uninstall rule for header files From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Ian Jackson , Wei Liu References: <2c9a0407-1bd1-6898-d1e3-9be4c869684b@suse.com> Message-ID: <74c629db-0f63-aba0-f294-9668c29b8f70@suse.com> Date: Mon, 19 Oct 2020 09:21:38 +0200 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.12.1 MIME-Version: 1.0 In-Reply-To: <2c9a0407-1bd1-6898-d1e3-9be4c869684b@suse.com> Content-Language: en-US This again was working right only as long as $(LIBHEADER) consisted of just one entry. Signed-off-by: Jan Beulich Reviewed-by: Bertrand Marquis --- An alternative would be to use $(addprefix ) without any shell loop. --- a/tools/libs/libs.mk +++ b/tools/libs/libs.mk @@ -107,7 +107,7 @@ install: build .PHONY: uninstall uninstall: rm -f $(DESTDIR)$(PKG_INSTALLDIR)/$(LIB_FILE_NAME).pc - for i in $(LIBHEADER); do rm -f $(DESTDIR)$(includedir)/$(LIBHEADER); done + for i in $(LIBHEADER); do rm -f $(DESTDIR)$(includedir)/$$i; done rm -f $(DESTDIR)$(libdir)/lib$(LIB_FILE_NAME).so rm -f $(DESTDIR)$(libdir)/lib$(LIB_FILE_NAME).so.$(MAJOR) rm -f $(DESTDIR)$(libdir)/lib$(LIB_FILE_NAME).so.$(MAJOR).$(MINOR)