add -trimpath

.github/workflows/build-unix.yml

@@ -46,10 +46,6 @@ on:
         description: Prefer pre-built binaries (reduce build time)
         type: boolean
         default: true
-      with-suggested-libs:
-        description: Build with suggested libs
-        type: boolean
-        default: false
       debug:
         description: Show full build logs
         type: boolean
@@ -90,10 +86,6 @@ on:
         description: Prefer pre-built binaries (reduce build time)
         type: boolean
         default: true
-      with-suggested-libs:
-        description: Include suggested libs
-        type: boolean
-        default: false
       debug:
         description: Show full build logs
         type: boolean
@@ -165,9 +157,6 @@ jobs:
           if [ ${{ inputs.prefer-pre-built }} == true ]; then
               DOWN_CMD="$DOWN_CMD --prefer-pre-built"
           fi
-          if [ ${{ inputs.with-suggested-libs }} == true ]; then
-              BUILD_CMD="$BUILD_CMD --with-suggested-libs"
-          fi
           if [ ${{ inputs.build-cli }} == true ]; then
               BUILD_CMD="$BUILD_CMD --build-cli"
           fi
@@ -213,14 +202,6 @@ jobs:
 #        if: ${{ failure() }}
 #        uses: mxschmitt/action-tmate@v3
 
