From patchwork Fri Mar 29 18:09:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Lyon X-Patchwork-Id: 1917916 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=iwf882aB; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4V5pMp6pY9z1yXw for ; Sat, 30 Mar 2024 05:09:42 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C9F1F3858404 for ; Fri, 29 Mar 2024 18:09:40 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-ot1-x32d.google.com (mail-ot1-x32d.google.com [IPv6:2607:f8b0:4864:20::32d]) by sourceware.org (Postfix) with ESMTPS id E497C3858D20 for ; Fri, 29 Mar 2024 18:09:16 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E497C3858D20 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linaro.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org E497C3858D20 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::32d ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1711735758; cv=none; b=bPkuwBmNVik1wwU6ecyhNVZhEIqBeJKVQYX3wBqfiCCA1Vidr36c2SP1Ls8M2b+tKZRxejUVqWqGvtrXd/G+OYR9oCiQ+27o3m6fathvzqvglEsupg6Ky/sv133nk2ZCuB8y9jfyDhmW9/4PDqhn3hFHEKwSWH7lIakr9tst17M= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1711735758; c=relaxed/simple; bh=vEbIdChUqZu0SQ+DkXf5pWcmNj820ToqfP4Os41huYs=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=BiVFLgOtjD65x3eOHWdl9Iq/mGalpXOsmVsN+OQZD8U2u1VV2FJo4/G3pynkZXY96dhJiwYuwii1QA7GN/WvhC1y5mj4doGBJByN3kppsWMVsH5LC2b4Cl8GCW7XA9eNvbyUNNXk+XZj6E7nWe4xTxD3+cF88uxckdC3wwREN0o= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-ot1-x32d.google.com with SMTP id 46e09a7af769-6e677008501so1370814a34.1 for ; Fri, 29 Mar 2024 11:09:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1711735756; x=1712340556; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=n8d3QXJMIgaebgW4QM2wGzLQWDRMDveS8x3GYMyWidk=; b=iwf882aBPYnh8Lp2sLXe5JCAlTH1efTaiQx1Sn4XOf7k8c9MMrZ/CdPu0SV2J0RgS4 W5qUdKMgGyR3/grOBkzQyFe9W5nqDZxnMUn/wVTRIwP11Sh+M8JmlNKvhy307CFd/ce8 Ky4asiYPY4Q7Gkbmgp2RLyqslTpU3cwoBsPeysSfycHFEwvhfhw60TO2BD8S3jJmF+ym 7mmrh8KaBNP2jBHWjSRUMqfL1HN4rs2z21TDCPixUiRPm7VB10YGOvvrv9lyT7i0zyrx a74jXOfGpTaFso1FJcMdl+fFARZ3YUiiu3hq9yrD1KYfiZu8NNMOjLt6RyExterWDV0U OamQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711735756; x=1712340556; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=n8d3QXJMIgaebgW4QM2wGzLQWDRMDveS8x3GYMyWidk=; b=WnR3rwsIOoeij1rgD7ciu4B5iwrV9uekAzth+0QWbky70YTRe8o1Kuw41Yr8HaTk/U PDzSTtp6tKyeHp4jjWlJDt7lIjxltPbcbd3W+4KLJXz1m+XyQA0YyICLF8/wdKpydnow yfDxmIkobbegmeR8jGvs0cNv3uEsBvqsOi3sZlw5vafTouAeeMhQ0CikWM+qb6vi2jZ6 s/kNKCZV0ffbtdAuBUbIplAUPuNKvIIgIJkEa5hV1/Zc2PKEQqhgFwK1jzPoJ8d71ir2 EDcyOH6oAUoxzbY+Vu/K6/owf784li4QI9V1YPyuFTd6jhL7SvBM6ZKz/aW4+LDA5BHE yErA== X-Gm-Message-State: AOJu0Ywvvdf3pj41EoyGs+uprqbBt36GI7SFg+nYe9IDufuINRSeN4gy 0/M6FqDXA12EZJDbXcJloWNk4L+BRr4x9rnLAICiE4qHiyUqHpcK1ykSw8Htts62JQAB/phWZiN eSlhv5A== X-Google-Smtp-Source: AGHT+IEWiFYrCK4TZ8Hp0c7Z+quRKZeM2O3YmQEzabhGDDvALfYpLHU96MIOKHhLBVeJLtRXvbg4FA== X-Received: by 2002:a05:6808:1281:b0:3c3:e621:51e3 with SMTP id a1-20020a056808128100b003c3e62151e3mr3324092oiw.41.1711735755808; Fri, 29 Mar 2024 11:09:15 -0700 (PDT) Received: from localhost.localdomain ([139.178.84.207]) by smtp.gmail.com with ESMTPSA id ck23-20020a056808251700b003c3cf84226fsm665007oib.15.2024.03.29.11.09.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Mar 2024 11:09:15 -0700 (PDT) From: Christophe Lyon To: gcc-patches@gcc.gnu.org, gaiusmod2@gmail.com Cc: Christophe Lyon Subject: [PATCH 1/2] modula2: Add m2.install-html rule to gcc/m2/Make-lang.in Date: Fri, 29 Mar 2024 18:09:02 +0000 Message-Id: <20240329180903.3325518-1-christophe.lyon@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-12.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org This rule was missing, and 'make install-html' was failing. It is copied from the corresponding one in fortran. 2024-03-29 Christophe Lyon gcc/m2/ * Make-lang.in (install-html): New rule. --- gcc/m2/Make-lang.in | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gcc/m2/Make-lang.in b/gcc/m2/Make-lang.in index ef6990ce617..2d8a47a1b1f 100644 --- a/gcc/m2/Make-lang.in +++ b/gcc/m2/Make-lang.in @@ -206,6 +206,25 @@ $(build_htmldir)/m2/index.html: $(TEXISRC) $(objdir)/m2/images/gnu.eps rm -f $(@D)/* $(TEXI2HTML) -I $(objdir)/m2 -I $(srcdir)/m2 -I $(gcc_docdir)/include -o $(@D) $< +M2_HTMLFILES = $(build_htmldir)/m2 + +m2.install-html: $(M2_HTMLFILES) + @$(NORMAL_INSTALL) + test -z "$(htmldir)" || $(mkinstalldirs) "$(DESTDIR)$(htmldir)" + @list='$(M2_HTMLFILES)'; for p in $$list; do \ + if test -f "$$p" || test -d "$$p"; then d=""; else d="$(srcdir)/"; fi; \ + f=$(html__strip_dir) \ + if test -d "$$d$$p"; then \ + echo " $(mkinstalldirs) '$(DESTDIR)$(htmldir)/$$f'"; \ + $(mkinstalldirs) "$(DESTDIR)$(htmldir)/$$f" || exit 1; \ + echo " $(INSTALL_DATA) '$$d$$p'/* '$(DESTDIR)$(htmldir)/$$f'"; \ + $(INSTALL_DATA) "$$d$$p"/* "$(DESTDIR)$(htmldir)/$$f"; \ + else \ + echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(htmldir)/$$f'"; \ + $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(htmldir)/$$f"; \ + fi; \ + done + # gm2-libs.texi m2/gm2-libs.texi: gm2-libs.texi-check; @true From patchwork Fri Mar 29 18:09:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Lyon X-Patchwork-Id: 1917917 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=vLpqTdnH; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4V5pMr3xgWz1yXw for ; Sat, 30 Mar 2024 05:09:44 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A4D633858418 for ; Fri, 29 Mar 2024 18:09:42 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-oi1-x22d.google.com (mail-oi1-x22d.google.com [IPv6:2607:f8b0:4864:20::22d]) by sourceware.org (Postfix) with ESMTPS id 3BD553858D28 for ; Fri, 29 Mar 2024 18:09:18 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3BD553858D28 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linaro.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 3BD553858D28 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::22d ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1711735760; cv=none; b=AMbs7jQ+ymbRjvdSvk5+rV70t4+hxeEUmljy5iecjbq5/BtsHb0KCqK1hMgW/y3FRUTWH9YYoszfIlVz2rq9pppZxdDeMS9Nu/NmZlfTn78kXyym/4BF6hP6m4QxfSWkBtwSfxsJj0GtP6T3tbKZjY9nr3OMlOTLgy2+Fep1Cq0= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1711735760; c=relaxed/simple; bh=lbFTWUU4bqoSWWsDwD2Q/qkK0FG2mxGKyREuJT/YB6Q=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=mkhSOc4YCUW2szoTUiJEeL+MmqkiODqZiubPQzJZOzs2J16LN3kvXn2pkzTl0JZR5KVJnOEWhbZ40BlmNYXe+qqm0xgxLuhpcIYhg4LkNDSDSZdZ5Z+gdKSJslNbr0X8CK4nd9WvQI6txBexDi+tozGYKGRCCQnl+Tz9MbNsKDE= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-oi1-x22d.google.com with SMTP id 5614622812f47-3bd4e6a7cb0so1274921b6e.3 for ; Fri, 29 Mar 2024 11:09:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1711735757; x=1712340557; darn=gcc.gnu.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=bZPaerDATmNyfD49ZOMPhQd+0WmonLnnSma4TsIlTVs=; b=vLpqTdnHG3toHEZAWKPEhQ7O6UgF9GBJCy4F65OcfvrcbEqIkYqi6DaPL8p8P+f/M8 5iAQ8DQxndvRxsKCEy/EemAYa3VsBndEQbveWUThVpnyUvtcon4+4vmgZ1V1seI+DRR7 819OKL0UJc2eCQArtAY185GtIwwjbMMP3XuyZ6hMeFitOz1V/24gmOUbiQr9cT4zGuMN HEvtEd37kccIR2HzKC2sdVn/tJLp6cjO/O3yu3f59HCdKD0DTrYZ1yVnloD1jYkD44QH DqN0SQNfJGReNi+HyscSg6KRH0F5AwLJOsBu0eMRXtZmVrQvSzdTXL6SvjVDAwbidUFE tFnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711735757; x=1712340557; 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=bZPaerDATmNyfD49ZOMPhQd+0WmonLnnSma4TsIlTVs=; b=qnAHEW35TLXdpWrOIhZWC4+aGWo9ZpT3OmkZsLlaoFUtRhWhU5nHN6IH3+7TI8dgLo UXt6s5+tjtciC4vhNtM54Gl5Q5wycZtq07NBz+hPS0iAEcUylXa1w3KOq/sNkfjGRrwC mxRyefalVPtDgE/2e3hhS/g3CdhvhaEZHMCjoHcJ2x5fE69CKhs6GMjAw0fydprRF2oy U4AWTtp4duI8Ua5tmxDrbBaYPsotKSfLCDR0ciX+AfLu/igsYLX8QLs0DVZ5Y4dcxUFT 39aiHHxNGy7fTwbTWbuhJckhqe0P6Lx1aXVd4xyL8AqnU1ArVtV8zsjapy8XdIsTDbbw oJAw== X-Gm-Message-State: AOJu0Yz11ENl9tzH1KN5bWCGDQ47AGGFwM4ziFg/21Nubb11vO/c9EPT uSK+Nmkd+53nE2LAr4zhAJ/n8DzAtiqCN+S16j4XUHODvlOjXvqA9fKvpF8a6b0/VqXPOivgRSt xxGVLwA== X-Google-Smtp-Source: AGHT+IGB7OLJkFPIKdFncK/0UdvUtO5H5+zmQoQRydyUd9zcXFSP48mHihxKqEPhQlOxRmezP8EEjg== X-Received: by 2002:a05:6808:384e:b0:3c3:eee8:cc89 with SMTP id ej14-20020a056808384e00b003c3eee8cc89mr4153191oib.23.1711735756783; Fri, 29 Mar 2024 11:09:16 -0700 (PDT) Received: from localhost.localdomain ([139.178.84.207]) by smtp.gmail.com with ESMTPSA id ck23-20020a056808251700b003c3cf84226fsm665007oib.15.2024.03.29.11.09.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Mar 2024 11:09:16 -0700 (PDT) From: Christophe Lyon To: gcc-patches@gcc.gnu.org, gaiusmod2@gmail.com Cc: Christophe Lyon Subject: [PATCH 2/2] modula2: Fix m2.install-info in gcc/m2/Make-lang.in Date: Fri, 29 Mar 2024 18:09:03 +0000 Message-Id: <20240329180903.3325518-2-christophe.lyon@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240329180903.3325518-1-christophe.lyon@linaro.org> References: <20240329180903.3325518-1-christophe.lyon@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Fix a few typos: the generated filename is m2.info (not gm2.info, and gm2$(exeext) is a file not a directory (so test -d would always fail). 2024-03-29 Christophe Lyon gcc/m2/ * Make-lang.in (m2.install-info): Fix rule. --- gcc/m2/Make-lang.in | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gcc/m2/Make-lang.in b/gcc/m2/Make-lang.in index 2d8a47a1b1f..e56240b4c44 100644 --- a/gcc/m2/Make-lang.in +++ b/gcc/m2/Make-lang.in @@ -400,20 +400,20 @@ m2.install-common: installdirs done m2.install-info: installdirs - if [ -d gm2$(exeext) ] ; then \ - if [ -f $(objdir)/doc/gm2.info ]; then \ - rm -f $(DESTDIR)$(infodir)/gm2.info*; \ - for f in $(objdir)/doc/gm2.info*; do \ + if [ -f gm2$(exeext) ] ; then \ + if [ -f $(objdir)/doc/m2.info ]; then \ + rm -f $(DESTDIR)$(infodir)/m2.info*; \ + for f in $(objdir)/doc/m2.info*; do \ realfile=`echo $$f | sed -e 's|.*/\([^/]*\)$$|\1|'`; \ rm -f $(DESTDIR)$(infodir)/`basename $$realfile`; \ $(INSTALL_DATA) $$f $(DESTDIR)$(infodir)/`basename $$realfile`; \ done; \ - chmod a-x $(DESTDIR)$(infodir)/gm2.info*; \ + chmod a-x $(DESTDIR)$(infodir)/m2.info*; \ else true; fi; \ else true; fi - -if [ -f gm2$(exeext) ] && [ -f $(DESTDIR)$(infodir)/gm2.info ]; then \ + -if [ -f gm2$(exeext) ] && [ -f $(DESTDIR)$(infodir)/m2.info ]; then \ if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \ - install-info --dir-file=$(infodir)/dir $(DESTDIR)$(infodir)/gm2.info; \ + install-info --dir-file=$(infodir)/dir $(DESTDIR)$(infodir)/m2.info; \ else true; fi; \ else true; fi