From 376b8e7569d1fb6074a5cc1804e2022d27e90050 Mon Sep 17 00:00:00 2001
From: henderkes <m@pyc.ac>
Date: Wed, 19 Nov 2025 10:48:24 +0100
Subject: [PATCH] remove psl

---
 config/lib.json                        | 35 ++++----------------------
 config/source.json                     | 10 --------
 src/SPC/builder/linux/library/psl.php  | 12 ---------
 src/SPC/builder/macos/library/krb5.php | 12 +++++++++
 src/SPC/builder/macos/library/psl.php  | 12 ---------
 src/SPC/builder/unix/library/krb5.php  |  2 +-
 src/SPC/builder/unix/library/psl.php   | 20 ---------------
 7 files changed, 18 insertions(+), 85 deletions(-)
 delete mode 100644 src/SPC/builder/linux/library/psl.php
 create mode 100644 src/SPC/builder/macos/library/krb5.php
 delete mode 100644 src/SPC/builder/macos/library/psl.php
 delete mode 100644 src/SPC/builder/unix/library/psl.php

diff --git a/config/lib.json b/config/lib.json
index 394649f3..462f4a55 100644
--- a/config/lib.json
+++ b/config/lib.json
@@ -96,20 +96,7 @@
             "libssh2",
             "nghttp2"
         ],
-        "lib-suggests-linux": [
-            "libssh2",
-            "brotli",
-            "nghttp2",
-            "nghttp3",
-            "ngtcp2",
-            "zstd",
-            "libcares",
-            "ldap",
-            "krb5",
-            "idn2",
-            "psl"
-        ],
-        "lib-suggests-macos": [
+        "lib-suggests-unix": [
             "libssh2",
             "brotli",
             "nghttp2",
@@ -119,7 +106,7 @@
             "libcares",
             "ldap",
             "idn2",
-            "psl"
+            "krb5"
         ],
         "lib-suggests-windows": [
             "brotli",
@@ -259,8 +246,8 @@
         ],
         "lib-suggests-unix": [
             "libiconv",
-            "libunistring",
-            "gettext"
+            "gettext",
+            "libunistring"
         ],
         "lib-depends-macos": [
             "libiconv",
@@ -624,7 +611,7 @@
             "libunistring.a"
         ],
         "headers": [
-            "unistring.h",
+            "unistr.h",
             "unistring/"
         ]
     },
@@ -892,18 +879,6 @@
             "libpgcommon.lib"
         ]
     },
-    "psl": {
-        "source": "libpsl",
-        "pkg-configs": [
-            "libpsl"
-        ],
-        "headers": [
-            "libpsl.h"
-        ],
-        "lib-depends": [
-            "idn2"
-        ]
-    },
     "pthreads4w": {
         "source": "pthreads4w",
         "static-libs-windows": [
diff --git a/config/source.json b/config/source.json
index d4793c35..76bf1835 100644
--- a/config/source.json
+++ b/config/source.json
@@ -660,16 +660,6 @@
             "path": "LICENSE"
         }
     },
-    "libpsl": {
-        "type": "ghrel",
-        "repo": "rockdaboot/libpsl",
-        "match": "libpsl.+\\.tar\\.gz",
-        "prefer-stable": true,
-        "license": {
-            "type": "file",
-            "path": "COPYING"
-        }
-    },
     "librabbitmq": {
         "type": "git",
         "url": "https://github.com/alanxz/rabbitmq-c.git",
diff --git a/src/SPC/builder/linux/library/psl.php b/src/SPC/builder/linux/library/psl.php
deleted file mode 100644
index 1d42d9ba..00000000
--- a/src/SPC/builder/linux/library/psl.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace SPC\builder\linux\library;
-
-class psl extends LinuxLibraryBase
-{
-    use \SPC\builder\unix\library\psl;
-
-    public const NAME = 'psl';
-}
diff --git a/src/SPC/builder/macos/library/krb5.php b/src/SPC/builder/macos/library/krb5.php
new file mode 100644
index 00000000..dd896040
--- /dev/null
+++ b/src/SPC/builder/macos/library/krb5.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SPC\builder\macos\library;
+
+class krb5 extends MacOSLibraryBase
+{
+    use \SPC\builder\unix\library\krb5;
+
+    public const NAME = 'krb5';
+}
diff --git a/src/SPC/builder/macos/library/psl.php b/src/SPC/builder/macos/library/psl.php
deleted file mode 100644
index 647257ec..00000000
--- a/src/SPC/builder/macos/library/psl.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace SPC\builder\macos\library;
-
-class psl extends MacOSLibraryBase
-{
-    use \SPC\builder\unix\library\psl;
-
-    public const NAME = 'psl';
-}
diff --git a/src/SPC/builder/unix/library/krb5.php b/src/SPC/builder/unix/library/krb5.php
index 1834e494..0875da0c 100644
--- a/src/SPC/builder/unix/library/krb5.php
+++ b/src/SPC/builder/unix/library/krb5.php
@@ -18,8 +18,8 @@ trait krb5
         $config = $spc->config(libraries: $libs, include_suggest_lib: $this->builder->getOption('with-suggested-libs', false));
         UnixAutoconfExecutor::create($this)
             ->appendEnv([
+                'CFLAGS' => '-fcommon',
                 'LIBS' => $config['libs'],
-                'LDFLAGS' => '-Wl,--allow-multiple-definition',
             ])
             ->optionalLib('ldap', '--with-ldap', '--without-ldap')
             ->optionalLib('libedit', '--with-libedit', '--without-libedit')
diff --git a/src/SPC/builder/unix/library/psl.php b/src/SPC/builder/unix/library/psl.php
deleted file mode 100644
index 11c1777c..00000000
--- a/src/SPC/builder/unix/library/psl.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace SPC\builder\unix\library;
-
-use SPC\util\executor\UnixAutoconfExecutor;
-
-trait psl
-{
-    protected function build(): void
-    {
-        UnixAutoconfExecutor::create($this)
-            ->optionalLib('idn2', ...ac_with_args('libidn2', true))
-            ->configure('--disable-nls')
-            ->make();
-        $this->patchPkgconfPrefix(['libpsl.pc']);
-        $this->patchLaDependencyPrefix();
-    }
-}