From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-oi1-x231.google.com (mail-oi1-x231.google.com [IPv6:2607:f8b0:4864:20::231]) by sourceware.org (Postfix) with ESMTPS id 44C7F385843B for ; Fri, 12 Apr 2024 20:06:42 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 44C7F385843B 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 44C7F385843B Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::231 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1712952403; cv=none; b=aJhPjzvH7TU2Vo5h7Bu+T3A55guRfL/I3fWgQ24ujrZCR5mLPMMMvdxPH2KYLMFekTrHpArhxc+xHXNXcK93O+Ljek0MPYullk4twhYoi7S0NiRNM30a209Zsi2V9IArr3qBb11qVVK2WXT+0D5x/dp4rWgX/rLFK5cIibJP0Gw= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1712952403; c=relaxed/simple; bh=JvqD6zYw7YUgR0sfmwvYo49XgErwR5aIG9rtM7ZkTCQ=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=XlIg2w+wR0cCZ+yxzKKMApCx+ft65oxEHJPXVjAozEwTTo2H5WtR/N1XPDA9dxeRWnlmAIiX+WhhCBy3Kp/8CjwE5ypfOh8zJIrKegIMhf9EJ7qXRVeHoFCgv9aLT0VXwapS7L1BMZFkKpu1nDqpMrs4A6UxqPXmFhtJ6k2bYu4= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-oi1-x231.google.com with SMTP id 5614622812f47-3c3d2d0e86dso621622b6e.2 for ; Fri, 12 Apr 2024 13:06:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1712952401; x=1713557201; darn=sourceware.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=QFCX8e9Y+kkh95hf674FegqgsCGbv01pnFXhJRZl92U=; b=Nk6IyYt98sZkeOsthihek9k8uRvuIQSIrQyZLojA2JXWqgmWTDnZr40vO3KQvLW37Y gFcU1Z21xZSwLQXpx21PzEjb7MphoiFy4TG5g5fkkbX8C4wH9lOzw9BKBKDvMQFcBZ7u O5O/k7NHW8YodOsQ38gLjcCjzC9sTTaLo699Fl49qW87/+9dXJKK5zlLny4Q3viVKOEi scFEqsU/2OiFPJ1Yov1+IbTgzJqemA7mjP3/EruuGk3C2mvOP1h3mwVwxs+xLrxPxpjd 0SYMG1CxYBYe7DaOx30myG0Df9MN30CxZ1KHRRTRXlBa3S69HutuMv9D1CbPXTDKsNh0 EpXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712952401; x=1713557201; 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=QFCX8e9Y+kkh95hf674FegqgsCGbv01pnFXhJRZl92U=; b=IQy04M2BrXqL2Va9g3vibivvqiYvlI7KPJwp6N+Xjt2Ybh5iAik2g3o18GlA1vGcvP ST4n/zBKeA5jtIX1zXQoizhgpO7EHxnH4UMhnjrI5FypsSIyTVKL2tppeR/mH1OK1Nix tnO34KNj988HhumUErtnw+7Moi8+5q5O/DFbJBimtjUIljB3hz5ODQDe45wdmP8hP3Kx 5FTVQgvAW6NNjiThJaf6fjaGf5jT69A4mTaKDKbmGl35RMsGw1jxk+nVaPm/lKF7hHE8 4Oh9oCyjepk+YznPiZDj3i1749SJ881N84Q9hcK0E00E132uclybi/EqlGmqXtLM6csP 94Mw== X-Gm-Message-State: AOJu0YzKW0im8nc0A8ww6zfYyrwRceB8ZZWfQpIYlm1gL0SVoumonnjt m38IX1uAzoGLBd3LvsIOLzxLs+j7P4Yg0DyC5DHVjopo8cPvRJmDg8FN0kiQ4lDOqCGRLGEQvvZ 5Rt60Kg== X-Google-Smtp-Source: AGHT+IEQ53gi1R2FwvzztkKWK0udLfAgghsdw34AFJEULYh+B2G+1nvXvQ+x4LVMAUBl/6qLdG+7Hg== X-Received: by 2002:aca:2302:0:b0:3c6:f68e:a76e with SMTP id e2-20020aca2302000000b003c6f68ea76emr2213863oie.45.1712952400725; Fri, 12 Apr 2024 13:06:40 -0700 (PDT) Received: from localhost.localdomain ([139.178.84.207]) by smtp.gmail.com with ESMTPSA id b1-20020a056808010100b003c5f54d014dsm701654oie.51.2024.04.12.13.06.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Apr 2024 13:06:39 -0700 (PDT) From: Christophe Lyon To: buildbot@sourceware.org Cc: Christophe Lyon Subject: [PATCH 2/6] autoregen.py: Move comment... Date: Fri, 12 Apr 2024 20:05:55 +0000 Message-Id: <20240412200559.1649050-3-christophe.lyon@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240412200559.1649050-1-christophe.lyon@linaro.org> References: <20240412200559.1649050-1-christophe.lyon@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-12.6 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 List-Id: ... just before the line where it makes sense --- builder/containers/autoregen.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builder/containers/autoregen.py b/builder/containers/autoregen.py index 7f18f35..6e341e2 100755 --- a/builder/containers/autoregen.py +++ b/builder/containers/autoregen.py @@ -72,7 +72,6 @@ def regenerate_with_autoreconf(): def regenerate_manually(): configure_lines = open("configure.ac").read().splitlines() if any(True for line in configure_lines if line.startswith("AC_CONFIG_MACRO_DIR")): - # aclocal does not support the -f short option for force include_arg = "" include_arg2 = "" if (folder / ".." / "config").is_dir(): @@ -84,6 +83,7 @@ def regenerate_manually(): include_arg = "-I../.." include_arg2 = "-I../../config" + # aclocal does not support the -f short option for force run_shell(f"{ACLOCAL_BIN} --force {include_arg} {include_arg2}") if (folder / "config.in").is_file() or any( -- 2.34.1