From nobody Wed Jan 29 16:32:49 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 4Yjnkp24mVz5lWjb; Wed, 29 Jan 2025 16:32: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 4Yjnkp0q5mz3jtR; Wed, 29 Jan 2025 16:32:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738168370; 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=qDwgND7PYkPbZyxct3aNVcMiuffZoaf6X8YLKWVt+K8=; b=JdOhJ4a4FT/4Qx+knOWYfpjWKSBcxxwxeZ7tbIZ+iXY4diA5lPakgdRHxnBDTzft5TRSbf ojoYyOHqHVLRSiEZUWGJf9rfQQ12d1fOp/Uw4aLA1Z6cWtiSChnHIcOtz0Mcq2criBc7NH G6BK+Am4fVQ3kVYFOsy3CnQsrfIhXlsFkFJ+pIAYeVMgxqx8PmS3VNkUANgon2FZjoP6xy B29J/reLs4P621wnx+IJDumKgQyLvaZvJoZxdQoG/L/ivSnV8V0W1OBRQg7tC28nsxCnov icu8PJ9lsYlpDwukmI+IHmM4PmX2kjrk6UJInATj1DvyrSNZqlKKYlOFTYK/gw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738168370; 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=qDwgND7PYkPbZyxct3aNVcMiuffZoaf6X8YLKWVt+K8=; b=suJvzT/h8i9ulOejbgwKcpTjecAkH7l0dNUm83+BtSkkMlU1d+7zAWQO/rpvQSidQYOErU MPiikTMhStyEbfocW7YUOUUMfN0yDEz4YMfify+Af7XMUuoBdIKDPNkivQdZlNQDDOI8Md cf6hC+2kO/lH5NFabipsAtM4NwdZEsEn8Zaj8VpKmsasNze887fPnkYXqAuyVu7KyzYvGc 1Fa1X7lRfxbWsbNVYGUXpSPmTuH/JHd0H5EsiWc3UTmoO5EAYuhph8PA67ItYeDK8QD/Dz /z3x4W9F1fSs2sOlR33gG+f8eP2Hxs/rjJVoOsGM8lGFV3z4oVv++elO9H8LzQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738168370; a=rsa-sha256; cv=none; b=qJWV8UbNAfw2SaE0kOgkieCYQzmm0DVwEYLpuBrCe0DQsg8jwRx6JEA4CsR9uvh0ZoErxX o0nyimA12gD2CFr3VljvG/vBXt64wjnbe3PD32JztJh/VpoQl6sPfcvUVGEAlJT+jEOOC+ U1wucJjEzZBBz4u8IOff0B1nG92OelNWf6t9jXmLdT5PPsEmrIhP0uCwKsjOrS88r50RZj qAifXq5YZcaTyGNnPT2Vmv8CRV/bvn9MlCvhGLKzOyHuamKYSb/4dCTjpztWmirbVLL8m3 jlCFYwZl5irRjuhaISPvehVbonSH3qlCZI1OXlZgpXxu2wMX+vSRCUt90Xhgow== 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 4Yjnkp071Pz17ZC; Wed, 29 Jan 2025 16:32: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 50TGWn65099980; Wed, 29 Jan 2025 16:32:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50TGWn6c099977; Wed, 29 Jan 2025 16:32:49 GMT (envelope-from git) Date: Wed, 29 Jan 2025 16:32:49 GMT Message-Id: <202501291632.50TGWn6c099977@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: 9f3e54599328 - main - =?utf-8?Q?devel/ccache4: Update 4.9 =E2=86=92 4.10.2?= 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: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9f3e54599328a5ca357f46863a17ccb669fd03cf Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=9f3e54599328a5ca357f46863a17ccb669fd03cf commit 9f3e54599328a5ca357f46863a17ccb669fd03cf Author: Vladimir Druzenko AuthorDate: 2025-01-29 16:18:49 +0000 Commit: Vladimir Druzenko CommitDate: 2025-01-29 16:32:04 +0000 devel/ccache4: Update 4.9 → 4.10.2 Based on patches from Oleg Sidorkin and Älven. Improve port: - update required compiler version from 11 to 17; - update CONFLICTS_INSTALL; - update GNU_COMPILERS and CLANG_COMPILERS; - update dependencies; - improve STATIC and TEST options; - fix warnings from portclippy - sort options and etc. Changelogs: https://ccache.dev/releasenotes.html#_ccache_4_10_2 PR: 276854 283910 Approved by: bdrewery (maintainer, timeout 1 year) Tested by: Oleg Sidorkin (osidorkin@gmail.com), Älven (alster@vinterdalen.se) --- devel/ccache4/Makefile | 59 ++++++++++++++++++++++++++++---------------------- devel/ccache4/distinfo | 6 ++--- 2 files changed, 36 insertions(+), 29 deletions(-) diff --git a/devel/ccache4/Makefile b/devel/ccache4/Makefile index 3242b81260b4..3167605b554a 100644 --- a/devel/ccache4/Makefile +++ b/devel/ccache4/Makefile @@ -1,6 +1,6 @@ PORTNAME= ccache -DISTVERSION= 4.9 DISTVERSIONPREFIX= v +DISTVERSION= 4.10.2 CATEGORIES= devel PKGNAMESUFFIX= 4 @@ -11,48 +11,55 @@ WWW= https://ccache.dev/ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/GPL-3.0.txt -USES= cmake:noninja pathfix shebangfix compiler:c++11-lang -CONFLICTS_INSTALL?= ccache ccache-static \ - ccache-memcached ccache-memcached-static - -PORTDOCS= AUTHORS.adoc AUTHORS.html MANUAL.html MANUAL.adoc \ - NEWS.adoc NEWS.html - +USES= cmake:noninja compiler:c++17-lang pathfix shebangfix USE_GITHUB= yes -SUB_FILES= world-ccache ccache-update-links.sh ccache_clean -# Prevent infinite recursion. -NO_CCACHE_DEPEND= yes - -LIB_DEPENDS+= libzstd.so:archivers/zstd # /bin/bash -> /bin/sh to reduce tests dep. SHEBANG_FILES= test/* SHEBANG_GLOB= *.sh *.bash bash_CMD= /bin/sh +CMAKE_ARGS+= -D DEPS=LOCAL CMAKE_OFF= WARNINGS_AS_ERRORS \ ENABLE_IPO \ - ZSTD_FROM_INTERNET \ ENABLE_TRACING \ REDIS_STORAGE_BACKEND -OPTIONS_DEFINE= DOCS CLANGLINK LLVMLINK STATIC TEST -OPTIONS_DEFAULT=CLANGLINK LLVMLINK -OPTIONS_SUB= yes +CONFLICTS_INSTALL?= ccache ccache-static + +# Prevent infinite recursion. +NO_CCACHE_DEPEND= yes +SUB_FILES= ccache_clean ccache-update-links.sh world-ccache + +PORTDOCS= AUTHORS.adoc AUTHORS.html MANUAL.adoc MANUAL.html \ + NEWS.adoc NEWS.html + +OPTIONS_DEFINE= CLANGLINK DOCS LLVMLINK STATIC TEST +OPTIONS_DEFAULT= CLANGLINK LLVMLINK +OPTIONS_SUB= yes + +CLANGLINK_DESC= Create clang compiler links if clang is installed +LLVMLINK_DESC= Create llvm compiler links if llvm is installed DOCS_BUILD_DEPENDS= asciidoctor:textproc/rubygem-asciidoctor -DOCS_ALL_TARGET= all doc DOCS_USES= perl5 DOCS_CMAKE_BOOL= ENABLE_DOCUMENTATION +DOCS_ALL_TARGET= all doc -CLANGLINK_DESC= Create clang compiler links if clang is installed -LLVMLINK_DESC= Create llvm compiler links if llvm is installed - -STATIC_LDFLAGS= -static +STATIC_BUILD_DEPENDS= ${LOCALBASE}/lib/libzstd.a:archivers/zstd \ + ${LOCALBASE}/lib/libxxhash.a:devel/xxhash +STATIC_LIB_DEPENDS_OFF= libzstd.so:archivers/zstd \ + libfmt.so:devel/libfmt \ + libxxhash.so:devel/xxhash STATIC_CMAKE_BOOL= STATIC_LINK +STATIC_CMAKE_ON= -D DEP_BLAKE3=BUNDLED -D DEP_CPPHTTPLIB=BUNDLED \ + -D DEP_FMT=BUNDLED -D DEP_NONSTDSPAN=BUNDLED \ + -D DEP_TLEXPECTED=BUNDLED +STATIC_LDFLAGS= -static -TEST_CMAKE_BOOL=ENABLE_TESTING -TEST_TARGET= check +TEST_BUILD_DEPENDS= doctest>=2.4.6:devel/doctest +TEST_CMAKE_BOOL= ENABLE_TESTING +TEST_TARGET= check .include @@ -63,13 +70,13 @@ PLIST_SUB+= CCLINKDIR="${CCLINKDIR}" CCACHE_COMPILERS+= icc icpc .endif -GNU_COMPILERS+= 48 8 9 10 11 12 13 +GNU_COMPILERS+= 11 12 13 14 15 CCACHE_COMPILERS+= cc c++ CC gcc g++ ${GNU_COMPILERS:S|^|gcc|} \ ${GNU_COMPILERS:S|^|g++|} \ ${GNU_COMPILERS:S|^|cpp|} .if ${PORT_OPTIONS:MCLANGLINK} -CLANG_COMPILERS+= 10 11 12 13 14 15 16 17 -devel +CLANG_COMPILERS+= 11 12 13 14 15 16 17 18 19 -devel CCACHE_COMPILERS+= clang clang++ ${CLANG_COMPILERS:S|^|clang|} \ ${CLANG_COMPILERS:S|^|clang++|} \ ${CLANG_COMPILERS:S|^|cpp|} diff --git a/devel/ccache4/distinfo b/devel/ccache4/distinfo index dd75d9fb10ee..30a84bda2657 100644 --- a/devel/ccache4/distinfo +++ b/devel/ccache4/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1707011016 -SHA256 (ccache-ccache-v4.9_GH0.tar.gz) = 7333833c95d181b54ee66bd884c2c1b28f4aa683d9d0925e5126ba4b2f3beead -SIZE (ccache-ccache-v4.9_GH0.tar.gz) = 803357 +TIMESTAMP = 1721663686 +SHA256 (ccache-ccache-v4.10.2_GH0.tar.gz) = d22a4e59b58cdb3af5dd2a5a8fa3c40179bf35c985d17bc9bdeed2cffa3265be +SIZE (ccache-ccache-v4.10.2_GH0.tar.gz) = 675413