3.0: skeleton - package config and code generator

bin/spc-alpine-docker

@@ -108,8 +108,7 @@ RUN apk update; \
         wget \
         xz \
         gettext-dev \
-        binutils-gold \
-        patchelf
+        binutils-gold
 
 RUN curl -#fSL https://dl.static-php.dev/static-php-cli/bulk/php-8.4.4-cli-linux-\$(uname -m).tar.gz | tar -xz -C /usr/local/bin && \
     chmod +x /usr/local/bin/php

bin/spc-gnu-docker

@@ -92,11 +92,6 @@ RUN echo "source scl_source enable devtoolset-10" >> /etc/bashrc
 RUN source /etc/bashrc
 RUN yum install -y which
 
-RUN curl -fsSL -o patchelf.tgz https://github.com/NixOS/patchelf/releases/download/0.18.0/patchelf-0.18.0-$SPC_USE_ARCH.tar.gz && \
-    mkdir -p /patchelf && \
-    tar -xzf patchelf.tgz -C /patchelf --strip-components=1 && \
-    cp /patchelf/bin/patchelf /usr/bin/
-
 RUN curl -o cmake.tgz -#fSL https://github.com/Kitware/CMake/releases/download/v3.31.4/cmake-3.31.4-linux-$SPC_USE_ARCH.tar.gz && \
     mkdir /cmake && \
     tar -xzf cmake.tgz -C /cmake --strip-components 1

config/artifact.json

