Merge pull request #14973 from ZhouyihaiDing/windows_v1.11.x_pecl

PHP: fix php pecl installation error on windos
7 years ago · 7ad5d106e3
parent 1834a62878 d03dfd1a2e
commit 7ad5d106e3
2 changed files with 6 additions and 2 deletions
--- a/config.w32
+++ b/config.w32
@ -637,11 +637,13 @@ if (PHP_GRPC != "no") {
  EXTENSION("grpc", grpc_source, null,
    "/DOPENSSL_NO_ASM /D_GNU_SOURCE /DWIN32_LEAN_AND_MEAN "+
    "/D_HAS_EXCEPTIONS=0 /DNOMINMAX /DGRPC_ARES=0 /D_WIN32_WINNT=0x600 "+
+    "/DPB_FIELD_16BIT "+
    "/I"+configure_module_dirname+" "+
    "/I"+configure_module_dirname+"\\include "+
    "/I"+configure_module_dirname+"\\src\\php\\ext\\grpc "+
    "/I"+configure_module_dirname+"\\third_party\\boringssl\\include "+
-    "/I"+configure_module_dirname+"\\third_party\\zlib");
+    "/I"+configure_module_dirname+"\\third_party\\zlib "+
+    "/I"+configure_module_dirname+"\\third_party\\address_sorting\\include");

  base_dir = get_define('BUILD_DIR');
  FSO.CreateFolder(base_dir+"\\ext");
--- a/templates/config.w32.template
+++ b/templates/config.w32.template
@ -23,11 +23,13 @@
    EXTENSION("grpc", grpc_source, null,
      "/DOPENSSL_NO_ASM /D_GNU_SOURCE /DWIN32_LEAN_AND_MEAN "+
      "/D_HAS_EXCEPTIONS=0 /DNOMINMAX /DGRPC_ARES=0 /D_WIN32_WINNT=0x600 "+
+      "/DPB_FIELD_16BIT "+
      "/I"+configure_module_dirname+" "+
      "/I"+configure_module_dirname+"\\include "+
      "/I"+configure_module_dirname+"\\src\\php\\ext\\grpc "+
      "/I"+configure_module_dirname+"\\third_party\\boringssl\\include "+
-      "/I"+configure_module_dirname+"\\third_party\\zlib");
+      "/I"+configure_module_dirname+"\\third_party\\zlib "+
+      "/I"+configure_module_dirname+"\\third_party\\address_sorting\\include");
  <%
    dirs = {}
    for lib in libs: