From nobody Sun Apr 30 18:44:54 2023 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q8ZyZ5dggz489WS; Sun, 30 Apr 2023 18:44:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q8ZyZ51d8z3v1Z; Sun, 30 Apr 2023 18:44:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682880294; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tbasPDVpyFBGc+X4pnnyMp4CVegX4yZ6E12w3uf9/jw=; b=YOLRPeAoF07xbSySqha4qkv5A1gnvUXb0vPNYF9iF1AHkBpdrYQrXp0xvCD9/I2xsbQibJ gvbjmKWpIrSnn4+myFv27C3feoK0Ts/YzTh3uKMO6EABppxVUPos/dGPn2G67UG3MbUrkF 888C29SlypgcWQSpKxO5wBATaPnS2Rf/Ogi5l9V/k4i6KhLLCZ3EFkzMjDSZm28hi1M6W5 /yUxXxUmBsZNEgeQCPQT8NjdFmECLM95ZThmCZAxdXw1VH32MuQFRy7gjG9SzWjh6jisb7 NXPFCPsecPKbLekzrb+3U33EO196rawnqFm6m5pAF7LE7U3XmG3jCp1gLcuLrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682880294; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tbasPDVpyFBGc+X4pnnyMp4CVegX4yZ6E12w3uf9/jw=; b=yJvHMXu4y0+aI3wthQapcq9itJ05TiP3cJgQ4zcmown1GCWqeeCBB0SVU8rq0ImHUS4Hry E3sBoDo2S3RXEBJlIMUxAm+OuMFSm4JlMDcd98rvUTF2JXI5N8dk2iVyWAnCcEgfhyWUqQ qh/BaZH3gUHZ+FXwYSQ5TWRZgSgXW5vdG9UjJ39eZUth3Rd5JxE7SvlY3EKhASBJBMvESB 8JVADpBQYqq0cQwZZB+nkdic8Ects1pVaeN+8F/RdDQJS/Kv3kG7q7iW5n3mN+EDoBMKbC Xn6tdNW7pNUM5G5J7IoF18nzC+mrIK6q60dtlL7wa2F61MVF7eX8sB/eGOZQUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682880294; a=rsa-sha256; cv=none; b=tTQbkimfjBwdfDb3D0wiNyl85zKQst/s9n5MreArfj5R1pj8rLXTxY6+ADldgBv7teCj5m mBiTECCxYqZYdFpHekCm8AbyxNcr+iHzt79JwxTVI5XpSHvZaB6A1UcJnzhSSuTwul1luo gZOPhxsqgG5doxGEn0UbDLGqDRyD7RxZ7TNy2o1UnPIbBm3EDoiQF7IqUa3Ukl5XT2Czzm lbcC+6pVnmX4V7Kp8QbDR37VBtnYKwMcIWceQHbAJsLdSN9LbSKrhV2oJOUZ+5GzdW6hJZ GIRnMpTGkUiVyD30+c0NsU+hBPbmiT4XbP2JNG7pT3l2C3jLUxSJk2vH37Q0Jg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q8ZyZ44fjzZhG; Sun, 30 Apr 2023 18:44:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33UIisjf044387; Sun, 30 Apr 2023 18:44:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33UIiscQ044386; Sun, 30 Apr 2023 18:44:54 GMT (envelope-from git) Date: Sun, 30 Apr 2023 18:44:54 GMT Message-Id: <202304301844.33UIiscQ044386@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Robert Clausecker Subject: git: 5e5a4225dc99 - 2023Q2 - devel/cmake-core: remove outdated FindOpenMP.cmake patch List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q2 X-Git-Reftype: branch X-Git-Commit: 5e5a4225dc993c5a939a8b3636362a6e0b4a3896 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q2 has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=5e5a4225dc993c5a939a8b3636362a6e0b4a3896 commit 5e5a4225dc993c5a939a8b3636362a6e0b4a3896 Author: Robert Clausecker AuthorDate: 2023-04-20 20:33:54 +0000 Commit: Robert Clausecker CommitDate: 2023-04-30 18:44:30 +0000 devel/cmake-core: remove outdated FindOpenMP.cmake patch This patch broke the build of any armv6/armv7 package that tried to use OpenMP. It was once appropriate, but is now no longer correct or needed. PR: 270954 MFH: 2023Q2 Approved by: ports-secteam (fluffy), adridg Tested by: portmgr (antoine, exp-run) (cherry picked from commit b13bdddc804511e345e66f152d0e62b689b63cbb) --- devel/cmake-core/Makefile | 1 + .../files/patch-Modules_FindOpenMP.cmake | 105 --------------------- 2 files changed, 1 insertion(+), 105 deletions(-) diff --git a/devel/cmake-core/Makefile b/devel/cmake-core/Makefile index 1c54ecdfe814..d00726e36fec 100644 --- a/devel/cmake-core/Makefile +++ b/devel/cmake-core/Makefile @@ -1,6 +1,7 @@ PORTNAME= cmake # Remember to update devel/cmake-doc and devel/cmake-gui as well. DISTVERSION= ${_CMAKE_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMESUFFIX= -core diff --git a/devel/cmake-core/files/patch-Modules_FindOpenMP.cmake b/devel/cmake-core/files/patch-Modules_FindOpenMP.cmake deleted file mode 100644 index 817b4abbb4c0..000000000000 --- a/devel/cmake-core/files/patch-Modules_FindOpenMP.cmake +++ /dev/null @@ -1,105 +0,0 @@ -Avoid looking for pthread by simply asserting that it is there. -Otherwise openmp can't be found because the pthread library -lives in /usr/lib and CMake 3.11 doesn't look there anymore -while looking for openmp. PR 223678. - -Look for omp.h in LOCALBASE and pass suitable -I and -L flags -if those are necessary. Also use OpenMP flags when linking. -PR 223678 and PR 234050. - ---- Modules/FindOpenMP.cmake.orig 2022-11-17 13:55:41 UTC -+++ Modules/FindOpenMP.cmake -@@ -97,6 +97,33 @@ cmake_policy(SET CMP0012 NEW) # if() recognizes number - cmake_policy(SET CMP0054 NEW) # if() quoted variables not dereferenced - cmake_policy(SET CMP0057 NEW) # if IN_LIST - -+set(OpenMP_pthread_LIBRARY -lpthread) -+ -+# If the compiler itself has support for OpenMP, then omp.h is hidden -+# away somewhere and it won't be found here; but if the support comes -+# from an external package, it needs to have the right -I and -L flags. -+find_file(_path_to_omp_h omp.h) -+if(NOT _path_to_omp_h) -+ find_file(_path_to_omp_h omp.h -+ HINTS $ENV{LOCALBASE}/include /usr/local/include) -+endif() -+if(_path_to_omp_h) -+ get_filename_component(OpenMP_INCLUDE_DIR ${_path_to_omp_h} DIRECTORY) -+else() -+ set(OpenMP_INCLUDE_DIR "omp_h-NOTFOUND") -+endif() -+ -+find_library(_path_to_omp_lib omp) -+if(NOT _path_to_omp_lib) -+ find_library(_path_to_omp_lib omp -+ PATHS $ENV{LOCALBASE}/lib /usr/local/lib) -+endif() -+if(_path_to_omp_lib) -+ get_filename_component(OpenMP_LIB_DIR ${_path_to_omp_lib} DIRECTORY) -+else() -+ set(OpenMP_LIB_DIR "omp_lib-NOTFOUND") -+endif() -+ - function(_OPENMP_FLAG_CANDIDATES LANG) - if(NOT OpenMP_${LANG}_FLAG) - unset(OpenMP_FLAG_CANDIDATES) -@@ -211,6 +238,15 @@ function(_OPENMP_GET_FLAGS LANG FLAG_MODE OPENMP_FLAG_ - if(OpenMP_VERBOSE_COMPILE_OPTIONS) - string(APPEND OPENMP_FLAGS_TEST " ${OpenMP_VERBOSE_COMPILE_OPTIONS}") - endif() -+ set(_extra_flag "") -+ if(OpenMP_INCLUDE_DIR) -+ string(APPEND _extra_flag " -I${OpenMP_INCLUDE_DIR}") -+ endif() -+ if(OpenMP_LIB_DIR) -+ string(APPEND _extra_flag " -L${OpenMP_LIB_DIR}") -+ endif() -+ set(_need_extra FALSE) -+ - string(REGEX REPLACE "[-/=+]" "" OPENMP_PLAIN_FLAG "${OPENMP_FLAG}") - try_compile( OpenMP_COMPILE_RESULT_${FLAG_MODE}_${OPENMP_PLAIN_FLAG} - SOURCE_FROM_VAR "${_OPENMP_TEST_SRC_NAME}" _OPENMP_TEST_SRC_CONTENT -@@ -219,8 +255,23 @@ function(_OPENMP_GET_FLAGS LANG FLAG_MODE OPENMP_FLAG_ - OUTPUT_VARIABLE OpenMP_TRY_COMPILE_OUTPUT - ) - -+ # Might need that -I -L after all.. -+ if(NOT OpenMP_COMPILE_RESULT_${FLAG_MODE}_${OPENMP_PLAIN_FLAG}) -+ unset(OpenMP_COMPILE_RESULT_${FLAG_MODE}_${OPENMP_PLAIN_FLAG}) -+ try_compile( OpenMP_COMPILE_RESULT_${FLAG_MODE}_${OPENMP_PLAIN_FLAG} ${CMAKE_BINARY_DIR} ${_OPENMP_TEST_SRC} -+ CMAKE_FLAGS "-DCOMPILE_DEFINITIONS:STRING=${OPENMP_FLAGS_TEST} ${_extra_flag}" -+ LINK_LIBRARIES ${CMAKE_${LANG}_VERBOSE_FLAG} -+ OUTPUT_VARIABLE OpenMP_TRY_COMPILE_OUTPUT -+ ) -+ set(_need_extra TRUE) -+ endif() -+ - if(OpenMP_COMPILE_RESULT_${FLAG_MODE}_${OPENMP_PLAIN_FLAG}) -- set("${OPENMP_FLAG_VAR}" "${OPENMP_FLAG}" PARENT_SCOPE) -+ if(_need_extra) -+ set("${OPENMP_FLAG_VAR}" "${OPENMP_FLAG} ${_extra_flag}" PARENT_SCOPE) -+ else() -+ set("${OPENMP_FLAG_VAR}" "${OPENMP_FLAG}" PARENT_SCOPE) -+ endif() - - if(CMAKE_${LANG}_VERBOSE_FLAG) - unset(OpenMP_${LANG}_IMPLICIT_LIBRARIES) -@@ -603,9 +654,16 @@ foreach(LANG IN LISTS OpenMP_FINDLIST) - add_library(OpenMP::OpenMP_${LANG} INTERFACE IMPORTED) - endif() - if(OpenMP_${LANG}_FLAGS) -- separate_arguments(_OpenMP_${LANG}_OPTIONS NATIVE_COMMAND "${OpenMP_${LANG}_FLAGS}") -+ # All the options except -L.. -+ separate_arguments(_OpenMP_${LANG}_COMPILE_OPTIONS NATIVE_COMMAND "${OpenMP_${LANG}_FLAGS}") -+ list(FILTER _OpenMP_${LANG}_COMPILE_OPTIONS EXCLUDE REGEX "^-L/") -+ # All the options except -I.. -+ separate_arguments(_OpenMP_${LANG}_LINK_OPTIONS NATIVE_COMMAND "${OpenMP_${LANG}_FLAGS}") -+ list(FILTER _OpenMP_${LANG}_LINK_OPTIONS EXCLUDE REGEX "^-I/") - set_property(TARGET OpenMP::OpenMP_${LANG} PROPERTY -- INTERFACE_COMPILE_OPTIONS "$<$:${_OpenMP_${LANG}_OPTIONS}>") -+ INTERFACE_COMPILE_OPTIONS "$<$:${_OpenMP_${LANG}_COMPILE_OPTIONS}>") -+ set_property(TARGET OpenMP::OpenMP_${LANG} PROPERTY -+ INTERFACE_LINK_OPTIONS "$<$:${_OpenMP_${LANG}_LINK_OPTIONS}>") - if(CMAKE_${LANG}_COMPILER_ID STREQUAL "Fujitsu" - OR ${CMAKE_${LANG}_COMPILER_ID} STREQUAL "IntelLLVM") - set_property(TARGET OpenMP::OpenMP_${LANG} PROPERTY