mirror of
https://git.freebsd.org/ports.git
synced 2025-05-14 00:01:52 -04:00
bef8e408ff
Qt 6.7 is out with lots of large and small improvements for all of us who like to have fun when building modern applications and user experiences, focusing on the expansion of supported platforms and industry standards. This makes code written with Qt more sustainable and brings more value in Qt as a long-term investment. www/qt6-webengine is now based on Chromium version 118.0.5993.220. Announcement: https://www.qt.io/blog/qt-6.7-released Release note: https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.7.0/release-note.md PySide6: Update to 6.7.0 PySide6 and its related components have been updated alongside the Qt release for compatibility. Older versions will not build with Qt 6.7.x. Announcement: https://www.qt.io/blog/qt-for-python-release-6.7 PyQt6: Update to 6.7.0 Minor Makefile cleanups and simplification of MASTER_SITES in pyqt.mk. As with PySide6, older versions of PyQt6 will not build with Qt 6.7.x. Announcement: https://www.riverbankcomputing.com/news/PyQt_v6.7.0_Released PR: 278658 Exp-run by: antoine MFH: 2024Q2 Security: e79cc4e2-12d7-11ef-83d8-4ccc6adda413, c6f03ea6-12de-11ef-83d8-4ccc6adda413
95 lines
4.1 KiB
CMake
95 lines
4.1 KiB
CMake
--- cmake/Functions.cmake.orig 2024-02-10 00:27:53 UTC
|
|
+++ cmake/Functions.cmake
|
|
@@ -416,7 +416,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}")
|
|
- if(LINUX OR ANDROID)
|
|
+ if(LINUX OR ANDROID OR FREEBSD)
|
|
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")
|
|
@@ -675,6 +675,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()
|
|
@@ -878,7 +880,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
|
|
@@ -932,7 +934,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
|
|
)
|
|
@@ -970,7 +972,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
|
|
@@ -1060,7 +1062,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"
|
|
@@ -1198,6 +1200,20 @@ function(add_gn_build_artifacts_to_target)
|
|
set_target_properties(${arg_CMAKE_TARGET} PROPERTIES
|
|
LINK_DEPENDS ${arg_BUILDDIR}/${config}/${arch}/${arg_NINJA_STAMP}
|
|
)
|
|
+ # For some reason when the build of QtWebEngine's "convert_dict" is
|
|
+ # completed the "convert_dict.stamp" isn't created.
|
|
+ #
|
|
+ # Work around this issue by creating "convert_dict.stamp" manually.
|
|
+ if(${arg_NINJA_TARGET} STREQUAL "convert_dict")
|
|
+ add_custom_command(
|
|
+ POST_BUILD
|
|
+ COMMENT "Add workaround for missing ${arg_NINJA_TARGET}.stamp file after build"
|
|
+ COMMAND ${CMAKE_COMMAND} -E touch ${buildDir}/${config}/${arch}/${arg_NINJA_TARGET}.stamp
|
|
+ TARGET ${target}
|
|
+ DEPENDS run_${module}_NinjaDone
|
|
+ USES_TERMINAL
|
|
+ )
|
|
+ endif()
|
|
if(QT_IS_MACOS_UNIVERSAL)
|
|
add_intermediate_archive(${target} ${arg_BUILDDIR}/${config}/${arch} ${arg_COMPLETE_STATIC})
|
|
elseif(IOS)
|
|
@@ -1313,7 +1329,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}")
|
|
@@ -1322,7 +1338,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)
|