From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-oo1-xc36.google.com (mail-oo1-xc36.google.com [IPv6:2607:f8b0:4864:20::c36]) by sourceware.org (Postfix) with ESMTPS id 400983858D35 for ; Sun, 28 Apr 2024 21:23:43 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 400983858D35 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 400983858D35 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::c36 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1714339425; cv=none; b=n4++nJcwbT4A5l0qtX8CyjLzoopxsaVeNtVR8JtSdiGkhggH19gftnEjY/nhP1qzuTnBhnYqkUduu33fMI2MpP1kxTIwwTPHO2XjRDaHKn1oEJcDDm3vc8ZX1UdIr9P9utQffqb4qAlvWp3lnByXNnF9FhYSbATjcL/c1a6+vIU= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1714339425; c=relaxed/simple; bh=GEBMX8qn4RkueLUYRLUpCav8iYb7eH0zKAEaMeUj3Uw=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=c9tWAqAdy50J2eFd9vYQMgEuo3NIIJxQeuQ4Z93MjsqsETyUvxFyGaSSzHQpH0pKbpysgxCgtNXRagBM67FLPqJQj1OSrLs0DuKjfLHkRKQePhZgHShCWkTR87NJprniHF/OZz82tUbg6ITFJfHtCF8wCS7bve5v1A7FR3bIgtc= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-oo1-xc36.google.com with SMTP id 006d021491bc7-5af23552172so2406013eaf.1 for ; Sun, 28 Apr 2024 14:23:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1714339422; x=1714944222; darn=sourceware.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=9B0ga02bS1Odl7S2KuQcWDA26yOQaGxh/LkG853Psu8=; b=ZTB7cy5hl9G+YBesAX2ze9Cp4q1Zap2Ejc8ptdWomu2JOpCP077zjEmF7TAnVnIli6 iVwLf1b3sgDHx/CXjPXzS6VtiqV0D7KufL6sY7C2ZIuHkisvbK5yh93WPKXoOLwo3yPn XAokXs32UINdH97yR8HiQmOYHhdYVkEbCa/JCJi64hwfSgmUQfBc00fDDgMS4K/faDGl lgoc2lZEPYH6R+tkxtq2b4nmvnZuKs3AAJZlY7fWDEK51OEgU4w0zYnM6Br/lrddlJgs IBebishs+QyfJJbreoVKp00cpzkOBjcASsQkQjMkvOVG0jfty4h2dIghXHucEBy0Y0SG /cLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714339422; x=1714944222; 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=9B0ga02bS1Odl7S2KuQcWDA26yOQaGxh/LkG853Psu8=; b=JPzyzkuIFxfQXngcu+v/3vW+GgOJ9FdUnz738rIzWQuVeMIZj/ySorfZbJS0t3eAAr b95VycRJoBxjmUjY7XGtM8pJgLSvAoXSPYaIwE6v/oX2fywg9WE4u17gOGohmCt3Y3QR Y5MnSQkS3UjYeD25lQETbbtSFAtazCMYZqgiLSokjoTfFAg2NLw23nKsI+5cxWneOYPB /GKKA88n6JAOggVNAMYo+yTRK0IGXU96kQGZ/xrAViqBtRgZEPJSoanfZ1C2uVHjhPsS +bv1PEJsKB3TgZVZzVW22E3P/+4V0g+ex9muszIe8J/tZ9oHmkOTrvGaeWP3SJ22/Xgx lOTg== X-Gm-Message-State: AOJu0Yz1OWKMAEYOz/kgwYmcXvGTHJ85ytBmqShedMPTK/Y8yrKl4758 OszkJ9tD6ZUF/u/hJQZg3p1NNf54l6J039pvfkx3c6vgunIdWsHSCgokQumjdNiy7a2q4/0AjBE B X-Google-Smtp-Source: AGHT+IFEhrKJXFKNrqV6EvQ9p7/4sGjRFsvMOPhHjuYKwqMSEJCjC7lo6ro6HDB3JRVFdf9fWIQRaQ== X-Received: by 2002:a4a:c3:0:b0:5ac:9fd2:aa36 with SMTP id 186-20020a4a00c3000000b005ac9fd2aa36mr10233304ooh.8.1714339421642; Sun, 28 Apr 2024 14:23:41 -0700 (PDT) Received: from localhost.localdomain ([139.178.84.207]) by smtp.gmail.com with ESMTPSA id l4-20020a4ab0c4000000b005a4bb400a0fsm4722150oon.4.2024.04.28.14.23.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Apr 2024 14:23:41 -0700 (PDT) From: Christophe Lyon To: buildbot@sourceware.org Cc: Christophe Lyon Subject: [PATCH] autoregen.py: Use autoreconf by default Date: Sun, 28 Apr 2024 21:23:38 +0000 Message-Id: <20240428212338.2696584-1-christophe.lyon@linaro.org> X-Mailer: git-send-email 2.34.1 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: Since the list of directories compatible with autoreconf is large, make it the default, and introduce a list of directories to reconfigure 'manually'. --- builder/containers/autoregen.py | 78 ++++----------------------------- 1 file changed, 9 insertions(+), 69 deletions(-) diff --git a/builder/containers/autoregen.py b/builder/containers/autoregen.py index faffc88..0d93186 100755 --- a/builder/containers/autoregen.py +++ b/builder/containers/autoregen.py @@ -52,69 +52,15 @@ SKIP_DIRS = [ "minizip", ] -# these directories are known to be re-generatable with a simple autoreconf -# without special -I flags -# Entries commented out (and directories not listed) are handled by -# regenerate_manually(). -AUTORECONF_DIRS = [ - # subdirs common to binutils-gdb and gcc - "libbacktrace", - "libdecnumber", # No Makefile.am - "libiberty", # No Makefile.am - "zlib", - - # binutils-gdb subdirs - "bfd", - "binutils", - "etc", - "gas", - "gdb", - "gdbserver", - "gdbsupport", - "gnulib", - "gold", - "gprof", - "gprofng", - "gprofng/libcollector", - "ld", - "libctf", - "libsframe", - "opcodes", - "sim", - - # gcc subdirs - "c++tools", # No aclocal.m4 - "gcc", # No Makefile.am - #"fixincludes", # autoreconf complains about GCC_AC_FUNC_MMAP_BLACKLIST - "gnattools", # No aclocal.m4 - "gotools", - "libada", # No aclocal.m4 - "libatomic", - "libcc1", - "libcody", # No aclocal.m4 - "libcpp", # No Makefile.am - "libffi", - "libgcc", # No aclocal.m4 - "libgfortran", +MANUAL_CONF_DIRS = [ + ".", + # autoreconf does not update aclocal.m4 + "fixincludes", # Hack: ACLOCAL_AMFLAGS = -I .. -I ../config in Makefile.in but we # apply -I../config -I.. otherwise we do not match the current # contents - #"libgm2", - "libgo", - "libgomp", - "libgrust", - "libitm", - "libobjc", # No Makefile.am - "libphobos", - "libquadmath", - "libsanitizer", - "libssp", - "libstdc++-v3", - # This does not cover libvtv/testsuite/other-tests/Makefile.in - "libvtv", - "lto-plugin", -] - + "libgm2", + ] # Run the shell command CMD. # @@ -146,12 +92,6 @@ def regenerate_manually(): if (folder / ".." / "config").is_dir(): include_arg = "-I../config" - # this is really a hack just for binutils-gdb/gprofng/libcollector - # make sure that the order of includes is done as --enable-maintainer-mode - if (folder / ".." / ".." / "config").is_dir(): - include_arg = "-I../.." - include_arg2 = "-I../../config" - if folder.stem == "fixincludes": include_arg = "-I.." include_arg2 = "-I../config" @@ -215,7 +155,7 @@ for folder in sorted(config_folders): print(f"Entering directory {folder}", flush=True) os.chdir(folder) - if str(folder.relative_to(repo_root)) in AUTORECONF_DIRS: - regenerate_with_autoreconf() - else: + if str(folder.relative_to(repo_root)) in MANUAL_CONF_DIRS: regenerate_manually() + else: + regenerate_with_autoreconf() -- 2.34.1