From nobody Fri Jan 24 15:20:50 2025 X-Original-To: dev-commits-ports-main@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 4YfhN239Qsz5lXmJ; Fri, 24 Jan 2025 15:20:50 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YfhN22c0bz3tBc; Fri, 24 Jan 2025 15:20:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737732050; 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=VSpkV+zb62pzRM9cZRlncF4h5mnjmAA6T+4oUNfCArM=; b=vEH7lnIAKrmRXf7nZoNX6Vbde8pEUCc3KetST8WEUW/gi3OT6nbJ8N6MbF26gX2SDAjuEr eu7pUI1WXg1JEvt90GAMieQxwWIvvORpX+eXw+ValpvkeT1sGITGVw4JEp8Mb+HSSqvfbG QNjBAG5Pgk6E91REhimerSOrZ/v17wS4GeEjsqPnqSWhIKEEAbzx78UelU9RgRkh5Noo6V nwHung6lS6cfQLgvZ4TQYg6WnbvAMvs603219f3NYpruFS5lHP6qArr3Mim8D32v0oAHEI 9COAYXwUlbCLfUzDy2/F09N4t3xR51gSdf8BozwJuYVXD3yL4je2yOXiStIFFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737732050; 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=VSpkV+zb62pzRM9cZRlncF4h5mnjmAA6T+4oUNfCArM=; b=OeUknRei377NJ4uzVDL/Q6LmJluWgun/A7IxuYL2gwvxyYXnvWblFJLzCFhZKvjbpEOx4h Yqb96qJYpMfmDEldYzyi9vIxtfTpuOFdAkff5nplvkwbs8IZpVwtHokfhl4fPp6NB18nU9 X1vz/kYZnbks+oq1ZanxMZs/Hwjmut8ljLPvtFUkOu5cRfvRmjTzCN+3Q/BwmtTEm85WKV 2CBVb+7eMqN3ifeVeKE3qLg+IpmVRuSyBJFaKxPz1rfKDhmiQuO+d3uUp+MF444zZh7ZSZ sBFgIX00aj6W9a6gE/vzCsZDEa28ZZ+omqXulWonaLuXs9tP1aVmoHVVUFtDEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737732050; a=rsa-sha256; cv=none; b=SBoej0dhT07tliTdSeH73ZumFQTcJIJTHbRxJ8srLBYhPO8FCdRsD4xz9pzfEndfaAL8WT ITea6dnEKaFM+RF8IJL+cprbBx8VjM8NQZokcDCcZLTgpuiQPBnSDBwT0HIUHN9YoJV0cZ L84LbdQwSNJyTxoF/GZB4kYpK9CJPp81idOTomY+gAdEGhMWTRRQ2orYz7QB7/LQRe1qUf iTBxLYuEwNcq8rQqvIsiUTZrqtQvd5kYJCjGjwT9KGcrkt2dZTxkLH9IV4uH+J5gnvXeFp VxWUSWXS8BO/Bg0RIi8Y1fWTXl7FU33I99ytwH2lj3Kirm1xuxShYlXFlfrsXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YfhN22BQNzVTf; Fri, 24 Jan 2025 15:20:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50OFKoph094509; Fri, 24 Jan 2025 15:20:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50OFKoAp094506; Fri, 24 Jan 2025 15:20:50 GMT (envelope-from git) Date: Fri, 24 Jan 2025 15:20:50 GMT Message-Id: <202501241520.50OFKoAp094506@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: a17666caba5a - main - devel/libdispatch: update to 6.0.3 release (+) List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a17666caba5a77f5582c5af7ec3c9139615f8fa6 Auto-Submitted: auto-generated The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=a17666caba5a77f5582c5af7ec3c9139615f8fa6 commit a17666caba5a77f5582c5af7ec3c9139615f8fa6 Author: Dima Panov AuthorDate: 2025-01-24 15:14:27 +0000 Commit: Dima Panov CommitDate: 2025-01-24 15:20:36 +0000 devel/libdispatch: update to 6.0.3 release (+) Use system libBlocksRuntime provided by LLVM/Compiler-RT instead of bundled one Install versioned dispatch library to better maintenance and visibility --- devel/libdispatch/Makefile | 2 +- devel/libdispatch/distinfo | 6 +++--- devel/libdispatch/files/patch-CMakeLists.txt | 13 ++++++++++++ ...ch-cmake_modules_DispatchCompilerWarnings.cmake | 8 ++++---- .../patch-cmake_modules_FindBlocksRuntime.cmake | 20 +++++++++++++++++++ devel/libdispatch/files/patch-src_CMakeLists.txt | 23 ++++++++++++++++++++-- devel/libdispatch/pkg-plist | 6 ++++-- 7 files changed, 66 insertions(+), 12 deletions(-) diff --git a/devel/libdispatch/Makefile b/devel/libdispatch/Makefile index a082726bcf5b..9e985699fd3c 100644 --- a/devel/libdispatch/Makefile +++ b/devel/libdispatch/Makefile @@ -1,5 +1,5 @@ PORTNAME= libdispatch -DISTVERSION= 5.10.1 +DISTVERSION= 6.0.3 PORTEPOCH= 1 CATEGORIES= devel diff --git a/devel/libdispatch/distinfo b/devel/libdispatch/distinfo index b4d34f8de82d..65560e992d63 100644 --- a/devel/libdispatch/distinfo +++ b/devel/libdispatch/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1723281605 -SHA256 (apple-swift-corelibs-libdispatch-5.10.1-swift-5.10.1-RELEASE_GH0.tar.gz) = affa3544b0fdb60f8f175bc0d2846177436d5848ef8ca73e3e560d23986f38b3 -SIZE (apple-swift-corelibs-libdispatch-5.10.1-swift-5.10.1-RELEASE_GH0.tar.gz) = 594770 +TIMESTAMP = 1737150009 +SHA256 (apple-swift-corelibs-libdispatch-6.0.3-swift-6.0.3-RELEASE_GH0.tar.gz) = 444c0de5fe18e148548a3f3b60b3bac3d4d586285c21064346c7ca17ed1d4fac +SIZE (apple-swift-corelibs-libdispatch-6.0.3-swift-6.0.3-RELEASE_GH0.tar.gz) = 595115 diff --git a/devel/libdispatch/files/patch-CMakeLists.txt b/devel/libdispatch/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..0460f0e62c51 --- /dev/null +++ b/devel/libdispatch/files/patch-CMakeLists.txt @@ -0,0 +1,13 @@ +--- CMakeLists.txt.orig 2024-06-13 00:13:26 UTC ++++ CMakeLists.txt +@@ -187,6 +187,10 @@ endif() + find_package(LibRT) + endif() + ++if(CMAKE_SYSTEM_NAME STREQUAL FreeBSD) ++ find_package(BlocksRuntime) ++endif() ++ + check_function_exists(_pthread_workqueue_init HAVE__PTHREAD_WORKQUEUE_INIT) + check_function_exists(getprogname HAVE_GETPROGNAME) + check_function_exists(mach_absolute_time HAVE_MACH_ABSOLUTE_TIME) diff --git a/devel/libdispatch/files/patch-cmake_modules_DispatchCompilerWarnings.cmake b/devel/libdispatch/files/patch-cmake_modules_DispatchCompilerWarnings.cmake index bc8ec4df8ca5..91a0b3738997 100644 --- a/devel/libdispatch/files/patch-cmake_modules_DispatchCompilerWarnings.cmake +++ b/devel/libdispatch/files/patch-cmake_modules_DispatchCompilerWarnings.cmake @@ -1,8 +1,8 @@ ---- cmake/modules/DispatchCompilerWarnings.cmake.orig 2021-09-17 04:54:52 UTC +--- cmake/modules/DispatchCompilerWarnings.cmake.orig 2024-06-13 00:13:26 UTC +++ cmake/modules/DispatchCompilerWarnings.cmake -@@ -2,7 +2,6 @@ else() - if("${CMAKE_C_SIMULATE_ID}" STREQUAL "MSVC") - # TODO: someone needs to provide the msvc equivalent warning flags +@@ -6,7 +6,6 @@ else() + # so that we can use __popcnt64 + add_compile_options($<$,$>:-fms-extensions>) else() - add_compile_options($<$,$>:-Werror>) add_compile_options($<$,$>:-Wall>) diff --git a/devel/libdispatch/files/patch-cmake_modules_FindBlocksRuntime.cmake b/devel/libdispatch/files/patch-cmake_modules_FindBlocksRuntime.cmake new file mode 100644 index 000000000000..1158b5c700ff --- /dev/null +++ b/devel/libdispatch/files/patch-cmake_modules_FindBlocksRuntime.cmake @@ -0,0 +1,20 @@ +--- cmake/modules/FindBlocksRuntime.cmake.orig 2024-06-13 00:13:26 UTC ++++ cmake/modules/FindBlocksRuntime.cmake +@@ -17,14 +17,14 @@ else() + else() + find_path(BlocksRuntime_INCLUDE_DIR + NAMES +- Blocks.h ++ Block.h + HINTS +- ${CMAKE_INSTALL_FULL_INCLUDEDIR}) ++ /usr/include ${CMAKE_INSTALL_FULL_INCLUDEDIR}) + find_library(BlocksRuntime_LIBRARIES + NAMES + BlocksRuntime libBlocksRuntime + HINTS +- ${CMAKE_INSTALL_FULL_LIBDIR}) ++ /usr/lib ${CMAKE_INSTALL_FULL_LIBDIR}) + + include(FindPackageHandleStandardArgs) + find_package_handle_standard_args(BlocksRuntime diff --git a/devel/libdispatch/files/patch-src_CMakeLists.txt b/devel/libdispatch/files/patch-src_CMakeLists.txt index ee85289310eb..5774cceae846 100644 --- a/devel/libdispatch/files/patch-src_CMakeLists.txt +++ b/devel/libdispatch/files/patch-src_CMakeLists.txt @@ -1,6 +1,14 @@ ---- src/CMakeLists.txt.orig 2021-09-17 04:54:52 UTC +--- src/CMakeLists.txt.orig 2024-06-13 00:13:26 UTC +++ src/CMakeLists.txt -@@ -127,7 +127,7 @@ target_compile_options(dispatch PRIVATE -fblocks) +@@ -1,6 +1,6 @@ if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin) + + if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin) +- add_subdirectory(BlocksRuntime) ++# add_subdirectory(BlocksRuntime) + endif() + + add_library(dispatch +@@ -145,7 +145,7 @@ target_compile_options(dispatch PRIVATE -fblocks) # FIXME(compnerd) add check for -fblocks? target_compile_options(dispatch PRIVATE -fblocks) @@ -9,3 +17,14 @@ if (C_SUPPORTS_OMIT_LEAF_FRAME_POINTER) target_compile_options(dispatch PRIVATE -momit-leaf-frame-pointer) endif() +@@ -176,6 +176,10 @@ if(NOT CMAKE_SYSTEM_NAME MATCHES "Darwin|Windows") + + if(NOT CMAKE_SYSTEM_NAME MATCHES "Darwin|Windows") + set_target_properties(dispatch PROPERTIES INSTALL_RPATH "$ORIGIN") ++ set_target_properties(dispatch PROPERTIES ++ VERSION ${PROJECT_VERSION} ++ SOVERSION ${PROJECT_VERSION_MAJOR} ++ EXPORT_NAME dispatch ) + endif() + + if(ENABLE_SWIFT) diff --git a/devel/libdispatch/pkg-plist b/devel/libdispatch/pkg-plist index 33b2867e0f47..5443b321d338 100644 --- a/devel/libdispatch/pkg-plist +++ b/devel/libdispatch/pkg-plist @@ -1,4 +1,4 @@ -include/Block.h +@comment include/Block.h include/dispatch/base.h include/dispatch/block.h include/dispatch/data.h @@ -16,8 +16,10 @@ include/os/generic_base.h include/os/generic_unix_base.h include/os/generic_win_base.h include/os/object.h -lib/libBlocksRuntime.so +@comment lib/libBlocksRuntime.so lib/libdispatch.so +lib/libdispatch.so.1 +lib/libdispatch.so.1.3 share/man/man3/dispatch.3.gz share/man/man3/dispatch_after.3.gz share/man/man3/dispatch_api.3.gz