From nobody Sun Nov 24 15:15:34 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=reject dis=none) header.from=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1724410345; cv=none; d=zohomail.com; s=zohoarc; b=e0yLI+CjodVoS2+1738bfdO/qE5cWWyTk3r+hJpc0+titBm1bpToNwTQHaBRRjWKEEFu8qA7omet6TWeeCbHf5shrriuRQ+jU+R9s15Ws63VWd60Vt3MHuMQ8MUhDiAv2XlzKp/H77s/GSRewjfJGSG7bSwtShL+QoYha7bk7sU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1724410345; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Nu11yvtztHSjwdPJuoKFnudbRkELxQKDuzUDZ3yJLxc=; b=iVnxHvsnlI9EPjLF5DbMtTZJu3JGnOr6BefPK2H+0uFQhyQwoB9bC4NZavldYjpObNSRHWNOH7Sfkqw+F3Tr4NhS5yuXbiDoLQxQteX7iCtorOfUZMWNgpzFg9tc7KLsWM11aSAhZ79ktej6IP9Xy5mrqWWsMn/8xdSPZC3ZRzE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1724410345580668.58321542647; Fri, 23 Aug 2024 03:52:25 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.782251.1191731 (Exim 4.92) (envelope-from ) id 1shRtm-0004Fk-HW; Fri, 23 Aug 2024 10:52:06 +0000 Received: by outflank-mailman (output) from mailman id 782251.1191731; Fri, 23 Aug 2024 10:52:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1shRtm-0004FR-Bn; Fri, 23 Aug 2024 10:52:06 +0000 Received: by outflank-mailman (input) for mailman id 782251; Fri, 23 Aug 2024 10:52:05 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1shRtl-0004CD-9b for xen-devel@lists.xenproject.org; Fri, 23 Aug 2024 10:52:05 +0000 Received: from mail-ej1-x636.google.com (mail-ej1-x636.google.com [2a00:1450:4864:20::636]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id bb8864cb-613d-11ef-a50a-bb4a2ccca743; Fri, 23 Aug 2024 12:52:04 +0200 (CEST) Received: by mail-ej1-x636.google.com with SMTP id a640c23a62f3a-a86933829dcso212815966b.3 for ; Fri, 23 Aug 2024 03:52:04 -0700 (PDT) Received: from andrewcoop.eng.citrite.net ([185.25.67.249]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a868f47d1c3sm239923866b.169.2024.08.23.03.52.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Aug 2024 03:52:01 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version 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" X-Inumbo-ID: bb8864cb-613d-11ef-a50a-bb4a2ccca743 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1724410322; x=1725015122; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Nu11yvtztHSjwdPJuoKFnudbRkELxQKDuzUDZ3yJLxc=; b=IDp46kymVn6k3qkXOx+cpoo4wM1b8u2uNIDW18AxC4OFQ5qCBEX2g8ZwgUJgOUSO6i RUBIN8KLlLk0hqgliCdCkVnM2E5C/YlC5FO/kpyDhB6DXuV5LARD6EJCzb520lddC7C1 0Fhcy6+gOyb1kIG/Xa7lIGNyheHAT2BeAvoX4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724410322; x=1725015122; 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:message-id:reply-to; bh=Nu11yvtztHSjwdPJuoKFnudbRkELxQKDuzUDZ3yJLxc=; b=vWcDfVb5WdNR526al8Jhph02vBNsrCewA++tUhcP4gAEqOLdhcRN4qHjMAslDoA0AP ZpcOjfzCW66IGsgGmxcRYih3L0SXr69bHJaEBPaTR9xgIR/s8KSwfaTsJBJx6R3+k9y8 aJH4YL4HTKD9zI3hMtwww9dyL2dky1EkljIADcg50ioR22vqx46UzM3yU1BkUoRzdP86 2yRQUo+RuP84CdZu5TijfvXKR/ouP2Ntx34XTr+DdMM0GEra++UkB2eP/0pjvWpYVhCU TqY83qcJoUYNckxibZHFwTPYJqpHvPxefUbg/H4ppV2SA4sFSqmlPHIFj80W1M9JPrZ1 s6Eg== X-Gm-Message-State: AOJu0Yw70tq1UmNDTnDpwTX7842m/0CJUuw1RtYk9XB+yADWUFH2HAYd JPIJNTUg0lqMhLBSxuIWJuqWdBVte0hpPwS7shWry8Lg9FETcJG1O15qN3ndlfvOCpYYXDt1R3u r X-Google-Smtp-Source: AGHT+IGQ+JoB81mPv9dDN2BOVPwh58EKGChp4BOMiReGZ27ERwvaB7ZAh/R8vb7/dSvTncYXTEOvRQ== X-Received: by 2002:a17:907:1c1f:b0:a86:941f:49ac with SMTP id a640c23a62f3a-a86a54dfaedmr124981666b.67.1724410321964; Fri, 23 Aug 2024 03:52:01 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Christian Lindig , David Scott , =?UTF-8?q?Edwin=20T=C3=B6r=C3=B6k?= , Rob Hoes , Andrii Sultanov , Anthony PERARD Subject: [PATCH 1/3] tools/ocaml: Drop OCAMLOPTFLAG_G invocation Date: Fri, 23 Aug 2024 11:51:55 +0100 Message-Id: <20240823105157.991275-2-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240823105157.991275-1-andrew.cooper3@citrix.com> References: <20240823105157.991275-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1724410346508116600 These days, `ocamlopt -h` asks you whether you meant --help instead, meaning that the $(shell ) invocation here isn't going end up containing '-g'. Make it unconditional, like it is in OCAMLCFLAGS already. Signed-off-by: Andrew Cooper Acked-by: Christian Lindig Reviewed-by: Edwin T=C3=B6r=C3=B6k --- CC: Christian Lindig CC: David Scott CC: Edwin T=C3=B6r=C3=B6k CC: Rob Hoes CC: Andrii Sultanov CC: Anthony PERARD --- tools/ocaml/common.make | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/ocaml/common.make b/tools/ocaml/common.make index cc126b749f56..708d74617c8d 100644 --- a/tools/ocaml/common.make +++ b/tools/ocaml/common.make @@ -11,8 +11,7 @@ OCAMLFIND ?=3D ocamlfind =20 CFLAGS +=3D -fPIC -I$(shell ocamlc -where) =20 -OCAMLOPTFLAG_G :=3D $(shell $(OCAMLOPT) -h 2>&1 | sed -n 's/^ *\(-g\) .*/= \1/p') -OCAMLOPTFLAGS =3D $(OCAMLOPTFLAG_G) -ccopt "$(LDFLAGS)" -dtypes $(OCAMLINC= LUDE) -w F -warn-error F +OCAMLOPTFLAGS =3D -g -ccopt "$(LDFLAGS)" -dtypes $(OCAMLINCLUDE) -w F -war= n-error F OCAMLCFLAGS +=3D -g $(OCAMLINCLUDE) -w F -warn-error F =20 VERSION :=3D 4.1 --=20 2.39.2 From nobody Sun Nov 24 15:15:34 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=reject dis=none) header.from=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1724410347; cv=none; d=zohomail.com; s=zohoarc; b=S9vyRUSlp5Dr9KPMDnV4Z1K9zBdi29qpSBYDgu4nszEpjeIfvCjfe53jG8EIP8aofnc+dOL43A5/kwlQQGoMJ+pdduJQNraKwYp2RSk9LjEgxKScfdcyz5ZTIxUO6vKKWXE/wQvpg8WT75KS2SAO6J17onbnLUjHLnhwrJKQvZ4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1724410347; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Rkmqzo+FkSOQbrEOiUy8aC0COpKqGUWCpQCBif5I/0E=; b=GFww6dgwozUdAmmfi51w/ne0Ceo0Axf1a3wqWSx7t5IZC74IXfawOOqHvMlBwizYyeo1mdtvrd0uH9o2//Ow4SNA/CFxLp63209mS8XSRO7rMrrLCxClVAVjvtYgsYuN68F0Qo+M9iEdyKr9ANZurmfOix6js1qPtSNfkKUWWMo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1724410347158870.9214438101133; Fri, 23 Aug 2024 03:52:27 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.782252.1191744 (Exim 4.92) (envelope-from ) id 1shRtn-0004ff-NX; Fri, 23 Aug 2024 10:52:07 +0000 Received: by outflank-mailman (output) from mailman id 782252.1191744; Fri, 23 Aug 2024 10:52:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1shRtn-0004fY-KY; Fri, 23 Aug 2024 10:52:07 +0000 Received: by outflank-mailman (input) for mailman id 782252; Fri, 23 Aug 2024 10:52:06 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1shRtl-0004CD-V1 for xen-devel@lists.xenproject.org; Fri, 23 Aug 2024 10:52:05 +0000 Received: from mail-ej1-x629.google.com (mail-ej1-x629.google.com [2a00:1450:4864:20::629]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id bbd76ab1-613d-11ef-a50a-bb4a2ccca743; Fri, 23 Aug 2024 12:52:04 +0200 (CEST) Received: by mail-ej1-x629.google.com with SMTP id a640c23a62f3a-a8677ae5a35so220457066b.0 for ; Fri, 23 Aug 2024 03:52:04 -0700 (PDT) Received: from andrewcoop.eng.citrite.net ([185.25.67.249]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a868f47d1c3sm239923866b.169.2024.08.23.03.52.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Aug 2024 03:52:02 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version 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" X-Inumbo-ID: bbd76ab1-613d-11ef-a50a-bb4a2ccca743 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1724410323; x=1725015123; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Rkmqzo+FkSOQbrEOiUy8aC0COpKqGUWCpQCBif5I/0E=; b=UfFlb9peOR83wCMpgSL8IM6EIgZoGrT8fn+6OtQkdcI1mkm/bRmLK5zj/WuYKO8Xbb wBINtuuSn8V13RfkqeZNsKSeCGa0H8+qO+UVYKPRYeKLGwa6hTdhRYkTUbdrX8g2EtcY Eh48w89Bh2r9BQx7XP08fwb8W34XVqJcDUNbs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724410323; x=1725015123; 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:message-id:reply-to; bh=Rkmqzo+FkSOQbrEOiUy8aC0COpKqGUWCpQCBif5I/0E=; b=fUcilPa6n5AFW4pc/BhKZ8CALBbmQvXOK4m4b3F24pLNV+2q5HrTkeQznlglTgnfD5 BbC6FOX7FIrbtb8+jMDc5nUfXlL/qSfPXR9spT1uViSmh3NeupmmwlxgUV+KefPqDjKG avsNjfBzyYAa9loEAZQiDo9nBJXwmpgfOSOWsmlpom30tYXUQuELO8mOp1LIy60ribs6 8Lhkd7xyPG5BlpI/A8PAn0EnuFirnxT4FcnonaZzmmxVM4kk1QTyzQamFSxxURJ4wpR+ pLpYrd/GIW/lyd3iJKcE1BjX1O/hDYJ9eoL9CCl/x4SoGcl8cfMZRMa6IL9bHpA90Y2R q8Kg== X-Gm-Message-State: AOJu0YwRKcBxdp9520NhcMxaf9CQl2OPK5yt8SMFc6YTePHx+mbRQsQ2 2w1oXen8IOmDXzebUjcJH0kBqa1hOJub0kayxU+G/KTbXv/gwuiQwRLwMTzkgV70FhsywepD6RX 2 X-Google-Smtp-Source: AGHT+IGlQ1yte3xGjuGnwK9O4z3ou2vvpqXd81DCNTbUTe8SM3S0T2YqVc+EgRMHpNXdEbOnbmkjYw== X-Received: by 2002:a17:906:d264:b0:a86:a1cd:5a8c with SMTP id a640c23a62f3a-a86a52bb759mr120712666b.22.1724410323102; Fri, 23 Aug 2024 03:52:03 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Christian Lindig , David Scott , =?UTF-8?q?Edwin=20T=C3=B6r=C3=B6k?= , Rob Hoes , Andrii Sultanov , Anthony PERARD Subject: [PATCH 2/3] tools/ocaml: Drop o= rune Date: Fri, 23 Aug 2024 11:51:56 +0100 Message-Id: <20240823105157.991275-3-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240823105157.991275-1-andrew.cooper3@citrix.com> References: <20240823105157.991275-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1724410348294116600 This hides a shell redirection which is quite rude. It also opencodes $(move-if-changed) without the benefit of short-circuiting dependent logic when the content hasn't changed. Signed-off-by: Andrew Cooper Acked-by: Christian Lindig Reviewed-by: Edwin T=C3=B6r=C3=B6k --- CC: Christian Lindig CC: David Scott CC: Edwin T=C3=B6r=C3=B6k CC: Rob Hoes CC: Andrii Sultanov CC: Anthony PERARD --- tools/ocaml/Makefile.rules | 5 +++-- tools/ocaml/common.make | 2 -- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/tools/ocaml/Makefile.rules b/tools/ocaml/Makefile.rules index 5638193edf8a..5d534d8754bf 100644 --- a/tools/ocaml/Makefile.rules +++ b/tools/ocaml/Makefile.rules @@ -40,13 +40,14 @@ ALL_OCAML_OBJS ?=3D $(OBJS) $(call quiet-command, $(CC) $(CFLAGS) -c -o $@ $<,CC,$@) =20 META: META.in - sed 's/@VERSION@/$(VERSION)/g' < $< $o + sed 's/@VERSION@/$(VERSION)/g' < $< > $@.tmp + $(call move-if-changed,$@.tmp,$@) =20 ALL_OCAML_OBJ_SOURCES=3D$(addsuffix .ml, $(ALL_OCAML_OBJS)) =20 ifneq ($(MAKECMDGOALS),clean) .ocamldep.make: $(ALL_OCAML_OBJ_SOURCES) Makefile $(OCAML_TOPLEVEL)/Makefi= le.rules - $(call quiet-command, $(OCAMLDEP) $(ALL_OCAML_OBJ_SOURCES) *.mli $o,MLDEP= ,) + $(call quiet-command, $(OCAMLDEP) $(ALL_OCAML_OBJ_SOURCES) *.mli > $@.tmp= ; $(call move-if-changed,$@.tmp,$@),MLDEP,) endif =20 clean: $(CLEAN_HOOKS) diff --git a/tools/ocaml/common.make b/tools/ocaml/common.make index 708d74617c8d..979cbe08459b 100644 --- a/tools/ocaml/common.make +++ b/tools/ocaml/common.make @@ -17,5 +17,3 @@ OCAMLCFLAGS +=3D -g $(OCAMLINCLUDE) -w F -warn-error F VERSION :=3D 4.1 =20 OCAMLDESTDIR ?=3D $(DESTDIR)$(shell $(OCAMLFIND) printconf destdir) - -o=3D >$@.new && mv -f $@.new $@ --=20 2.39.2 From nobody Sun Nov 24 15:15:34 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=reject dis=none) header.from=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1724410345; cv=none; d=zohomail.com; s=zohoarc; b=FBvnytP9UohJlHk4387vZM3Ql3BdXoIfOGfDhgdcR7ljEPq8CWF8P2xWOdANBJptaazLJo7yMOQr4XxoqPfpyxwK+G5R/fdjgFLEjbcBfqaRjRfKPeh3lfKtIEpqleATqz5gKCyIM8n1CXPAeomQQHwVPrIcJGEQcrXnr5VRzco= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1724410345; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=uOO1eSHIi4Cp4U+gzj0SV1mncIJwBvzbwJEtLZVYyyo=; b=jDH2y8KNCNbsj7LHq1UXUT3j+aODwanH6xiNkS00bMYzJxpXdkxJiq8YEeORVu2NmTqXGM541UVT7/aytrr4Vctjggjkd8I0NCBDK+KlS1mP6ZdPGyeFUCEmM7r/ugsUYy0bRe25qJzTQIxwcUgeeJPYuezLI729VbJsX+VyLAM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1724410345669864.7894662856252; Fri, 23 Aug 2024 03:52:25 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.782253.1191754 (Exim 4.92) (envelope-from ) id 1shRtp-0004v7-3Y; Fri, 23 Aug 2024 10:52:09 +0000 Received: by outflank-mailman (output) from mailman id 782253.1191754; Fri, 23 Aug 2024 10:52:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1shRto-0004v0-Vx; Fri, 23 Aug 2024 10:52:08 +0000 Received: by outflank-mailman (input) for mailman id 782253; Fri, 23 Aug 2024 10:52:08 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1shRto-0004C8-2B for xen-devel@lists.xenproject.org; Fri, 23 Aug 2024 10:52:08 +0000 Received: from mail-lf1-x136.google.com (mail-lf1-x136.google.com [2a00:1450:4864:20::136]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id bd18eb0d-613d-11ef-8776-851b0ebba9a2; Fri, 23 Aug 2024 12:52:06 +0200 (CEST) Received: by mail-lf1-x136.google.com with SMTP id 2adb3069b0e04-53349ee42a9so2238683e87.3 for ; Fri, 23 Aug 2024 03:52:06 -0700 (PDT) Received: from andrewcoop.eng.citrite.net ([185.25.67.249]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a868f47d1c3sm239923866b.169.2024.08.23.03.52.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Aug 2024 03:52:03 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version 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" X-Inumbo-ID: bd18eb0d-613d-11ef-8776-851b0ebba9a2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1724410325; x=1725015125; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=uOO1eSHIi4Cp4U+gzj0SV1mncIJwBvzbwJEtLZVYyyo=; b=LXqrBm9jc3iTF4uWJ2V/OtooWfFilQ9V0Gvd+6roQs+EVErcWvgJH+v3ylTHkNWtc5 9FXVfzycbKDgQnlKJra+YTb5vEXRm0Fg90umkb/BXw0ZLw2vPw3klzNIF6gW6hJfJm4r AjNGJw+mns0RZblHQFb5b7a9vsvgOmTK307VQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724410325; x=1725015125; 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:message-id:reply-to; bh=uOO1eSHIi4Cp4U+gzj0SV1mncIJwBvzbwJEtLZVYyyo=; b=FZag2Fk1NsanwK3sFFrkkd6aYpdAfeOQ7ZY5Q+POAYPhWyK/zRqMy/eFaj9RFppzyZ 2j33hbiXFuMfpnsttbnkRm83drlJIr+7FGOzKlF1yVTo5bjJ1qrYAILJ5yqP3sSpaCEP XUlv+rBI8TqvEt9DjZOHPfnNqR4sSHdv/D641MfAXZVsV02YLoEUV+0oXxKLkgVi+Ox9 E8zKYJ+4CeLsH0MWL/rlaIndn+PBGiSA4+4vZwr/I9dVaezbpqqzZ66P8sOAwDymw5HC f2xY2GFQkIIOdmZBI1eENXd9UHgbk6bw4wHiKcrJ8lgHPMeveSE9sxMgWxsqQ2Fr6uf1 47JA== X-Gm-Message-State: AOJu0Yx/Un3a+cy8icUFztwDyKGlCsu3ADLKtvqVz7qEzUzyCWqkBbN+ 0JoeyiiC5Ye2emd3HacqKF1x0pAzqEewkb3dFbh45u9x/9UbZ71t2nTHVoJZ/dDvsH+l7xvHRXx 3 X-Google-Smtp-Source: AGHT+IEm3ot/zVxHC2E2B3CkRESeaW8QA/4ox9ba7+IvF9XuWYo+sm2A4tYv/MY/idy8qxh+1UeJcw== X-Received: by 2002:a05:6512:6cf:b0:52f:413:7e8c with SMTP id 2adb3069b0e04-5343877870fmr1472471e87.14.1724410325081; Fri, 23 Aug 2024 03:52:05 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Christian Lindig , David Scott , =?UTF-8?q?Edwin=20T=C3=B6r=C3=B6k?= , Rob Hoes , Andrii Sultanov , Anthony PERARD Subject: [PATCH 3/3] tools/ocaml: Fix the version embedded in META files Date: Fri, 23 Aug 2024 11:51:57 +0100 Message-Id: <20240823105157.991275-4-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240823105157.991275-1-andrew.cooper3@citrix.com> References: <20240823105157.991275-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1724410346535116600 Xen 4.1 is more than a decade stale now. Use the same mechanism as elsewhe= re in the tree to get the current version number. Signed-off-by: Andrew Cooper Acked-by: Christian Lindig Reviewed-by: Edwin T=C3=B6r=C3=B6k --- CC: Christian Lindig CC: David Scott CC: Edwin T=C3=B6r=C3=B6k CC: Rob Hoes CC: Andrii Sultanov CC: Anthony PERARD We could use autoconf for this, but it's rather more invasive and there's going to be a reasonable amount of churn in this area anyway. --- tools/ocaml/common.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ocaml/common.make b/tools/ocaml/common.make index 979cbe08459b..c7eefceeb42b 100644 --- a/tools/ocaml/common.make +++ b/tools/ocaml/common.make @@ -14,6 +14,6 @@ CFLAGS +=3D -fPIC -I$(shell ocamlc -where) OCAMLOPTFLAGS =3D -g -ccopt "$(LDFLAGS)" -dtypes $(OCAMLINCLUDE) -w F -war= n-error F OCAMLCFLAGS +=3D -g $(OCAMLINCLUDE) -w F -warn-error F =20 -VERSION :=3D 4.1 +VERSION :=3D $(shell $(XEN_ROOT)/version.sh $(XEN_ROOT)/xen/Makefile) =20 OCAMLDESTDIR ?=3D $(DESTDIR)$(shell $(OCAMLFIND) printconf destdir) --=20 2.39.2