[cmake] Update static dependencies to fix build issues

CHANGES

@@ -1,8 +1,8 @@
-2021-10-27 : 2.3.1
+????-??-?? : 2.3.1
 	all : deprecated neko (see README)
 	std : fixed put_env when null is passed in (#229 https://github.com/HaxeFoundation/haxe/issues/10395)
-	cmake : updated apr version for Mac
-	all : fixed various build issues on macOS Catalina
+	all : fixed various build issues on macOS Catalina and Big Sur
+	cmake : update all dependencies
 
 2019-10-19 : 2.3.0
 	std : added socket_set_broadcast function (#190)

CMakeLists.txt

@@ -1,16 +1,17 @@
-cmake_minimum_required(VERSION 3.10.2)
+cmake_minimum_required(VERSION 3.14)
 
 if (NOT ${CMAKE_VERSION} VERSION_LESS 3.24)
 	cmake_policy(VERSION 3.24)
 elseif (NOT ${CMAKE_VERSION} VERSION_LESS 3.19)
 	cmake_policy(VERSION 3.19)
 endif()
 
+project(Neko C)
+
 include(GNUInstallDirs)
 include(CheckCCompilerFlag)
 include(CheckIncludeFile)
 include(TestBigEndian)
-project(Neko C)
 
 set(CMAKE_OSX_ARCHITECTURES x86_64)
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
@@ -55,7 +56,7 @@ option(WITH_REGEXP "Build with Perl-compatible regex support." ON)
 option(WITH_UI "Build with GTK-2 UI support." ON)
 option(WITH_SSL "Build with SSL support." ON)
 option(WITH_MYSQL "Build with MySQL support." ON)
-option(WITH_SQLITE "Build with Sqlite support." ON)
+option(WITH_SQLITE "Build with SQLite support." ON)
 option(WITH_APACHE "Build with Apache modules." ON)
 option(WITH_NEKOML "Build NekoML." ON)
 
@@ -110,7 +111,7 @@ set(external_deps
 	OpenSSL
 	MariaDBConnector
 	pcre2
-	Sqlite3
+	SQLite3
 	APR
 	APRutil
 	Apache
@@ -138,9 +139,6 @@ if (STATIC_DEPS STREQUAL "all")
 	if (WIN32)
 		list(REMOVE_ITEM STATIC_DEPS_ALL BoehmGC)
 	endif()
-	if (APPLE)
-		list(REMOVE_ITEM STATIC_DEPS_ALL APRutil)
-	endif()
 	set(STATIC_DEPS ${STATIC_DEPS_ALL} CACHE STRING "${STATIC_DEPS_DOC}" FORCE)
 elseif (STATIC_DEPS STREQUAL "none")
 	message(STATUS "set STATIC_DEPS to nothing")
@@ -152,8 +150,6 @@ else()
 			message(FATAL_ERROR "Invalid STATIC_DEPS. There is no ${dep} in the list of ${external_deps}")
 		elseif(WIN32 AND dep STREQUAL "BoehmGC")
 			message(FATAL_ERROR "Cannot link ${dep} statically on Windows")
-		elseif(APPLE AND dep STREQUAL "APRutil")
-			message(WARNING "${dep} is redundant as it was merged into APR in version 2.0, which is the version we build with on macOS.")
 		endif()
 	endforeach()
 endif()
@@ -189,11 +185,11 @@ if (RELOCATABLE)
 endif()
 
 if(UNIX AND NOT APPLE)
-	add_definitions(-DABI_ELF)
+	add_compile_definitions(ABI_ELF)
 endif()
 
 if(UNIX)
-	add_definitions(-D_GNU_SOURCE)
+	add_compile_definitions(_GNU_SOURCE)
 	add_compile_options(-fno-omit-frame-pointer)
 
 	set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)

README.md

@@ -115,11 +115,11 @@ Settings that allow to exclude libraries and their dependencies from the build;
 
 Default value: `all` for Windows, `none` otherwise
 
-It defines the dependencies that should be linked statically. Can be `all`, `none`, or a list of library names (e.g. `BoehmGC;Zlib;OpenSSL;MariaDBConnector;pcre2;Sqlite3;APR;APRutil;Apache;MbedTLS`).
+It defines the dependencies that should be linked statically. Can be `all`, `none`, or a list of library names (e.g. `BoehmGC;Zlib;OpenSSL;MariaDBConnector;pcre2;SQLite3;APR;APRutil;Apache;MbedTLS`).
 
 CMake will automatically download and build the specified dependencies into the build folder. If a library is not present in this list, it should be installed manually, and it will be linked dynamically.
 
-All third-party libraries, except GTK+2 (Linux) and BoehmGC on Windows, can be linked statically. We do not support statically linking GTK+2 due to the difficulty of building it and its own dependencies. Additionally, we do not support statically linking the BoehmGC library on Windows systems. Finally, on MacOS, APRutil cannot be linked statically as it has been merged with APR 2.0, which is used on MacOS builds.
+All third-party libraries, except GTK+2 (Linux) and BoehmGC on Windows, can be linked statically. We do not support statically linking GTK+2 due to the difficulty of building it and its own dependencies. Additionally, we do not support statically linking the BoehmGC library on Windows systems.
 
 #### `RELOCATABLE`
 

cmake/patch_apache.cmake

@@ -0,0 +1,26 @@
+# https://github.com/apache/httpd/commit/dd4561dd17a669a8c1757ada0ca875dfa840d0e7
+# https://github.com/apache/httpd/pull/343
+
+set(cmakelists ${apache_source}/CMakeLists.txt)
+
+file(READ ${cmakelists} content)
+
+string(REPLACE
+	"pcre2-8d.lib"
+	"pcre2-8-staticd.lib"
+	content "${content}"
+)
+
+string(REPLACE
+	"pcre2-8.lib"
+	"pcre2-8-static.lib"
+	content "${content}"
+)
+
+string(REPLACE
+	"\"-DHAVE_PCRE2\""
+	"\"-DHAVE_PCRE2 -DPCRE2_STATIC\""
+	content "${content}"
+)
+
+file(WRITE ${cmakelists} "${content}")

cmake/patch_apr-util.cmake

@@ -0,0 +1,28 @@
+# This is necessary so that the CMAKE_FIND_LIBRARY_SUFFIXES is preserved when
+# locating expat, since it gets reset when PROJECT is called
+
+set(cmakelists "${apr-util_source}/CMakeLists.txt")
+
+file(READ ${cmakelists} content)
+
+string(REPLACE
+"PROJECT(APR-Util C)
+
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+
+FIND_PACKAGE(OpenSSL)
+
+FIND_PACKAGE(EXPAT)"
+
+"CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+
+FIND_PACKAGE(OpenSSL)
+
+FIND_PACKAGE(EXPAT)
+
+PROJECT(APR-Util C)"
+
+	content "${content}"
+)
+
+file(WRITE ${cmakelists} "${content}")

cmake/patch_mariadb.cmake

@@ -4,23 +4,10 @@ set(cmakelists ${mariadb_source}/CMakeLists.txt)
 file(READ ${cmakelists} content)
 
 # do not use replace /MD with /MT
-string(REPLACE 
+string(REPLACE
 	"STRING(REPLACE \"/MD\" \"/MT\" COMPILER_FLAGS \${COMPILER_FLAGS})"
 	"# STRING(REPLACE \"/MD\" \"/MT\" COMPILER_FLAGS \${COMPILER_FLAGS})"
-	content ${content}
-)
-
-file(WRITE ${cmakelists} ${content})
-
-set(cmakelists ${mariadb_source}/cmake/ConnectorName.cmake)
-
-file(READ ${cmakelists} content)
-
-# Fix broken syntax on newer CMake
-string(REPLACE
-	"  END()"
-	"  ENDIF()"
-	content ${content}
+	content "${content}"
 )
 
-file(WRITE ${cmakelists} ${content})
+file(WRITE ${cmakelists} "${content}")