Merge FEATURE-ci-freebsd-selected-make: Propagate selected make to configure

Author: etr

scripts/check-v3-installed-consumer.py

@@ -34,6 +34,7 @@ def package_lane(args, source, output, mode, inventory):
     env.pop('V3_TLS_LIBS', None)
     env['CXX'] = args.compiler
     env['CC'] = args.cc
+    env['MAKE'] = args.make
     pkgdirs = [root / 'lib/pkgconfig' for root in args.prerequisite_prefix] + args.pkg_config_dir
     env.update(PKG_CONFIG_PATH='', PKG_CONFIG_LIBDIR=os.pathsep.join(path.as_posix() for path in pkgdirs))
     env['CPPFLAGS'] = shlex.join(['-I' + (root / 'include').as_posix() for root in args.prerequisite_prefix])
@@ -60,6 +61,7 @@ def package_lane(args, source, output, mode, inventory):
     command([args.make, '-j' + str(args.jobs)], build, env)
     command([args.make, 'install'], build, env)
     runtime_env = runtime_environment(audit.clean_environment(), prefix, args.provider_prefix, args.prerequisite_prefix, args.toolchain_prefix)
+    runtime_env['MAKE'] = args.make
     runtime_env.update(PKG_CONFIG_PATH='', PKG_CONFIG_LIBDIR=os.pathsep.join(path.as_posix() for path in [prefix / 'lib/pkgconfig'] + pkgdirs))
     runtime_env.update({key: env[key] for key in ('V3_TLS_CFLAGS', 'V3_TLS_LIBS') if key in env})
     runtime_env['V3_PROVIDER_PREFIX'] = str(args.provider_prefix)

scripts/test-v3-installed-consumer.py

@@ -6,6 +6,7 @@
 import json
 import os
 from pathlib import Path
+import shutil
 import signal
 import socket
 import subprocess
@@ -23,6 +24,87 @@
 import package_traffic as traffic
 
 
+@unittest.skipIf(os.name == 'nt', 'POSIX make lookup fixture; native Windows is CI owned')
+class InstalledMakeTest(unittest.TestCase):
+    """Run the package lane through real Automake dependency bootstrapping."""
+    @classmethod
+    def setUpClass(cls):
+        cls.temp = tempfile.TemporaryDirectory()
+        cls.addClassCleanup(cls.temp.cleanup)
+        cls.root = Path(cls.temp.name).resolve()
+        cls.gnu_make = shutil.which('gmake') or shutil.which('make')
+        version = subprocess.check_output([cls.gnu_make, '--version'], text=True)
+        if 'GNU Make' not in version:
+            raise RuntimeError('selected-make fixture requires GNU make')
+        cls.source = cls.root / 'source'
+        cls.source.mkdir()
+        (cls.source / 'configure.ac').write_text('''AC_INIT([selected-make], [1.0])
+AM_INIT_AUTOMAKE([foreign])
+AC_PROG_CC
+AC_ARG_ENABLE([v3-tls])
+AC_ARG_ENABLE([examples])
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
+''')
+        (cls.source / 'Makefile.am').write_text('''noinst_PROGRAMS = probe
+probe_SOURCES = probe.c probe.h
+all-local:
+\t@printf '%s\\n' "$$MAKE" > all-make
+install-exec-local:
+\t@printf '%s\\n' "$$MAKE" > install-make
+check-v3-native-linkage:
+\t@printf '%s\\n' "$$MAKE" > check-make
+\t@echo selected-make-fixture-complete
+\t@exit 23
+check-headers check-hygiene check-v3-installed-package-fixtures:
+\t@:
+''')
+        (cls.source / 'probe.c').write_text('#include "probe.h"\nint main(void) { return PROBE; }\n')
+        (cls.source / 'probe.h').write_text('#define PROBE 0\n')
+        subprocess.run(['autoreconf', '--install', '--force'], cwd=cls.source,
+                       check=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, text=True)
+        spec = importlib.util.spec_from_file_location('installed_make_runner',
+            Path(__file__).with_name('check-v3-installed-consumer.py'))
+        cls.runner = importlib.util.module_from_spec(spec)
+        spec.loader.exec_module(cls.runner)
+
+    def exercise_selection(self, selection, *, broken_default=False, ambient_make=None):
+        root = self.root / self._testMethodName
+        root.mkdir()
+        tools = root / 'tools'
+        tools.mkdir()
+        bad_make = tools / 'unselected-make'
+        bad_make.write_text('#!/bin/sh\necho unselected-make >&2\nexit 1\n')
+        bad_make.chmod(0o755)
+        (tools / 'make').symlink_to(bad_make if broken_default else self.gnu_make)
+        (tools / 'gmake').symlink_to(self.gnu_make)
+        args = SimpleNamespace(make=selection, compiler=shutil.which('c++'), cc=shutil.which('cc'),
+            jobs=1, prerequisite_prefix=[], pkg_config_dir=[], provider_prefix=root,
+            toolchain_prefix=None, optimized=False)
+        environment = dict(os.environ, PATH=str(tools) + os.pathsep + os.environ['PATH'])
+        environment.pop('MAKE', None)
+        if ambient_make:
+            environment['MAKE'] = str(bad_make)
+        # Stop at the fixture's check target, after real configure/build/install.
+        with patch.dict(os.environ, environment, clear=True), \
+                self.assertRaisesRegex(RuntimeError, 'selected-make-fixture-complete'):
+            self.runner.package_lane(args, self.source, root, 'no', matrix.load())
+        build = root / 'tls-no/build'
+        self.assertTrue((build / '.deps/probe.Po').is_file())
+        self.assertIn('probe.h', (build / '.deps/probe.Po').read_text())
+        for phase in ('all', 'install', 'check'):
+            self.assertEqual((build / (phase + '-make')).read_text().strip(), selection)
+
+    def test_selected_make_bootstraps_dependencies_with_unusable_default(self):
+        self.exercise_selection('gmake', broken_default=True)
+
+    def test_absolute_make_overrides_ambient_make(self):
+        self.exercise_selection(self.gnu_make, broken_default=True, ambient_make=True)
+
+    def test_default_make_overrides_ambient_make(self):
+        self.exercise_selection('make', ambient_make=True)
+
+
 class InstalledShellTest(unittest.TestCase):
     """Controlled process boundary; these are not native Windows receipts."""
     def setUp(self):
