Fix main/build-defs.h further

petk · petk · commit 9b9001f10641 · 2025-06-08T00:33:42.000+02:00
diff --git a/cmake/ext/odbc/CMakeLists.txt b/cmake/ext/odbc/CMakeLists.txt
@@ -389,7 +389,7 @@ if(NOT PHP_EXT_ODBC_TYPE MATCHES "^(dbmaker|solid)$")
   set(HAVE_SQLDATASOURCES TRUE)
 endif()
 
-if(TARGET ODBC::ODBC)
+if(TARGET ODBC::ODBC AND NOT ODBC_DRIVER STREQUAL "Windows")
   block(PROPAGATE PHP_ODBC_BUILD_DEFINITIONS_CODE)
     get_target_property(definitions ODBC::ODBC INTERFACE_COMPILE_DEFINITIONS)
     get_target_property(options ODBC::ODBC INTERFACE_COMPILE_OPTIONS)
@@ -425,36 +425,18 @@ if(TARGET ODBC::ODBC)
     list(JOIN ldflags " " ldflags)
     list(JOIN libs " " libs)
 
-    set(PHP_ODBC_CFLAGS "${cflags}")
-    set(PHP_ODBC_LFLAGS "${ldflags}")
-    set(PHP_ODBC_LIBS "${libs}")
-    set(PHP_ODBC_TYPE "${PHP_ODBC_TYPE}")
-
-    set(PHP_ODBC_BUILD_DEFINITIONS_CODE "")
-
-    if(NOT ODBC_DRIVER STREQUAL "Windows")
-      set(
-        PHP_ODBC_BUILD_DEFINITIONS_CODE
-        [[
+    string(CONFIGURE [[
 /* The compile options that PHP odbc extension was built with. */
-#define PHP_ODBC_CFLAGS "@PHP_ODBC_CFLAGS@"
+#define PHP_ODBC_CFLAGS "@cflags@"
 
 /* The linker flags that PHP odbc extension was built with. */
-#define PHP_ODBC_LFLAGS "@PHP_ODBC_LFLAGS@"
+#define PHP_ODBC_LFLAGS "@ldflags@"
 
 /* The libraries linker flags that PHP odbc extension was built with. */
-#define PHP_ODBC_LIBS "@PHP_ODBC_LIBS@"
+#define PHP_ODBC_LIBS "@libs@"
 
 /* The ODBC library used in the PHP odbc extension. */
-#define PHP_ODBC_TYPE "@PHP_ODBC_TYPE@"]]
-      )
-
-      string(
-        CONFIGURE
-        "${PHP_ODBC_BUILD_DEFINITIONS_CODE}"
-        PHP_ODBC_BUILD_DEFINITIONS_CODE
-      )
-    endif()
+#define PHP_ODBC_TYPE "@PHP_ODBC_TYPE@"]] PHP_ODBC_BUILD_DEFINITIONS_CODE)
   endblock()
 endif()
 
diff --git a/cmake/main/CMakeLists.txt b/cmake/main/CMakeLists.txt
@@ -262,10 +262,14 @@ function(_php_main_create_files)
   )
 
   # Set the directory where php.ini is looked for.
-  set(
-    EXPANDED_PHP_CONFIG_FILE_PATH
-    "$<PATH:ABSOLUTE_PATH,NORMALIZE,${PHP_CONFIG_FILE_PATH},${CMAKE_INSTALL_PREFIX}>"
-  )
+  if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
+    set(EXPANDED_PHP_CONFIG_FILE_PATH "")
+  else()
+    set(
+      EXPANDED_PHP_CONFIG_FILE_PATH
+      "$<PATH:ABSOLUTE_PATH,NORMALIZE,${PHP_CONFIG_FILE_PATH},${CMAKE_INSTALL_PREFIX}>"
+    )
+  endif()
 
   # Set the directory where additional ini files are searched for.
   set(
@@ -283,10 +287,14 @@ function(_php_main_create_files)
     "$<PATH:ABSOLUTE_PATH,NORMALIZE,${CMAKE_INSTALL_SBINDIR},${CMAKE_INSTALL_PREFIX}>"
   )
 
-  set(
-    EXPANDED_MANDIR
-    "$<PATH:ABSOLUTE_PATH,NORMALIZE,${CMAKE_INSTALL_MANDIR},${CMAKE_INSTALL_PREFIX}>"
-  )
+  if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
+    set(EXPANDED_MANDIR "")
+  else()
+    set(
+      EXPANDED_MANDIR
+      "$<PATH:ABSOLUTE_PATH,NORMALIZE,${CMAKE_INSTALL_MANDIR},${CMAKE_INSTALL_PREFIX}>"
+    )
+  endif()
 
   set(
     EXPANDED_LIBDIR
@@ -303,7 +311,7 @@ function(_php_main_create_files)
   set(prefix "${CMAKE_INSTALL_PREFIX}")
 
   # Set shared library object extension.
-  string(REPLACE "." "" SHLIB_DL_SUFFIX_NAME ${CMAKE_SHARED_MODULE_SUFFIX})
+  string(REPLACE "." "" SHLIB_DL_SUFFIX_NAME "${CMAKE_SHARED_MODULE_SUFFIX}")
 
   if(PHP_DEFAULT_SHORT_OPEN_TAG)
     set(DEFAULT_SHORT_OPEN_TAG "1")
@@ -346,20 +354,32 @@ function(_php_main_create_files)
   if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
     set(PHP_CONFIG_H_WINDOWS 1)
     set(file config.w32.h)
+    set(PHP_SHLIB_EXT_PREFIX "php_")
   else()
+    set(PHP_CONFIG_H_WINDOWS 0)
+    set(file php_config.h)
+    set(HAVE_BUILD_DEFS_H TRUE)
+    set(PHP_SHLIB_EXT_PREFIX "")
+  endif()
+
+  file(READ main/cmake/build-defs.h.in PHP_BUILD_DEFINITIONS_CODE)
+  string(CONFIGURE "${PHP_BUILD_DEFINITIONS_CODE}" PHP_BUILD_DEFINITIONS_CODE @ONLY)
+
+  # Add build system configuration.
+  if(NOT CMAKE_SYSTEM_NAME STREQUAL "Windows")
     message(STATUS "Creating main/build-defs.h")
-    file(READ main/cmake/build-defs.h.in content)
-    string(CONFIGURE "${content}" content @ONLY)
 
     # To be able to evaluate the generator expressions.
     file(
       GENERATE
       # TODO: Multi-config generators need to write separate files.
       #OUTPUT $<CONFIG>/main/build-defs.h
       OUTPUT main/build-defs.h
-      CONTENT "${content}"
+      CONTENT "${PHP_BUILD_DEFINITIONS_CODE}"
     )
 
+    set(PHP_BUILD_DEFINITIONS_CODE "")
+
     #[[
     TODO: This enables regenerating the build-defs.h file on the install step
     when using different install prefix at the 'cmake --install ... --prefix'
@@ -389,10 +409,6 @@ function(_php_main_create_files)
     add_custom_target(php_main_build_defs_h DEPENDS ${PHP_BINARY_DIR}/main/build-defs.h)
     add_dependencies(php_main php_main_build_defs_h)
     #]]
-
-    set(HAVE_BUILD_DEFS_H TRUE)
-    set(PHP_CONFIG_H_WINDOWS 0)
-    set(file php_config.h)
   endif()
 
   message(STATUS "Creating main/${file}")
diff --git a/cmake/main/cmake/build-defs.h.in b/cmake/main/cmake/build-defs.h.in
@@ -1,54 +1,68 @@
-/* This file contains PHP build definitions. */
+/* The following build system related configuration values are on *nix
+   systems defined in the main/build-defs.h header and JScript Windows
+   build system defines them in the configuration header file
+   (main/config.w32.h). On *nix systems these are provided as a separate
+   header file aiming to simplify the (re)building phase when multiple
+   configurations are used. For example, using one installation prefix for
+   the stage installation directory and the other for production. */
 
 /* Command used for configuring PHP at build phase. */
 #define CONFIGURE_COMMAND "@CONFIGURE_COMMAND@"
 
-/* The path to the sendmail program. */
-#define PHP_PROG_SENDMAIL "@PROG_SENDMAIL@"
-
 /* The path to the PEAR installation directory. */
 #define PEAR_INSTALLDIR "@EXPANDED_PEAR_INSTALLDIR@"
 
-/* The default PHP include_path INI directive configuration. */
-#define PHP_INCLUDE_PATH "@INCLUDE_PATH@"
+/* The path to the directory containing command-line executables (bin). */
+#define PHP_BINDIR "@EXPANDED_BINDIR@"
 
-/* The path to the directory containing PHP extensions. */
-#define PHP_EXTENSION_DIR "@EXPANDED_EXTENSION_DIR@"
+/* The path to the directory in which PHP looks for the php.ini
+   configuration file.  On Windows this macro isn't utilized in the C
+   code. */
+#define PHP_CONFIG_FILE_PATH "@EXPANDED_PHP_CONFIG_FILE_PATH@"
 
-/* The installation prefix used when installing PHP. */
-#define PHP_PREFIX "@prefix@"
+/* The path to the directory where PHP scans for additional INI
+   configuration files. */
+#define PHP_CONFIG_FILE_SCAN_DIR "@EXPANDED_PHP_CONFIG_FILE_SCAN_DIR@"
 
-/* The path to the directory containing command-line executables (bin). */
-#define PHP_BINDIR "@EXPANDED_BINDIR@"
+/* The path to the directory containing architecture-independent data
+   (share). */
+#define PHP_DATADIR "@EXPANDED_DATADIR@"
 
-/* The path to the directory containing system admin executables (sbin). */
-#define PHP_SBINDIR "@EXPANDED_SBINDIR@"
+/* The default path to the directory containing dynamically loadable PHP
+   extensions. */
+#define PHP_EXTENSION_DIR "@EXPANDED_EXTENSION_DIR@"
 
-/* The path to the directory containing man documentation. */
-#define PHP_MANDIR "@EXPANDED_MANDIR@"
+/* The default 'include_path' PHP INI directive. */
+#define PHP_INCLUDE_PATH "@INCLUDE_PATH@"
 
-/* The path to the directory containing system libraries. */
+/* The path to the directory containing system libraries (lib, lib64,
+   etc.). */
 #define PHP_LIBDIR "@EXPANDED_LIBDIR@"
 
-/* The path to the directory containing architecture-independent data. */
-#define PHP_DATADIR "@EXPANDED_DATADIR@"
+/* The path to the directory containing modifiable single-machine data
+   (var). */
+#define PHP_LOCALSTATEDIR "@EXPANDED_LOCALSTATEDIR@"
 
-/* The path to the directory containing read-only single-machine data. */
-#define PHP_SYSCONFDIR "@EXPANDED_SYSCONFDIR@"
+/* The path to the directory containing man documentation. */
+#cmakedefine PHP_MANDIR "@EXPANDED_MANDIR@"
 
-/* The path to the directory containing modifiable single-machine data. */
-#define PHP_LOCALSTATEDIR "@EXPANDED_LOCALSTATEDIR@"
+/* The PHP installation prefix. */
+#define PHP_PREFIX "@prefix@"
 
-/* The path to the directory in which PHP looks for php.ini configuration
-   file. */
-#define PHP_CONFIG_FILE_PATH "@EXPANDED_PHP_CONFIG_FILE_PATH@"
+/* The path to the sendmail program. */
+#if !@PHP_CONFIG_H_WINDOWS@
+# define PHP_PROG_SENDMAIL "@PROG_SENDMAIL@"
+#endif
 
-/* The path to the directory where PHP scans for additional INI configuration
-   files. */
-#define PHP_CONFIG_FILE_SCAN_DIR "@EXPANDED_PHP_CONFIG_FILE_SCAN_DIR@"
+/* The path to the directory containing system admin executables (sbin). */
+#define PHP_SBINDIR "@EXPANDED_SBINDIR@"
+
+/* The filename prefix for the shared PHP extensions. */
+#define PHP_SHLIB_EXT_PREFIX "@PHP_SHLIB_EXT_PREFIX@"
 
-/* The file extension of the shared PHP extensions (.so, .dll, etc.). */
+/* The file extension of the shared PHP extensions ('so', 'dll'). */
 #define PHP_SHLIB_SUFFIX "@SHLIB_DL_SUFFIX_NAME@"
 
-/* The prefix for the shared library objects. */
-#define PHP_SHLIB_EXT_PREFIX ""
+/* The path to the directory containing read-only single-machine data
+   (etc). */
+#define PHP_SYSCONFDIR "@EXPANDED_SYSCONFDIR@"
diff --git a/cmake/main/cmake/php_config.h.in b/cmake/main/cmake/php_config.h.in
@@ -704,52 +704,7 @@
 @ZEND_CONFIGURATION@
 
 #if @PHP_CONFIG_H_WINDOWS@
-/* The following build system related configuration values are on *nix
-   systems defined in the main/build-defs.h and JScript Windows build system
-   defines them in the configuration header file. */
-
-/* Configure line */
-# cmakedefine CONFIGURE_COMMAND "@CONFIGURE_COMMAND@"
-
-/* The PEAR installation directory. */
-# define PEAR_INSTALLDIR "@EXPANDED_PEAR_INSTALLDIR@"
-
-/* The path to the bin directory. */
-# define PHP_BINDIR "@EXPANDED_BINDIR@"
-
-/* The path in which to look for php.ini. On Windows this macro isn't
-   utilized in the C code. */
-# define PHP_CONFIG_FILE_PATH ""
-
-/* The path where to scan for additional INI configuration files. */
-# define PHP_CONFIG_FILE_SCAN_DIR "@EXPANDED_PHP_CONFIG_FILE_SCAN_DIR@"
-
-/* The path to the share directory. */
-# define PHP_DATADIR "@EXPANDED_DATADIR@"
-
-/* Default directory for dynamically loadable PHP extensions. */
-# define PHP_EXTENSION_DIR "@EXPANDED_EXTENSION_DIR@"
-
-/* The 'include_path' PHP INI directive. */
-# define PHP_INCLUDE_PATH "@INCLUDE_PATH@"
-
-/* The path containing system libraries (lib or lib64). */
-# define PHP_LIBDIR "@EXPANDED_LIBDIR@"
-
-/* The path to the var directory. */
-# define PHP_LOCALSTATEDIR "@EXPANDED_LOCALSTATEDIR@"
-
-/* The installation prefix. */
-# define PHP_PREFIX "@prefix@"
-
-/* The prefix for the shared library objects. */
-# define PHP_SHLIB_EXT_PREFIX "php_"
-
-/* The file extension of the shared PHP extensions (.so, .dll, etc.). */
-# define PHP_SHLIB_SUFFIX "@SHLIB_DL_SUFFIX_NAME@"
-
-/* The path to the etc directory. */
-# define PHP_SYSCONFDIR "@EXPANDED_SYSCONFDIR@"
+@PHP_BUILD_DEFINITIONS_CODE@
 
 # if __has_include("main/config.pickle.h")
 #  include "main/config.pickle.h"
