diff options
Diffstat (limited to 'www/qt6-webengine/files/patch-cmake_Functions.cmake')
| -rw-r--r-- | www/qt6-webengine/files/patch-cmake_Functions.cmake | 69 |
1 files changed, 3 insertions, 66 deletions
diff --git a/www/qt6-webengine/files/patch-cmake_Functions.cmake b/www/qt6-webengine/files/patch-cmake_Functions.cmake index e158ced72b96..8264af9b3658 100644 --- a/www/qt6-webengine/files/patch-cmake_Functions.cmake +++ b/www/qt6-webengine/files/patch-cmake_Functions.cmake @@ -1,6 +1,6 @@ ---- cmake/Functions.cmake.orig 2024-10-02 15:40:01 UTC +--- cmake/Functions.cmake.orig 2025-05-29 01:27:28 UTC +++ cmake/Functions.cmake -@@ -416,7 +416,7 @@ function(add_linker_options target buildDir completeSt +@@ -103,7 +103,7 @@ function(add_linker_options target buildDir completeSt set(libs_rsp "${buildDir}/${ninjaTarget}_libs.rsp") set(ldir_rsp "${buildDir}/${ninjaTarget}_ldir.rsp") set_target_properties(${cmakeTarget} PROPERTIES STATIC_LIBRARY_OPTIONS "@${objects_rsp}") @@ -9,52 +9,7 @@ get_gn_arch(cpu ${TEST_architecture_arch}) if(CMAKE_CROSSCOMPILING AND cpu STREQUAL "arm" AND ${config} STREQUAL "Debug") target_link_options(${cmakeTarget} PRIVATE "LINKER:--long-plt") -@@ -676,6 +676,8 @@ function(get_gn_os result) - set(${result} "mac" PARENT_SCOPE) - elseif(IOS) - set(${result} "ios" PARENT_SCOPE) -+ elseif(FREEBSD) -+ set(${result} "freebsd" PARENT_SCOPE) - else() - message(DEBUG "Unrecognized OS") - endif() -@@ -879,7 +881,7 @@ macro(append_build_type_setup) - - extend_gn_list(gnArgArg - ARGS enable_precompiled_headers -- CONDITION BUILD_WITH_PCH AND NOT LINUX -+ CONDITION BUILD_WITH_PCH AND NOT LINUX AND NOT FREEBSD - ) - extend_gn_list(gnArgArg - ARGS dcheck_always_on -@@ -939,7 +941,7 @@ macro(append_compiler_linker_sdk_setup) - use_libcxx=true - ) - endif() -- if(DEFINED QT_FEATURE_stdlib_libcpp AND LINUX) -+ if(DEFINED QT_FEATURE_stdlib_libcpp AND (LINUX OR FREEBSD)) - extend_gn_list(gnArgArg ARGS use_libcxx - CONDITION QT_FEATURE_stdlib_libcpp - ) -@@ -977,7 +979,7 @@ macro(append_compiler_linker_sdk_setup) - ) - endif() - get_gn_arch(cpu ${TEST_architecture_arch}) -- if(LINUX AND CMAKE_CROSSCOMPILING AND cpu STREQUAL "arm") -+ if((LINUX OR FREEBSD) AND CMAKE_CROSSCOMPILING AND cpu STREQUAL "arm") - - extend_gn_list_cflag(gnArgArg - ARG arm_tune -@@ -1067,7 +1069,7 @@ macro(append_toolchain_setup) - host_cpu="${cpu}" - ) - endif() -- elseif(LINUX) -+ elseif(LINUX OR FREEBSD) - get_gn_arch(cpu ${TEST_architecture_arch}) - list(APPEND gnArgArg - custom_toolchain="${buildDir}/target_toolchain:target" -@@ -1205,6 +1207,20 @@ function(add_gn_build_artifacts_to_target) +@@ -370,6 +370,20 @@ function(add_gn_build_artifacts_to_target) set_target_properties(${arg_CMAKE_TARGET} PROPERTIES LINK_DEPENDS ${arg_BUILDDIR}/${config}/${arch}/${arg_NINJA_STAMP} ) @@ -75,21 +30,3 @@ if(QT_IS_MACOS_UNIVERSAL) add_intermediate_archive(${target} ${arg_BUILDDIR}/${config}/${arch} ${arg_COMPLETE_STATIC}) elseif(IOS) -@@ -1331,7 +1347,7 @@ function(check_for_ulimit) - - function(check_for_ulimit) - message("-- Checking 'ulimit -n'") -- execute_process(COMMAND bash -c "ulimit -n" -+ execute_process(COMMAND sh -c "ulimit -n" - OUTPUT_VARIABLE ulimitOutput - ) - string(REGEX MATCHALL "[0-9]+" limit "${ulimitOutput}") -@@ -1340,7 +1356,7 @@ function(check_for_ulimit) - if(NOT ${CMAKE_VERSION} VERSION_LESS "3.21.0") - message(" -- Creating linker launcher") - file(GENERATE OUTPUT ${PROJECT_BINARY_DIR}/linker_ulimit.sh -- CONTENT "#!/bin/bash\nulimit -n 4096\nexec \"$@\"" -+ CONTENT "#!/bin/sh\nulimit -n 4096\nexec \"$@\"" - FILE_PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ - ) - set(COIN_BUG_699 ON PARENT_SCOPE) |