ext/iconv: Fix iconv warnings on NetBSD and Solaris/illumos

Author: petk

cmake/ext/iconv/CMakeLists.txt

@@ -28,6 +28,7 @@ project(
   LANGUAGES C
 )
 
+include(CheckPrototypeDefinition)
 include(CheckSourceRuns)
 include(CheckSymbolExists)
 include(CMakeDependentOption)
@@ -279,6 +280,26 @@ if(TARGET Iconv::Iconv)
   else()
     message(CHECK_PASS "yes")
   endif()
+
+  # POSIX once had a bug in its specification and documented that iconv() has a
+  # const input parameter. Therefore, some platforms, such as NetBSD < 10 and
+  # Solaris/illumos, may have a non-standard iconv declaration. libiconv may
+  # imitate this on those platforms.
+  cmake_push_check_state(RESET)
+    set(CMAKE_REQUIRED_LIBRARIES Iconv::Iconv)
+
+    check_prototype_definition(
+      iconv
+      "size_t iconv(iconv_t cd, const char **src, size_t *srcleft, char **dst, size_t *dstleft)"
+      "0"
+      "iconv.h"
+      PHP_EXT_ICONV_CONST
+    )
+  cmake_pop_check_state()
+
+  if(PHP_EXT_ICONV_CONST)
+    target_compile_definitions(php_ext_iconv PRIVATE ICONV_CONST=const)
+  endif()
 endif()
 
 set(HAVE_ICONV TRUE)

patches/8.3/iconv.patch

@@ -0,0 +1,31 @@
+From: Peter Kokot <peterkokot@gmail.com>
+Subject: ext/iconv: Fix iconv prototype
+
+See:
+* https://github.com/php/php-src/issues/20089
+* https://github.com/php/php-src/pull/18933
+* https://github.com/php/php-src/pull/16847
+---
+ ext/iconv/iconv.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
+index 8ac3bc9b3c4..f11b8d74c63 100644
+--- a/ext/iconv/iconv.c
++++ b/ext/iconv/iconv.c
+@@ -44,6 +44,7 @@
+ #undef iconv
+ #endif
+ 
++#ifndef ICONV_CONST
+ #if defined(__NetBSD__)
+ // unfortunately, netbsd has still the old non posix conformant signature
+ // libiconv tends to match the eventual system's iconv too.
+@@ -51,6 +52,7 @@
+ #else
+ #define ICONV_CONST
+ #endif
++#endif
+ 
+ #include "zend_smart_str.h"
+ #include "ext/standard/base64.h"

patches/8.4/iconv.patch

@@ -0,0 +1,31 @@
+From: Peter Kokot <peterkokot@gmail.com>
+Subject: ext/iconv: Fix iconv prototype
+
+See:
+* https://github.com/php/php-src/issues/20089
+* https://github.com/php/php-src/pull/18933
+* https://github.com/php/php-src/pull/16847
+---
+ ext/iconv/iconv.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
+index b61d253c5d4..53423e9ce49 100644
+--- a/ext/iconv/iconv.c
++++ b/ext/iconv/iconv.c
+@@ -43,6 +43,7 @@
+ #undef iconv
+ #endif
+ 
++#ifndef ICONV_CONST
+ #if defined(__NetBSD__)
+ // unfortunately, netbsd has still the old non posix conformant signature
+ // libiconv tends to match the eventual system's iconv too.
+@@ -50,6 +51,7 @@
+ #else
+ #define ICONV_CONST
+ #endif
++#endif
+ 
+ #include "zend_smart_str.h"
+ #include "ext/standard/base64.h"

patches/8.5/iconv.patch

@@ -0,0 +1,31 @@
+From: Peter Kokot <peterkokot@gmail.com>
+Subject: ext/iconv: Fix iconv prototype
+
+See:
+* https://github.com/php/php-src/issues/20089
+* https://github.com/php/php-src/pull/18933
+* https://github.com/php/php-src/pull/16847
+---
+ ext/iconv/iconv.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
+index 2b19b1e3c78..3837c4b853c 100644
+--- a/ext/iconv/iconv.c
++++ b/ext/iconv/iconv.c
+@@ -43,6 +43,7 @@
+ #undef iconv
+ #endif
+ 
++#ifndef ICONV_CONST
+ #if defined(__NetBSD__) || (defined(__sun) && defined(__SVR4))
+ // unfortunately, netbsd has still the old non posix conformant signature
+ // libiconv tends to match the eventual system's iconv too.
+@@ -50,6 +51,7 @@
+ #else
+ #define ICONV_CONST
+ #endif
++#endif
+ 
+ #include "zend_smart_str.h"
+ #include "ext/standard/base64.h"

patches/8.6/iconv.patch

@@ -0,0 +1,31 @@
+From: Peter Kokot <peterkokot@gmail.com>
+Subject: ext/iconv: Fix iconv prototype
+
+See:
+* https://github.com/php/php-src/issues/20089
+* https://github.com/php/php-src/pull/18933
+* https://github.com/php/php-src/pull/16847
+---
+ ext/iconv/iconv.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
+index 7bf0c6d2340..c7928850e94 100644
+--- a/ext/iconv/iconv.c
++++ b/ext/iconv/iconv.c
+@@ -43,6 +43,7 @@
+ #undef iconv
+ #endif
+ 
++#ifndef ICONV_CONST
+ #if defined(__NetBSD__) || (defined(__sun) && defined(__SVR4))
+ // unfortunately, netbsd has still the old non posix conformant signature
+ // libiconv tends to match the eventual system's iconv too.
+@@ -50,6 +51,7 @@
+ #else
+ #define ICONV_CONST
+ #endif
++#endif
+ 
+ #include "zend_smart_str.h"
+ #include "ext/standard/base64.h"