From 0afe0e5f46f62120ceb03e521564b7e67a3bc779 Mon Sep 17 00:00:00 2001
From: DubbleClick <m@pyc.ac>
Date: Thu, 22 May 2025 15:46:42 +0700
Subject: [PATCH] last problems (?)

---
 config/ext.json                         |  9 ++++++---
 src/SPC/builder/Extension.php           |  2 +-
 src/SPC/builder/extension/intl.php      |  2 --
 src/SPC/builder/extension/memcache.php  |  2 +-
 src/SPC/builder/extension/memcached.php |  2 +-
 src/SPC/builder/extension/sockets.php   | 21 ---------------------
 6 files changed, 9 insertions(+), 29 deletions(-)
 delete mode 100644 src/SPC/builder/extension/sockets.php

diff --git a/config/ext.json b/config/ext.json
index 1cf99d1f..d48646ae 100644
--- a/config/ext.json
+++ b/config/ext.json
@@ -373,7 +373,8 @@
         ],
         "shared-ext-depends": [
             "session"
-        ]
+        ],
+        "build-with-php": true
     },
     "memcached": {
         "support": {
@@ -677,7 +678,8 @@
         ]
     },
     "session": {
-        "type": "builtin"
+        "type": "builtin",
+        "build-with-php": true
     },
     "shmop": {
         "type": "builtin"
@@ -973,7 +975,8 @@
         "source": "xhprof",
         "ext-depends": [
             "ctype"
-        ]
+        ],
+        "build-with-php": true
     },
     "xlswriter": {
         "support": {
diff --git a/src/SPC/builder/Extension.php b/src/SPC/builder/Extension.php
index 8d975837..b8dc8c4c 100644
--- a/src/SPC/builder/Extension.php
+++ b/src/SPC/builder/Extension.php
@@ -362,7 +362,7 @@ class Extension
         }
         $env = [
             'CFLAGS' => $config['cflags'],
-            'LDFLAGS' => $config['ldflags'] . ' -Wl,--allow-multiple-definition',
+            'LDFLAGS' => $config['ldflags'],
             'LIBS' => '-Wl,-Bstatic ' . $staticLibs . ' -Wl,-Bdynamic ' . $sharedLibs,
             'LD_LIBRARY_PATH' => BUILD_LIB_PATH,
         ];
diff --git a/src/SPC/builder/extension/intl.php b/src/SPC/builder/extension/intl.php
index 819aee69..5676a489 100644
--- a/src/SPC/builder/extension/intl.php
+++ b/src/SPC/builder/extension/intl.php
@@ -18,8 +18,6 @@ class intl extends Extension
         // Also need to use clang++ -std=c++17 to force override the default C++ standard
         if (is_string($env = getenv('CXX')) && !str_contains($env, 'std=c++17')) {
             f_putenv('CXX=' . $env . ' -std=c++17');
-        } else {
-            f_putenv('CXX=clang++ -std=c++17');
         }
         return true;
     }
diff --git a/src/SPC/builder/extension/memcache.php b/src/SPC/builder/extension/memcache.php
index 4625cae2..479744fd 100644
--- a/src/SPC/builder/extension/memcache.php
+++ b/src/SPC/builder/extension/memcache.php
@@ -14,7 +14,7 @@ class memcache extends Extension
 {
     public function getUnixConfigureArg(bool $shared = false): string
     {
-        return '--enable-memcache --with-zlib-dir=' . BUILD_ROOT_PATH;
+        return '--enable-memcache' . ($shared ? '=shared' : '') . ' --with-zlib-dir=' . BUILD_ROOT_PATH;
     }
 
     /**
diff --git a/src/SPC/builder/extension/memcached.php b/src/SPC/builder/extension/memcached.php
index 9c433954..12c2c193 100644
--- a/src/SPC/builder/extension/memcached.php
+++ b/src/SPC/builder/extension/memcached.php
@@ -14,6 +14,6 @@ class memcached extends Extension
     {
         $rootdir = BUILD_ROOT_PATH;
         $zlib_dir = $this->builder->getPHPVersionID() >= 80400 ? '' : "--with-zlib-dir={$rootdir}";
-        return "--enable-memcached {$zlib_dir} --with-libmemcached-dir={$rootdir} --disable-memcached-sasl --enable-memcached-json";
+        return "--enable-memcached" . ($shared ? '=shared' : '') . " {$zlib_dir} --with-libmemcached-dir={$rootdir} --disable-memcached-sasl --enable-memcached-json";
     }
 }
diff --git a/src/SPC/builder/extension/sockets.php b/src/SPC/builder/extension/sockets.php
deleted file mode 100644
index a0901415..00000000
--- a/src/SPC/builder/extension/sockets.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace SPC\builder\extension;
-
-use SPC\builder\Extension;
-use SPC\util\CustomExt;
-
-#[CustomExt('sockets')]
-class sockets extends Extension
-{
-    public function patchBeforeConfigure(): bool
-    {
-        if (file_exists(BUILD_INCLUDE_PATH . 'php/ext/sockets/php_sockets.h')) {
-            return false;
-        }
-        copy(SOURCE_PATH . '/php-src/ext/sockets/php_sockets.h', BUILD_INCLUDE_PATH . 'php/ext/sockets/php_sockets.h');
-        return true;
-    }
-}