From 03cbb3ee58209014d00b8c92c146ef1ddff6e2f2 Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Tue, 8 Oct 2024 14:21:34 +0200 Subject: [PATCH] Build com_dotnet shared by default The official Windows builds and CI are doing this for ages, so it appears to be overdue to finally switch the actual default. Closes GH-16300. --- .github/scripts/windows/build_task.bat | 1 - UPGRADING | 5 +++++ ext/com_dotnet/config.w32 | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/scripts/windows/build_task.bat b/.github/scripts/windows/build_task.bat index ec4ce4459d0..7a2824e2997 100644 --- a/.github/scripts/windows/build_task.bat +++ b/.github/scripts/windows/build_task.bat @@ -36,7 +36,6 @@ set CFLAGS=/W1 /WX cmd /c configure.bat ^ --enable-snapshot-build ^ --disable-debug-pack ^ - --enable-com-dotnet=shared ^ --without-analyzer ^ --enable-object-out-dir=%PHP_BUILD_OBJ_DIR% ^ --with-php-build=%DEPS_DIR% ^ diff --git a/UPGRADING b/UPGRADING index 0a2eb286748..39db036a86a 100644 --- a/UPGRADING +++ b/UPGRADING @@ -147,6 +147,11 @@ PHP 8.5 UPGRADE NOTES PHP_RELEASE_VERSION are now always numbers. Previously, they have been strings for buildconf builds. +* COM: + . The extension is now build shared by default; previously it defaulted to a + static extension, although the official Windows binaries built a shared + extension. + * FFI: . It is no longer necessary to specify the library when using FFI::cdef() and FFI::load(). However, this convenience feature should not be used in diff --git a/ext/com_dotnet/config.w32 b/ext/com_dotnet/config.w32 index cc548ac48c7..ebd55b1b3f0 100644 --- a/ext/com_dotnet/config.w32 +++ b/ext/com_dotnet/config.w32 @@ -1,6 +1,6 @@ // vim:ft=javascript -ARG_ENABLE("com-dotnet", "COM and .Net support", "yes"); +ARG_ENABLE("com-dotnet", "COM and .Net support", "yes,shared"); if (PHP_COM_DOTNET == "yes") { CHECK_LIB('oleaut32.lib', 'com_dotnet');