-      # Upload debug logs
-      - if: ${{ inputs.debug && failure() }}
-        name: "Upload build logs on failure"
-        uses: actions/upload-artifact@v4
-        with:
-          name: spc-logs-${{ inputs.php-version }}-${{ inputs.os }}
-          path: log/*.log
-
       # Upload cli executable
       - if: ${{ inputs.build-cli == true }}
         name: "Upload PHP cli SAPI"

config/lib.json

@@ -58,6 +58,9 @@
             "brotlicommon.lib",
             "brotlienc.lib",
             "brotlidec.lib"
+        ],
+        "headers": [
+            "brotli"
         ]
     },
     "bzip2": {
@@ -370,15 +373,6 @@
         ],
         "static-libs-windows": [
             "avif.lib"
-        ],
-        "lib-depends": [
-            "libaom"
-        ],
-        "lib-suggests": [
-            "libwebp",
-            "libjpeg",
-            "libxml2",
-            "libpng"
         ]
     },
     "libcares": {
@@ -859,13 +853,17 @@
     },
     "openssl": {
         "source": "openssl",
-        "pkg-configs": [
-            "openssl"
+        "static-libs-unix": [
+            "libssl.a",
+            "libcrypto.a"
         ],
         "static-libs-windows": [
             "libssl.lib",
             "libcrypto.lib"
         ],
+        "headers": [
+            "openssl"
+        ],
         "lib-depends": [
             "zlib"
         ]
@@ -967,10 +965,10 @@
     },
     "unixodbc": {
         "source": "unixodbc",
-        "pkg-configs": [
-            "odbc",
-            "odbccr",
-            "odbcinst"
+        "static-libs-unix": [
+            "libodbc.a",
+            "libodbccr.a",
+            "libodbcinst.a"
         ],
         "lib-depends": [
             "libiconv"

config/source.json

@@ -526,7 +526,7 @@
     "libavif": {
         "type": "ghtar",
         "repo": "AOMediaCodec/libavif",
-        "provide-pre-built": false,
+        "provide-pre-built": true,
         "license": {
             "type": "file",
             "path": "LICENSE"

src/SPC/ConsoleApplication.php

@@ -34,7 +34,7 @@ use Symfony\Component\Console\Application;
  */
 final class ConsoleApplication extends Application
 {
-    public const string VERSION = '2.8.3';
+    public const string VERSION = '2.8.2';
 
     public function __construct()
     {

src/SPC/builder/LibraryBase.php

@@ -177,19 +177,18 @@ abstract class LibraryBase
         if (file_exists($this->source_dir . '/.spc.patched')) {
             $this->patched = true;
         }
-
-        // extract first if not exists, needed for licenses of shared libraries
-        if (!is_dir($this->source_dir)) {
-            $this->getBuilder()->emitPatchPoint('before-library[' . static::NAME . ']-extract');
-            SourceManager::initSource(libs: [static::NAME], source_only: true);
-            $this->getBuilder()->emitPatchPoint('after-library[' . static::NAME . ']-extract');
-        }
-
         // force means just build
         if ($force_build) {
             $type = Config::getLib(static::NAME, 'type', 'lib');
             logger()->info('Building required ' . $type . ' [' . static::NAME . ']');
 
+            // extract first if not exists
+            if (!is_dir($this->source_dir)) {
+                $this->getBuilder()->emitPatchPoint('before-library[' . static::NAME . ']-extract');
+                SourceManager::initSource(libs: [static::NAME], source_only: true);
+                $this->getBuilder()->emitPatchPoint('after-library[' . static::NAME . ']-extract');
+            }
+
             if (!$this->patched && $this->patchBeforeBuild()) {
                 file_put_contents($this->source_dir . '/.spc.patched', 'PATCHED!!!');
             }

src/SPC/builder/linux/LinuxBuilder.php

@@ -93,7 +93,7 @@ class LinuxBuilder extends UnixBuilderBase
         $php_configure_env = SystemUtil::makeEnvVarString([
             'CFLAGS' => getenv('SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS'),
             'CPPFLAGS' => '-I' . BUILD_INCLUDE_PATH, // . ' -Dsomethinghere', // . $musl_flag,
-            'LDFLAGS' => clean_spaces("{$this->arch_ld_flags} -L" . BUILD_LIB_PATH),
+            'LDFLAGS' => '-L' . BUILD_LIB_PATH,
             // 'LIBS' => SPCTarget::getRuntimeLibs(), // do not pass static libraries here yet, they may contain polyfills for libc functions!
         ]);
 

src/SPC/builder/unix/UnixBuilderBase.php

@@ -365,7 +365,6 @@ abstract class UnixBuilderBase extends BuilderBase
         $frankenphpAppPath = $this->getOption('with-frankenphp-app');
 
         if ($frankenphpAppPath) {
-            $frankenphpAppPath = trim($frankenphpAppPath, "\"'");
             if (!is_dir($frankenphpAppPath)) {
                 throw new WrongUsageException("The path provided to --with-frankenphp-app is not a valid directory: {$frankenphpAppPath}");
             }
@@ -412,10 +411,17 @@ abstract class UnixBuilderBase extends BuilderBase
         $nowatcher = $this->getLib('watcher') === null ? ',nowatcher' : '';
         $xcaddyModules = getenv('SPC_CMD_VAR_FRANKENPHP_XCADDY_MODULES');
         $frankenphpSourceDir = getenv('FRANKENPHP_SOURCE_PATH') ?: SOURCE_PATH . '/frankenphp';
+        FileSystem::replaceFileStr(
+            $frankenphpSourceDir . '/caddy/php-server.go',
+            'config, _, err := caddycmd.LoadConfig',
+            'config, _, _, err := caddycmd.LoadConfig'
+        );
 
         $xcaddyModules = preg_replace('#--with github.com/dunglas/frankenphp\S*#', '', $xcaddyModules);
         $xcaddyModules = "--with github.com/dunglas/frankenphp={$frankenphpSourceDir} " .
-            "--with github.com/dunglas/frankenphp/caddy={$frankenphpSourceDir}/caddy {$xcaddyModules}";
+            "--with github.com/dunglas/frankenphp/caddy={$frankenphpSourceDir}/caddy " .
+            "--with github.com/caddyserver/caddy/v2=github.com/henderkes/caddy/v2@master " .
+            "{$xcaddyModules}";
         if ($this->getLib('brotli') === null && str_contains($xcaddyModules, '--with github.com/dunglas/caddy-cbrotli')) {
             logger()->warning('caddy-cbrotli module is enabled, but brotli library is not built. Disabling caddy-cbrotli.');
             $xcaddyModules = str_replace('--with github.com/dunglas/caddy-cbrotli', '', $xcaddyModules);
@@ -454,7 +460,7 @@ abstract class UnixBuilderBase extends BuilderBase
             'CGO_ENABLED' => '1',
             'CGO_CFLAGS' => clean_spaces($cflags),
             'CGO_LDFLAGS' => "{$this->arch_ld_flags} {$staticFlags} {$config['ldflags']} {$libs}",
-            'XCADDY_GO_BUILD_FLAGS' => '-buildmode=pie ' .
+            'XCADDY_GO_BUILD_FLAGS' => '-buildmode=pie -trimpath ' .
                 '-ldflags \"-linkmode=external ' . $extLdFlags . ' ' .
                 '-X \'github.com/caddyserver/caddy/v2.CustomVersion=FrankenPHP ' .
                 "v{$frankenPhpVersion} PHP {$libphpVersion} Caddy'\\\" " .

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

@@ -11,11 +11,6 @@ trait libavif
     protected function build(): void
     {
         UnixCMakeExecutor::create($this)
-            ->optionalLib('libaom', '-DAVIF_CODEC_AOM=SYSTEM', '-DAVIF_CODEC_AOM=OFF')
-            ->optionalLib('libsharpyuv', '-DAVIF_LIBSHARPYUV=SYSTEM', '-DAVIF_LIBSHARPYUV=OFF')
-            ->optionalLib('libjpeg', '-DAVIF_JPEG=SYSTEM', '-DAVIF_JPEG=OFF')
-            ->optionalLib('libxml2', '-DAVIF_LIBXML2=SYSTEM', '-DAVIF_LIBXML2=OFF')
-            ->optionalLib('libpng', '-DAVIF_LIBPNG=SYSTEM', '-DAVIF_LIBPNG=OFF')
             ->addConfigureArgs('-DAVIF_LIBYUV=OFF')
             ->build();
         // patch pkgconfig

src/SPC/store/pkg/GoXcaddy.php

@@ -4,6 +4,7 @@ declare(strict_types=1);
 
 namespace SPC\store\pkg;
 
+use InvalidArgumentException;
 use SPC\builder\linux\SystemUtil;
 use SPC\store\Downloader;
 use SPC\store\FileSystem;
@@ -33,7 +34,7 @@ class GoXcaddy extends CustomPackage
         $go_exec = "{$pkgroot}/go-xcaddy/bin/go";
         $xcaddy_exec = "{$pkgroot}/go-xcaddy/bin/xcaddy";
         if ($force) {
-            FileSystem::removeDir("{$pkgroot}/{$name}");
+            FileSystem::removeDir("{$pkgroot}/go-xcaddy");
         }
         if (file_exists($go_exec) && file_exists($xcaddy_exec)) {
             return;
@@ -41,12 +42,12 @@ class GoXcaddy extends CustomPackage
         $arch = match (explode('-', $name)[2]) {
             'x86_64' => 'amd64',
             'aarch64' => 'arm64',
-            default => throw new \InvalidArgumentException('Unsupported architecture: ' . $name),
+            default => throw new InvalidArgumentException('Unsupported architecture: ' . $name),
         };
         $os = match (explode('-', $name)[3]) {
             'linux' => 'linux',
             'macos' => 'darwin',
-            default => throw new \InvalidArgumentException('Unsupported OS: ' . $name),
+            default => throw new InvalidArgumentException('Unsupported OS: ' . $name),
         };
         [$go_version] = explode("\n", Downloader::curlExec('https://go.dev/VERSION?m=text'));
         $config = [
@@ -78,6 +79,18 @@ class GoXcaddy extends CustomPackage
         }
 
         // install xcaddy without using musl tools, xcaddy build requires dynamic linking
+        // Clone the fork and install from local clone to avoid module path conflicts
+        $xcaddyClonePath = "{$pkgroot}/go/src/github.com/henderkes/xcaddy";
+        if (!is_dir($xcaddyClonePath)) {
+            shell()
+                ->appendEnv([
+                    'PATH' => "{$pkgroot}/go-xcaddy/bin:" . $sanitizedPath,
+                ])
+                ->exec("git clone https://github.com/henderkes/xcaddy {$xcaddyClonePath}");
+        } else {
+            shell()->cd($xcaddyClonePath)->exec('git fetch && git pull');
+        }
+
         shell()
             ->appendEnv([
                 'PATH' => "{$pkgroot}/go-xcaddy/bin:" . $sanitizedPath,
@@ -85,7 +98,8 @@ class GoXcaddy extends CustomPackage
                 'GOBIN' => "{$pkgroot}/go-xcaddy/bin",
                 'GOPATH' => "{$pkgroot}/go",
             ])
-            ->exec('CC=cc go install github.com/caddyserver/xcaddy/cmd/xcaddy@latest');
+            ->cd($xcaddyClonePath)
+            ->exec('CC=cc go install ./cmd/xcaddy');
     }
 
     public static function getEnvironment(): array

src/globals/test-extensions.php

@@ -26,10 +26,10 @@ $test_os = [
     // 'macos-15-intel', // bin/spc for x86_64
     // 'macos-15', // bin/spc for arm64
     // 'ubuntu-latest', // bin/spc-alpine-docker for x86_64
-    // 'ubuntu-22.04', // bin/spc-gnu-docker for x86_64
-    // 'ubuntu-24.04', // bin/spc for x86_64
-    // 'ubuntu-22.04-arm', // bin/spc-gnu-docker for arm64
-    // 'ubuntu-24.04-arm', // bin/spc for arm64
+    'ubuntu-22.04', // bin/spc-gnu-docker for x86_64
+    'ubuntu-24.04', // bin/spc for x86_64
+    'ubuntu-22.04-arm', // bin/spc-gnu-docker for arm64
+    'ubuntu-24.04-arm', // bin/spc for arm64
     // 'windows-2022', // .\bin\spc.ps1
     // 'windows-2025',
 ];
@@ -50,7 +50,7 @@ $prefer_pre_built = false;
 
 // If you want to test your added extensions and libs, add below (comma separated, example `bcmath,openssl`).
 $extensions = match (PHP_OS_FAMILY) {
-    'Linux', 'Darwin' => '',
+    'Linux', 'Darwin' => 'pgsql',
     'Windows' => 'com_dotnet',
 };