@@ -1,135 +1,4 @@
 {
-    "vswhere": {
-        "binary": {
-            "windows-x86_64": {
-                "type": "url",
-                "url": "https://github.com/microsoft/vswhere/releases/download/3.1.7/vswhere.exe",
-                "extract": "{pkg_root_path}/bin/vswhere.exe"
-            }
-        }
-    },
-    "musl-wrapper": {
-        "source": "https://musl.libc.org/releases/musl-1.2.5.tar.gz"
-    },
-    "php-src": {
-        "source": {
-            "type": "php-release"
-        }
-    },
-    "php-sdk-binary-tools": {
-        "binary": {
-            "windows-x86_64": {
-                "type": "git",
-                "rev": "master",
-                "url": "https://github.com/php/php-sdk-binary-tools.git",
-                "extract": "{php_sdk_path}"
-            }
-        }
-    },
-    "go-xcaddy": {
-        "binary": "custom"
-    },
-    "musl-toolchain": {
-        "binary": {
-            "linux-x86_64": {
-                "type": "url",
-                "url": "https://dl.static-php.dev/static-php-cli/deps/musl-toolchain/x86_64-musl-toolchain.tgz",
-                "extract": "{pkg_root_path}/musl-toolchain"
-            },
-            "linux-aarch64": {
-                "type": "url",
-                "url": "https://dl.static-php.dev/static-php-cli/deps/musl-toolchain/aarch64-musl-toolchain.tgz",
-                "extract": "{pkg_root_path}/musl-toolchain"
-            }
-        }
-    },
-    "pkg-config": {
-        "source": "https://dl.static-php.dev/static-php-cli/deps/pkg-config/pkg-config-0.29.2.tar.gz",
-        "binary": {
-            "linux-x86_64": {
-                "type": "ghrel",
-                "repo": "static-php/static-php-cli-hosted",
-                "match": "pkg-config-aarch64-linux-musl-1.2.5.txz",
-                "extract": {
-                    "bin/pkg-config": "{pkg_root_path}/bin/pkg-config"
-                }
-            },
-            "linux-aarch64": {
-                "type": "ghrel",
-                "repo": "static-php/static-php-cli-hosted",
-                "match": "pkg-config-x86_64-linux-musl-1.2.5.txz",
-                "extract": {
-                    "bin/pkg-config": "{pkg_root_path}/bin/pkg-config"
-                }
-            },
-            "macos-x86_64": {
-                "type": "ghrel",
-                "repo": "static-php/static-php-cli-hosted",
-                "match": "pkg-config-x86_64-darwin.txz",
-                "extract": {
-                    "bin/pkg-config": "{pkg_root_path}/bin/pkg-config"
-                }
-            },
-            "macos-aarch64": {
-                "type": "ghrel",
-                "repo": "static-php/static-php-cli-hosted",
-                "match": "pkg-config-aarch64-darwin.txz",
-                "extract": "{pkg_root_path}"
-            }
-        }
-    },
-    "strawberry-perl": {
-        "binary": {
-            "windows-x86_64": {
-                "type": "url",
-                "url": "https://github.com/StrawberryPerl/Perl-Dist-Strawberry/releases/download/SP_5380_5361/strawberry-perl-5.38.0.1-64bit-portable.zip",
-                "extract": "{pkg_root_path}/strawberry-perl"
-            }
-        }
-    },
-    "upx": {
-        "binary": {
-            "linux-x86_64": {
-                "type": "ghrel",
-                "repo": "upx/upx",
-                "match": "upx.+-amd64_linux\\.tar\\.xz",
-                "extract": {
-                    "upx": "{pkg_root_path}/bin/upx"
-                }
-            },
-            "linux-aarch64": {
-                "type": "ghrel",
-                "repo": "upx/upx",
-                "match": "upx.+-arm64_linux\\.tar\\.xz",
-                "extract": {
-                    "upx": "{pkg_root_path}/bin/upx"
-                }
-            },
-            "windows-x86_64": {
-                "type": "ghrel",
-                "repo": "upx/upx",
-                "match": "upx.+-win64\\.zip",
-                "extract": {
-                    "upx.exe": "{pkg_root_path}/bin/upx.exe"
-                }
-            }
-        }
-    },
-    "zig": {
-        "binary": "custom"
-    },
-    "nasm": {
-        "binary": {
-            "windows-x86_64": {
-                "type": "url",
-                "url": "https://dl.static-php.dev/static-php-cli/deps/nasm/nasm-2.16.01-win64.zip",
-                "extract": {
-                    "nasm.exe": "{php_sdk_path}/bin/nasm.exe",
-                    "ndisasm.exe": "{php_sdk_path}/bin/ndisasm.exe"
-                }
-            }
-        }
-    },
     "amqp": {
         "source": {
             "type": "url",
@@ -395,6 +264,9 @@
             "repo": "guanzhi/GmSSL"
         }
     },
+    "go-xcaddy": {
+        "binary": "custom"
+    },
     "grpc": {
         "binary": "hosted",
         "source": {
@@ -733,13 +605,6 @@
             "extract": "php-src/ext/memcached"
         }
     },
-    "mimalloc": {
-        "source": {
-            "type": "ghtagtar",
-            "repo": "microsoft/mimalloc",
-            "match": "v2\\.\\d\\.[^3].*"
-        }
-    },
     "micro": {
         "source": {
             "type": "git",
@@ -748,6 +613,13 @@
             "url": "https://github.com/static-php/phpmicro"
         }
     },
+    "mimalloc": {
+        "source": {
+            "type": "ghtagtar",
+            "repo": "microsoft/mimalloc",
+            "match": "v2\\.\\d\\.[^3].*"
+        }
+    },
     "mongodb": {
         "source": {
             "type": "ghrel",
@@ -765,6 +637,35 @@
             "extract": "php-src/ext/msgpack"
         }
     },
+    "musl-toolchain": {
+        "binary": {
+            "linux-x86_64": {
+                "type": "url",
+                "url": "https://dl.static-php.dev/static-php-cli/deps/musl-toolchain/x86_64-musl-toolchain.tgz",
+                "extract": "{pkg_root_path}/musl-toolchain"
+            },
+            "linux-aarch64": {
+                "type": "url",
+                "url": "https://dl.static-php.dev/static-php-cli/deps/musl-toolchain/aarch64-musl-toolchain.tgz",
+                "extract": "{pkg_root_path}/musl-toolchain"
+            }
+        }
+    },
+    "musl-wrapper": {
+        "source": "https://musl.libc.org/releases/musl-1.2.5.tar.gz"
+    },
+    "nasm": {
+        "binary": {
+            "windows-x86_64": {
+                "type": "url",
+                "url": "https://dl.static-php.dev/static-php-cli/deps/nasm/nasm-2.16.01-win64.zip",
+                "extract": {
+                    "nasm.exe": "{php_sdk_path}/bin/nasm.exe",
+                    "ndisasm.exe": "{php_sdk_path}/bin/ndisasm.exe"
+                }
+            }
+        }
+    },
     "ncurses": {
         "binary": "hosted",
         "source": {
@@ -850,6 +751,56 @@
             "extract": "php-src/ext/pdo_sqlsrv"
         }
     },
+    "php-sdk-binary-tools": {
+        "binary": {
+            "windows-x86_64": {
+                "type": "git",
+                "rev": "master",
+                "url": "https://github.com/php/php-sdk-binary-tools.git",
+                "extract": "{php_sdk_path}"
+            }
+        }
+    },
+    "php-src": {
+        "source": {
+            "type": "php-release"
+        }
+    },
+    "pkg-config": {
+        "binary": {
+            "linux-x86_64": {
+                "type": "ghrel",
+                "repo": "static-php/static-php-cli-hosted",
+                "match": "pkg-config-aarch64-linux-musl-1.2.5.txz",
+                "extract": {
+                    "bin/pkg-config": "{pkg_root_path}/bin/pkg-config"
+                }
+            },
+            "linux-aarch64": {
+                "type": "ghrel",
+                "repo": "static-php/static-php-cli-hosted",
+                "match": "pkg-config-x86_64-linux-musl-1.2.5.txz",
+                "extract": {
+                    "bin/pkg-config": "{pkg_root_path}/bin/pkg-config"
+                }
+            },
+            "macos-x86_64": {
+                "type": "ghrel",
+                "repo": "static-php/static-php-cli-hosted",
+                "match": "pkg-config-x86_64-darwin.txz",
+                "extract": {
+                    "bin/pkg-config": "{pkg_root_path}/bin/pkg-config"
+                }
+            },
+            "macos-aarch64": {
+                "type": "ghrel",
+                "repo": "static-php/static-php-cli-hosted",
+                "match": "pkg-config-aarch64-darwin.txz",
+                "extract": "{pkg_root_path}"
+            }
+        },
+        "source": "https://dl.static-php.dev/static-php-cli/deps/pkg-config/pkg-config-0.29.2.tar.gz"
+    },
     "postgresql": {
         "source": {
             "type": "ghtagtar",
@@ -950,6 +901,15 @@
             "extract": "php-src/ext/sqlsrv"
         }
     },
+    "strawberry-perl": {
+        "binary": {
+            "windows-x86_64": {
+                "type": "url",
+                "url": "https://github.com/StrawberryPerl/Perl-Dist-Strawberry/releases/download/SP_5380_5361/strawberry-perl-5.38.0.1-64bit-portable.zip",
+                "extract": "{pkg_root_path}/strawberry-perl"
+            }
+        }
+    },
     "swoole": {
         "source": {
             "type": "ghtar",
@@ -982,6 +942,43 @@
             "version": "2.3.12"
         }
     },
+    "upx": {
+        "binary": {
+            "linux-x86_64": {
+                "type": "ghrel",
+                "repo": "upx/upx",
+                "match": "upx.+-amd64_linux\\.tar\\.xz",
+                "extract": {
+                    "upx": "{pkg_root_path}/bin/upx"
+                }
+            },
+            "linux-aarch64": {
+                "type": "ghrel",
+                "repo": "upx/upx",
+                "match": "upx.+-arm64_linux\\.tar\\.xz",
+                "extract": {
+                    "upx": "{pkg_root_path}/bin/upx"
+                }
+            },
+            "windows-x86_64": {
+                "type": "ghrel",
+                "repo": "upx/upx",
+                "match": "upx.+-win64\\.zip",
+                "extract": {
+                    "upx.exe": "{pkg_root_path}/bin/upx.exe"
+                }
+            }
+        }
+    },
+    "vswhere": {
+        "binary": {
+            "windows-x86_64": {
+                "type": "url",
+                "url": "https://github.com/microsoft/vswhere/releases/download/3.1.7/vswhere.exe",
+                "extract": "{pkg_root_path}/bin/vswhere.exe"
+            }
+        }
+    },
     "watcher": {
         "source": {
             "type": "ghtar",
@@ -1041,6 +1038,9 @@
             "extract": "php-src/ext/yaml"
         }
     },
+    "zig": {
+        "binary": "custom"
+    },
     "zlib": {
         "binary": "hosted",
         "source": {

config/env.ini

@@ -122,17 +122,20 @@ SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS="-g -fstack-protector-strong -fno-ident -fPIE
 ; EXTRA_LDFLAGS for `make` php, can use -release to set a soname for libphp.so
 SPC_CMD_VAR_PHP_MAKE_EXTRA_LDFLAGS=""
 
+; optional, path to openssl conf. This affects where openssl will look for the default CA.
+; default on Debian/Alpine: /etc/ssl, default on RHEL: /etc/pki/tls
+OPENSSLDIR=""
+
 [macos]
 ; build target: macho or macho (possibly we could support macho-universal in the future)
 ; Currently we do not support universal and cross-compilation for macOS.
 SPC_TARGET=native-macos
 ; compiler environments
-CC=${SPC_LINUX_DEFAULT_CC}
-CXX=${SPC_LINUX_DEFAULT_CXX}
-AR=${SPC_LINUX_DEFAULT_AR}
-LD=${SPC_LINUX_DEFAULT_LD}
+CC=clang
+CXX=clang++
+AR=ar
+LD=ld
 ; default compiler flags, used in CMake toolchain file, openssl and pkg-config build
-; this will be added to all CFLAGS and CXXFLAGS for the library builds
 SPC_DEFAULT_C_FLAGS="--target=${MAC_ARCH}-apple-darwin -Os"
 SPC_DEFAULT_CXX_FLAGS="--target=${MAC_ARCH}-apple-darwin -Os"
 SPC_DEFAULT_LD_FLAGS=""
@@ -150,3 +153,5 @@ SPC_CMD_PREFIX_PHP_CONFIGURE="./configure --prefix= --with-valgrind=no --enable-
 SPC_CMD_VAR_PHP_EMBED_TYPE="static"
 ; EXTRA_CFLAGS for `configure` and `make` php
 SPC_CMD_VAR_PHP_MAKE_EXTRA_CFLAGS="-g -fstack-protector-strong -fpic -fpie -Werror=unknown-warning-option ${SPC_DEFAULT_C_FLAGS}"
+; minimum compatible macOS version (LLVM vars, availability not guaranteed)
+MACOSX_DEPLOYMENT_TARGET=12.0