reference pr that shall not be merged

config/ext.json

@@ -132,12 +132,14 @@
     },
     "imap": {
         "type": "builtin",
-        "arg-type": "with",
+        "arg-type": "custom",
         "lib-depends": [
             "imap"
         ],
         "lib-suggests": [
-            "kerberos"
+            "kerberos",
+            "libpam",
+            "openssl"
         ]
     },
     "inotify": {
@@ -235,9 +237,7 @@
         "type": "builtin",
         "arg-type": "with",
         "lib-depends": [
-            "openssl"
-        ],
-        "ext-depends": [
+            "openssl",
             "zlib"
         ]
     },

config/lib.json

@@ -125,18 +125,27 @@
             "libMagickWand-7.Q16HDRI.a"
         ],
         "lib-depends": [
-            "zlib",
+            "zlib"
+        ],
+        "lib-suggests": [
+            "zstd",
+            "xz",
+            "libzip",
             "libpng",
-            "libjpeg",
+            "libxml2",
             "bzip2",
             "libwebp",
+            "libjpeg",
             "freetype"
+        ]
+    },
+    "imap": {
+        "source": "imap",
+        "static-libs-unix": [
+            "libc-client.a"
         ],
         "lib-suggests": [
-            "zstd",
-            "xz",
-            "libzip",
-            "libxml2"
+            "openssl"
         ]
     },
     "ldap": {
@@ -151,6 +160,15 @@
             "libsodium"
         ]
     },
+    "libpam": {
+        "source": "libpam",
+        "static-libs-unix": [
+            "libpam.a"
+        ],
+        "lib-suggests": [
+            "openssl"
+        ]
+    },
     "libavif": {
         "source": "libavif",
         "static-libs-unix": [

config/source.json

@@ -129,7 +129,7 @@
     },
     "icu": {
         "type": "url",
-        "url": "https://github.com/unicode-org/icu/releases/download/release-73-1/icu4c-73_1-src.tgz",
+        "url": "https://github.com/unicode-org/icu/releases/download/release-73-2/icu4c-73_2-src.tgz",
         "license": {
             "type": "file",
             "path": "LICENSE"
@@ -153,6 +153,15 @@
             "path": "LICENSE"
         }
     },
+    "imap": {
+        "type": "git",
+        "url": "https://github.com/uw-imap/imap.git",
+        "rev": "master",
+        "license": {
+            "type": "file",
+            "path": "LICENSE"
+        }
+    },
     "ldap": {
         "type": "filelist",
         "url": "https://www.openldap.org/software/download/OpenLDAP/openldap-release/",
@@ -162,6 +171,14 @@
             "path": "LICENSE"
         }
     },