@@ -39,7 +121,7 @@ def setUp(self):
         spec = importlib.util.spec_from_file_location('installed_shell_runner', Path(__file__).with_name('check-v3-installed-consumer.py'))
         self.runner = importlib.util.module_from_spec(spec)
         spec.loader.exec_module(self.runner)
-        self.args = SimpleNamespace(compiler='selected-cxx', cc='selected-cc',
+        self.args = SimpleNamespace(compiler='selected-cxx', cc='selected-cc', make='make',
             prerequisite_prefix=[], pkg_config_dir=[], provider_prefix=self.root, optimized=False)
         self.popen = subprocess.Popen
         self.converted_configure = (self.root / 'configure').as_posix()
@@ -125,7 +207,7 @@ def test_optimized_package_configure_selects_release_flags_without_changing_defa
             for optimized, flags in ((False, '-O0 -g'), (True, '-O3 -g')):
                 with self.subTest(optimized=optimized):
                     output = root / str(optimized); output.mkdir()
-                    args = SimpleNamespace(compiler='selected-cxx', cc='selected-cc',
+                    args = SimpleNamespace(compiler='selected-cxx', cc='selected-cc', make='make',
                         prerequisite_prefix=[], pkg_config_dir=[], provider_prefix=root,
                         optimized=optimized)
                     with self.assertRaises(RuntimeError):

specs/tasks/FEATURE-ci-freebsd-selected-make.md

@@ -0,0 +1,71 @@
+# FEATURE-ci-freebsd-selected-make: propagate the selected make into package configure
+
+Status: Complete (local) — validated and finalized into v3; native CI remains pending.
+Base: local `v3` at `c2d5c626f456f218676a6d840c8ed1442aa28438`.
+
+FreeBSD package job `120468733763` and archive job `120469466638` passed
+`--make gmake` to the installed-consumer driver, then failed real
+`config.status` dependency-fragment bootstrapping with the suggestion to use
+`MAKE="gmake"`. Their effective configure environment was not logged. Source
+inspection established that the driver selected `args.make` for build/install
+commands but omitted it from configure's environment.
+
+The package lane now sets `MAKE` to exactly `args.make` for configure, build,
+install and the merged check environment. The runtime environment also keeps
+that selection, so an inherited `MAKE` cannot replace it during the merge.
+The CLI default remains `make`; named GNU make and absolute selections are
+preserved. Dependency tracking, compiler/provider flags, TLS selection,
+Windows shell/path/prefix handling and process ownership remain unchanged.
+
+Action items:
+
+- [x] Create the isolated Groundwork worktree from the exact local v3 base; preserve other work.
+- [x] Read the existing literal failure journal and actual FreeBSD error before diagnosis.
+- [x] Establish RED through the production `package_lane` and a real Autoconf/Automake C project.
+- [x] Propagate the selected make into configure and subsequent lane environments.
+- [x] Verify named `gmake` with an unusable default `make`, absolute make with conflicting ambient `MAKE`, and default `make` with conflicting ambient `MAKE`.
+- [x] Verify actual generated dependency fragments and compile/header dependencies, plus make selection inside build/install/check recipes.
+- [x] Keep the regression in the existing installed-consumer test script and fixture/distribution registration.
+- [x] Run the affected Python preservation tests, syntax and diff checks; retain raw configure evidence and source bindings.
+- [x] Caller: complete Groundwork validation and local finalization into `v3`.
+- [ ] CI / v3 PR: fresh native FreeBSD package/archive execution; other nonlocal execution remains CI owned.
+
+Acceptance evidence: the original driver and the repaired driver execute the
+same final regression fixture. All three original-driver cases fail in real
+`config.status` with the automatic dependency-tracking error. All three fixed
+cases successfully configure, compile and install, then reach the fixture's
+deliberately failing check target. The tests require the check marker,
+`.deps/probe.Po` containing `probe.h`, and exact `MAKE` values in all three
+recipe receipts. This bounded fixture stops before package consumer/runtime
+work and is not a package matrix or native FreeBSD receipt.
+
+The three new integration tests and 22 existing Windows-shell, optimization
+and matrix contract tests pass. Python compilation and `git diff --check`
+pass. No Python linter is configured in repository guidance. The fixture
+uses local Autoconf 2.71, Automake 1.16.5, GNU Make 4.3, GCC 13.3.0 and
+Python 3.12.3. POSIX make-lookup integration is skipped on Windows; existing
+Windows shell contracts continue to execute. No full baseline suite or
+unrelated investigation was run. Closed Darwin/Linux/Windows concurrency
+uncertainty remains closed; no new incidental failure occurred.
+
+Primary journal, exact commands, raw RED/GREEN output, generated configure,
+config.log/config.status, command receipts, dependency/recipe artifacts and
+source SHA-256 bindings are retained in the main repository's ignored
+`.debug/ci-freebsd-selected-make-zgo8kkt1/`. `baseline-actual-configure/` and
+`fixed-actual-configure/` retain the same final test source binding and the
+original/repaired executed drivers. Native FreeBSD proof remains incomplete
+and is CI / v3 PR owned under AGENTS.md; it does not block local completion.
+
+Project notes / task-executor memory: v3 is Autotools/C++20; this Python-only
+repair needs no full library build/provider setup. Focused checks use
+`python3 scripts/test-v3-installed-consumer.py InstalledMakeTest InstalledShellTest InstalledShellPSTest MatrixTest`
+and `python3 -m py_compile` for changed scripts. The real fixture is generated
+with `autoreconf --install --force` and invokes the production lane and
+Commands runner without mocking configure or make. Git metadata mutations
+need the existing sandbox escalation; Groundwork's identity helper resolves
+the task worktree/branch. The installed fixture target and EXTRA_DIST already
+include this test script, so no build-system registration change is needed.
+
+Groundwork validation passed at `2e5beffbb8acf227356ea4e9528a949e4b1887ae`
+(1 iteration, 0 fixed, 0 unworked; all eight applicable reviewers approved).
+Native FreeBSD and other nonlocal checks remain incomplete and CI/v3-PR owned.