add cache file option to autoconf executor by default (if cflags and ldflags match default)

Author: henderkes

src/SPC/builder/linux/library/libffi.php

@@ -18,13 +18,8 @@ class libffi extends LinuxLibraryBase
      */
     public function build(): void
     {
-        $arch = getenv('SPC_ARCH');
         UnixAutoconfExecutor::create($this)
-            ->configure(
-                "--host={$arch}-unknown-linux",
-                "--target={$arch}-unknown-linux",
-                "--libdir={$this->getLibDir()}"
-            )
+            ->configure()
             ->make();
 
         if (is_file(BUILD_ROOT_PATH . '/lib64/libffi.a')) {

src/SPC/builder/unix/library/gettext.php

@@ -24,7 +24,7 @@ protected function build(): void
         if ($this->builder->getOption('enable-zts')) {
             $autoconf->addConfigureArgs('--enable-threads=isoc+posix')
                 ->appendEnv([
-                    'CFLAGS' => '-lpthread -D_REENTRANT',
+                    'CFLAGS' => '-D_REENTRANT',
                     'LDFLGAS' => '-lpthread',
                 ]);
         } else {

src/SPC/builder/unix/library/unixodbc.php

@@ -17,6 +17,7 @@ trait unixodbc
     protected function build(): void
     {
         UnixAutoconfExecutor::create($this)
+            ->removeConfigureArgs('--cache-file')
             ->configure(
                 '--disable-debug',
                 '--disable-dependency-tracking',

src/SPC/util/UnixShell.php

@@ -129,4 +129,9 @@ private function getExecString(string $cmd): string
         }
         return $cmd;
     }
+
+    public function getEnv(): array
+    {
+        return $this->env;
+    }
 }

src/SPC/util/executor/UnixAutoconfExecutor.php

@@ -32,6 +32,13 @@ public function configure(...$args): static
         // remove all the ignored args
         $args = array_merge($args, $this->getDefaultConfigureArgs(), $this->configure_args);
         $args = array_diff($args, $this->ignore_args);
+        $args = array_filter(
+            $args,
+            fn ($arg) => !array_filter(
+                $this->ignore_args,
+                fn ($ignore) => str_starts_with($arg, $ignore . '=')
+            )
+        );
         $configure_args = implode(' ', $args);
 
         $this->shell->exec("./configure {$configure_args}");
@@ -46,7 +53,7 @@ public function getConfigureArgsString(): string
     /**
      * Run make
      *
-     * @param  string           $target Build target
+     * @param string $target Build target
      * @throws RuntimeException
      */
     public function make(string $target = '', false|string $with_install = 'install', bool $with_clean = true, array $after_env_vars = []): static
@@ -72,9 +79,9 @@ public function exec(string $cmd): static
      * Add optional library configuration.
      * This method checks if a library is available and adds the corresponding arguments to the CMake configuration.
      *
-     * @param  string          $name       library name to check
-     * @param  \Closure|string $true_args  arguments to use if the library is available (allow closure, returns string)
-     * @param  string          $false_args arguments to use if the library is not available
+     * @param string $name library name to check
+     * @param \Closure|string $true_args arguments to use if the library is available (allow closure, returns string)
+     * @param string $false_args arguments to use if the library is not available
      * @return $this
      */
     public function optionalLib(string $name, \Closure|string $true_args, string $false_args = ''): static
@@ -119,13 +126,23 @@ public function appendEnv(array $env): static
      */
     private function getDefaultConfigureArgs(): array
     {
-        return [
+        $args = [
             '--disable-shared',
             '--enable-static',
             "--prefix={$this->library->getBuildRootPath()}",
             '--with-pic',
             '--enable-pic',
         ];
+
+        // only add the cache file if CFLAGS and LDFLAGS are defaulted
+        $env = $this->shell->getEnv();
+        $expected_cflags = '-I' . BUILD_INCLUDE_PATH . ' ' . getenv('SPC_DEFAULT_C_FLAGS');
+        $expected_ldflags = '-L' . BUILD_LIB_PATH;
+
+        if (($env['CFLAGS'] ?? '') === $expected_cflags && ($env['LDFLAGS'] ?? '') === $expected_ldflags) {
+            $args[] = '--cache-file=' . BUILD_ROOT_PATH . '/config.cache';
+        }
+        return $args;
     }
 
     /**