+    "libpam": {
+        "type": "ghtar",
+        "repo": "linux-pam/linux-pam",
+        "license": {
+            "type": "file",
+            "path": "Copyright"
+        }
+    },
     "libavif": {
         "type": "ghtar",
         "repo": "AOMediaCodec/libavif",

src/SPC/builder/extension/iconv.php

@@ -14,8 +14,8 @@ public function patchBeforeConfigure(): bool
     {
         // macOS need to link iconv dynamically, we add it to extra-libs
         $extra_libs = $this->builder->getOption('extra-libs', '');
-        if (!str_contains($extra_libs, '-liconv')) {
-            $extra_libs .= ' -liconv';
+        if (!str_contains($extra_libs, 'iconv')) {
+            $extra_libs .= ' ' . BUILD_LIB_PATH . '/libiconv.a';
         }
         $this->builder->setOption('extra-libs', $extra_libs);
         return true;

src/SPC/builder/extension/imagick.php

@@ -12,11 +12,27 @@ class imagick extends Extension
 {
     public function patchBeforeBuildconf(): bool
     {
-        // linux need to link library manually, we add it to extra-libs
         $extra_libs = $this->builder->getOption('extra-libs', '');
-        if (!str_contains($extra_libs, 'libMagickCore')) {
-            $extra_libs .= ' /usr/lib/libMagick++-7.Q16HDRI.a /usr/lib/libMagickCore-7.Q16HDRI.a /usr/lib/libMagickWand-7.Q16HDRI.a';
-        }
+        $LIB_PATH = BUILD_LIB_PATH;
+        // always add these even if they aren't needed, php-imagick pulls MagickWand before MagickCore which leads to undefined references
+        $extra_libs .= " {$LIB_PATH}/libMagick++-7.Q16HDRI.a {$LIB_PATH}/libMagickWand-7.Q16HDRI.a  {$LIB_PATH}/libMagickCore-7.Q16HDRI.a ";
+        $extra_libs .= $this->builder->getLib('libzip') ? "{$LIB_PATH}/libzip.a " : '';
+        $extra_libs .= $this->builder->getLib('libjpeg') ? "{$LIB_PATH}/libjpeg.a " : '';
+        $extra_libs .= $this->builder->getLib('libpng') ? "{$LIB_PATH}/libpng.a " : '';
+        $extra_libs .= $this->builder->getLib('libwebp') ? "{$LIB_PATH}/libwebp.a " : '';
+        $extra_libs .= $this->builder->getLib('zstd') ? "{$LIB_PATH}/libzstd.a " : '';
+        $extra_libs .= $this->builder->getLib('freetype') ? "{$LIB_PATH}/libfreetype.a " : '';
+        $this->builder->setOption('extra-libs', $extra_libs);
+        return true;
+    }
+
+    public function patchBeforeMake(): bool
+    {
+        $extra_libs = $this->builder->getOption('extra-libs', '');
+        $LIB_PATH = BUILD_LIB_PATH;
+        // always add these even if they aren't needed, php-imagick pulls MagickWand before MagickCore which leads to undefined references
+        $extra_libs .= " {$LIB_PATH}/libMagick++-7.Q16HDRI.a {$LIB_PATH}/libMagickWand-7.Q16HDRI.a  {$LIB_PATH}/libMagickCore-7.Q16HDRI.a ";
+        $extra_libs .= '-lgomp ';
         $this->builder->setOption('extra-libs', $extra_libs);
         return true;
     }

src/SPC/builder/extension/imap.php

@@ -0,0 +1,47 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\extension;
+
+use SPC\builder\Extension;
+use SPC\exception\FileSystemException;
+use SPC\exception\WrongUsageException;
+use SPC\store\FileSystem;
+use SPC\util\CustomExt;
+
+#[CustomExt('imap')]
+class imap extends Extension
+{
+    public function getUnixConfigureArg(): string
+    {
+        if ($this->builder->getOption('enable-zts')) {
+            throw new WrongUsageException('ext-imap is not thread safe, do not build it with ZTS builds');
+        }
+        $arg = '--with-imap=' . BUILD_ROOT_PATH;
+        if ($this->builder->getLib('openssl') !== null) {
+            $arg .= ' --with-imap-ssl=' . BUILD_ROOT_PATH;
+        }
+        return $arg;
+    }
+
+    /**
+     * @throws FileSystemException
+     */
+    public function patchBeforeConfigure(): bool
+    {
+        if (!$this->builder->getLib('libpam')) {
+            return false;
+        }
+        $extra_libs = $this->builder->getOption('extra-libs', '');
+        if (!str_contains($extra_libs, 'lpam') && !str_contains($extra_libs, 'libpam.a')) {
+            $extra_libs .= ' ' . BUILD_LIB_PATH . '/libpam.a';
+        }
+        $this->builder->setOption('extra-libs', $extra_libs);
+        return (bool) FileSystem::replaceFileStr(
+            SOURCE_PATH . '/php-src/configure',
+            'DLIBS="-l$IMAP_LIB $DLIBS"',
+            'DLIBS="-l$IMAP_LIB $DLIBS -lpam"'
+        );
+    }
+}

src/SPC/builder/linux/LinuxBuilder.php

@@ -38,22 +38,24 @@ class LinuxBuilder extends BuilderBase
     public function __construct(array $options = [])
     {
         $this->options = $options;
-
+        logger()->debug('Current OS: ' . SystemUtil::getOSRelease()['dist'] . ' ' . SystemUtil::getOSRelease()['ver']);
         // ---------- set necessary options ----------
-        // set C Compiler (default: alpine: gcc, others: musl-gcc)
-        $this->setOptionIfNotExist('cc', match (SystemUtil::getOSRelease()['dist']) {
-            'alpine' => 'gcc',
-            default => 'musl-gcc'
-        });
-        // set C++ Compiler (default: g++)
-        $this->setOptionIfNotExist('cxx', 'g++');
+        if (SystemUtil::getOSRelease()['dist'] === 'alpine') {
+            $this->setOptionIfNotExist('cc', 'gcc');
+            $this->setOptionIfNotExist('cxx', 'g++');
+        } else {
+            $arch = arch2gnu(php_uname('m'));
+            $this->setOptionIfNotExist('library_path', '/usr/local/musl/lib');
+            $this->setOptionIfNotExist('cc', "{$arch}-linux-musl-gcc");
+            $this->setOptionIfNotExist('cxx', "{$arch}-linux-musl-g++");
+        }
         // set arch (default: current)
         $this->setOptionIfNotExist('arch', php_uname('m'));
         $this->setOptionIfNotExist('gnu-arch', arch2gnu($this->getOption('arch')));
 
         // ---------- set necessary compile environments ----------
         // set libc
-        $this->libc = $this->getOption('cc', 'gcc') === 'musl-gcc' ? 'musl_wrapper' : 'musl'; // SystemUtil::selectLibc($this->cc);
+        $this->libc = str_ends_with($this->getOption('cc', 'gcc'), 'musl-gcc') ? 'musl_wrapper' : 'musl'; // SystemUtil::selectLibc($this->cc);
         // concurrency
         $this->concurrency = SystemUtil::getCpuCount();
         // cflags
@@ -134,7 +136,7 @@ public function buildPHP(int $build_target = BUILD_TARGET_NONE): void
         } else {
             $extra_libs .= (empty($extra_libs) ? '' : ' ') . implode(' ', array_map(fn ($x) => "-Xcompiler {$x}", array_filter($this->getAllStaticLibFiles())));
         }
-        // add libstdc++, some extensions or libraries need it (C++ cannot be linked statically)
+        // add libstdc++, some extensions or libraries need it
         $extra_libs .= (empty($extra_libs) ? '' : ' ') . ($this->hasCppExtension() ? '-lstdc++ ' : '');
         $this->setOption('extra-libs', $extra_libs);
 
@@ -144,7 +146,7 @@ public function buildPHP(int $build_target = BUILD_TARGET_NONE): void
         switch ($this->libc) {
             case 'musl_wrapper':
             case 'glibc':
-                $cflags .= ' -static-libgcc -I"' . BUILD_INCLUDE_PATH . '"';
+                $cflags .= ' -static-libgcc -static-libstdc++ -I"' . BUILD_INCLUDE_PATH . '"';
                 break;
             case 'musl':
                 if (str_ends_with($this->getOption('cc'), 'clang') && SystemUtil::findCommand('lld')) {
@@ -179,6 +181,7 @@ public function buildPHP(int $build_target = BUILD_TARGET_NONE): void
             $maxExecutionTimers = '';
             $zts = '';
         }
+        $disable_jit = $this->getOption('disable-opcache-jit', false) ? '--disable-opcache-jit ' : '';
 
         $enableCli = ($build_target & BUILD_TARGET_CLI) === BUILD_TARGET_CLI;
         $enableFpm = ($build_target & BUILD_TARGET_FPM) === BUILD_TARGET_FPM;
@@ -187,6 +190,7 @@ public function buildPHP(int $build_target = BUILD_TARGET_NONE): void
 
         shell()->cd(SOURCE_PATH . '/php-src')
             ->exec(
+                (SystemUtil::getOSRelease()['dist'] === 'alpine' ? '' : 'LD_LIBRARY_PATH=/usr/local/musl/x86_64-linux-musl/lib ') .
                 './configure ' .
                 '--prefix= ' .
                 '--with-valgrind=no ' .
@@ -197,11 +201,12 @@ public function buildPHP(int $build_target = BUILD_TARGET_NONE): void
                 '--disable-phpdbg ' .
                 ($enableCli ? '--enable-cli ' : '--disable-cli ') .
                 ($enableFpm ? '--enable-fpm ' : '--disable-fpm ') .
-                ($enableEmbed ? '--enable-embed=static --disable-opcache-jit ' : '--disable-embed ') .
+                ($enableEmbed ? '--enable-embed=static ' : '--disable-embed ') .
+                ($enableMicro ? '--enable-micro=all-static ' : '--disable-micro ') .
+                $disable_jit .
                 $json_74 .
                 $zts .
                 $maxExecutionTimers .
-                ($enableMicro ? '--enable-micro=all-static ' : '--disable-micro ') .
                 $this->makeExtensionArgs() . ' ' .
                 $envs
             );
@@ -212,22 +217,28 @@ public function buildPHP(int $build_target = BUILD_TARGET_NONE): void
 
         if ($enableCli) {
             logger()->info('building cli');
-            $this->buildCli($extra_libs, $use_lld);
+            $this->buildCli($use_lld);
         }
         if ($enableFpm) {
             logger()->info('building fpm');
-            $this->buildFpm($extra_libs, $use_lld);
+            $this->buildFpm($use_lld);
         }
         if ($enableMicro) {
             logger()->info('building micro');
-            $this->buildMicro($extra_libs, $use_lld, $cflags);
+            $this->buildMicro($use_lld, $cflags);
         }
         if ($enableEmbed) {
             logger()->info('building embed');
             if ($enableMicro) {
                 FileSystem::replaceFileStr(SOURCE_PATH . '/php-src/Makefile', 'OVERALL_TARGET =', 'OVERALL_TARGET = libphp.la');
             }
-            $this->buildEmbed($extra_libs, $use_lld);
+            $this->buildEmbed($use_lld);
+            // php-config puts extra_libs in wrong order, fix it here...
+            FileSystem::replaceFileRegex(
+                BUILD_ROOT_PATH . '/bin/php-config',
+                '/libs="\s*(.*)\s*-lstdc\+\+\s+(.*)"/',
+                'libs="$1 $2 -lstdc++"'
+            );
         }
 
         if (php_uname('m') === $this->getOption('arch')) {
@@ -241,11 +252,11 @@ public function buildPHP(int $build_target = BUILD_TARGET_NONE): void
      * @throws RuntimeException
      * @throws FileSystemException
      */
-    public function buildCli(string $extra_libs, string $use_lld): void
+    public function buildCli(string $use_lld): void
     {
         $vars = SystemUtil::makeEnvVarString([
             'EXTRA_CFLAGS' => '-g -Os -fno-ident ' . implode(' ', array_map(fn ($x) => "-Xcompiler {$x}", $this->tune_c_flags)),
-            'EXTRA_LIBS' => $extra_libs,
+            'EXTRA_LIBS' => $this->getOption('extra-libs'),
             'EXTRA_LDFLAGS_PROGRAM' => "{$use_lld} -all-static",
         ]);
         shell()->cd(SOURCE_PATH . '/php-src')
@@ -264,8 +275,9 @@ public function buildCli(string $extra_libs, string $use_lld): void
      *
      * @throws RuntimeException
      * @throws FileSystemException
+     * @throws WrongUsageException
      */
-    public function buildMicro(string $extra_libs, string $use_lld, string $cflags): void
+    public function buildMicro(string $use_lld, string $cflags): void
     {
         if ($this->getPHPVersionID() < 80000) {
             throw new RuntimeException('phpmicro only support PHP >= 8.0!');
@@ -278,7 +290,7 @@ public function buildMicro(string $extra_libs, string $use_lld, string $cflags):
         $enable_fake_cli = $this->getOption('with-micro-fake-cli', false) ? ' -DPHP_MICRO_FAKE_CLI' : '';
         $vars = SystemUtil::makeEnvVarString([
             'EXTRA_CFLAGS' => '-g -Os -fno-ident ' . implode(' ', array_map(fn ($x) => "-Xcompiler {$x}", $this->tune_c_flags)) . $enable_fake_cli,
-            'EXTRA_LIBS' => $extra_libs,
+            'EXTRA_LIBS' => $this->getOption('extra-libs'),
             'EXTRA_LDFLAGS_PROGRAM' => "{$cflags} {$use_lld} -all-static",
         ]);
         shell()->cd(SOURCE_PATH . '/php-src')
@@ -302,11 +314,11 @@ public function buildMicro(string $extra_libs, string $use_lld, string $cflags):
      * @throws FileSystemException
      * @throws RuntimeException
      */
-    public function buildFpm(string $extra_libs, string $use_lld): void
+    public function buildFpm(string $use_lld): void
     {
         $vars = SystemUtil::makeEnvVarString([
             'EXTRA_CFLAGS' => '-g -Os -fno-ident ' . implode(' ', array_map(fn ($x) => "-Xcompiler {$x}", $this->tune_c_flags)),
-            'EXTRA_LIBS' => $extra_libs,
+            'EXTRA_LIBS' => $this->getOption('extra-libs'),
             'EXTRA_LDFLAGS_PROGRAM' => "{$use_lld} -all-static",
         ]);
 
@@ -321,11 +333,11 @@ public function buildFpm(string $extra_libs, string $use_lld): void
         $this->deployBinary(BUILD_TARGET_FPM);
     }
 
-    public function buildEmbed(string $extra_libs, string $use_lld): void
+    public function buildEmbed(string $use_lld): void
     {
         $vars = SystemUtil::makeEnvVarString([
             'EXTRA_CFLAGS' => '-g -Os -fno-ident ' . implode(' ', array_map(fn ($x) => "-Xcompiler {$x}", $this->tune_c_flags)),
-            'EXTRA_LIBS' => $extra_libs,
+            'EXTRA_LIBS' => $this->getOption('extra-libs'),
             'EXTRA_LDFLAGS_PROGRAM' => "{$use_lld} -all-static",
         ]);