From nobody Wed Apr 05 20:03:04 2023 X-Original-To: dev-commits-ports-all@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 4PsFtJ513nz4454M; Wed, 5 Apr 2023 20:03:04 +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 4PsFtJ3ygmz4Kn6; Wed, 5 Apr 2023 20:03:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680724984; 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=QxbhiCgDWfQnE175H4g6eMjle9cezg19toglQ6qGB1E=; b=f2DzF8zSForAR0HBGQA+1X2PrLhcGtmPxDTTzY94h3yhZGWeGcm9HXQnNWqZG1VY+gFBEn ydnUaNfciLuh7tGx2cjTpTAUayCK3wmQH/PCchvZ7mGJOzodYUfJu81EW5JPhwZWoAW1E2 GQEmLmSTGtuW7700pxP7udNGeNmauCKTREDakLNdT5o2hmSf7iyjuo9iapUinJYmc+Dv5E b8hxnVl7PiKhm7GvlfI98537rGvwXVeACQUR3souPYYAE2e87N7qi74tLyMsDzmvrtwPLM 0gG+QHbOvFS5UhpMVBgaB/GAvkWs794zk0BF0/i1YH3YIJNgXK6xwK3z4AKhAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680724984; 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=QxbhiCgDWfQnE175H4g6eMjle9cezg19toglQ6qGB1E=; b=nSochbgRdQ/ntnTxPP1YIQyYSrP4M3BePBzbB2Z2S86LpcrI4Km8HmVxakifBi895N+pl6 w1+TX3WK518gY2BAa1W+e30dQqOq+y5JNLWtASdyoZi9r5xHE+P5/k6RgJYTCj1HCPzrkU YuqJufNv0Frdb9GS+8n7lQGiE6lLV3P00s7F7x+81DGgNBaG3k4JUF+DBaU6zvvR19mESN AyHu2s7srXro5SvAQ7QGLWtnWXbx32fy4onhtfaqipg6o8HBz3LfVq7yoPinMBFxPKj77S zAVd/tPA5Xw7BcQkQ84NRZfZJyVlQ3JZFgNuTH/bwVYxUeQP7J1peLIUHHCi8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680724984; a=rsa-sha256; cv=none; b=q5dE0jvZUzF1gkB2Gn4lXbMbVav331oXkq15U198Bdm1WLVEssuPuDt3/A2IzcJbiriP2K DO+bq0IIgd4FmHgGVBUtOwbXdTRS0C0zsInXmxypNZTF/WekvhpRhRo252Q+uB9UhT1C1v wT/+n4gsldcg4kMpEVc5Tf5Ml3c/OAuH7+jSsBvMlv9Ec6aMFAto/SMF958SIUqjf/Y64o krxP/qL5SGMBCUJAl83oixJEFHK421fIDpLyG1SnQznXL3bMQ5CJRvwnKpmnk58me5AqIS FJoP2WZADDuJoacvfMy79Qmfapov6z2SOBrb1SzVRDl90RcE9TBW9HRMqdNzpA== 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 4PsFtJ2kThzc2d; Wed, 5 Apr 2023 20:03:04 +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 335K3430043621; Wed, 5 Apr 2023 20:03:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 335K34Zk043619; Wed, 5 Apr 2023 20:03:04 GMT (envelope-from git) Date: Wed, 5 Apr 2023 20:03:04 GMT Message-Id: <202304052003.335K34Zk043619@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Nuno Teixeira Subject: git: 3edaa25693c2 - 2023Q2 - devel/root: Remove 12.3 workaround and clean up List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eduardo X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q2 X-Git-Reftype: branch X-Git-Commit: 3edaa25693c2c14989097ad21bdc71888b08f78c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q2 has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=3edaa25693c2c14989097ad21bdc71888b08f78c commit 3edaa25693c2c14989097ad21bdc71888b08f78c Author: Erik Jensen AuthorDate: 2023-04-05 09:59:00 +0000 Commit: Nuno Teixeira CommitDate: 2023-04-05 20:02:43 +0000 devel/root: Remove 12.3 workaround and clean up Remove build workaround for 12.3 re-added in last commit by mistake that was removed in 5693229 commit. Cleanup port and delete scripts dir used by workaround. PR: 270625 MFH: 2023Q2 (buildfixes) (cherry picked from commit 41a479ef801eb1f07456637e90afdecce951659b) --- devel/root/Makefile | 13 +------------ devel/root/scripts/remove-modules-from-modulemap.awk | 9 --------- devel/root/scripts/remove-modules-from-modulemap.sh | 7 ------- 3 files changed, 1 insertion(+), 28 deletions(-) diff --git a/devel/root/Makefile b/devel/root/Makefile index b9e7ccbef2e4..2f954fbc8a17 100644 --- a/devel/root/Makefile +++ b/devel/root/Makefile @@ -82,15 +82,4 @@ PLIST_SUB+= ONLY_INSTALLED_WITH_LLVM_CLANG_13="" PLIST_SUB+= ONLY_INSTALLED_WITH_LLVM_CLANG_13="@comment " .endif -.include - -# In LLVM/Clang 10.0.1 (used on FreeBSD 12.3), the cstdalign header is missing from the std modulemap, but it is declared included in ROOT's std modulemap - this has to be removed. -# See https://github.com/llvm/llvm-project/blob/main/libcxx/include/module.modulemap.in#L181 -# The same seems to be the case for the other headers defined in the variable "modules" below. -.if ${OSVERSION} < 1204000 -modules= cstdalign cuchar experimental/string_view ext/functional ext/numeric ext/type_traits.h bits_alloc_traits_h bits/allocator.h bits/basic_ios.h bits/cpp_type_traits.h bits/exception_defines.h bits/ios_base.h bits/locale_facets.h bits_stl_algobase_h bits_stl_iterator_h bits/stl_iterator_base_types.h bits/stl_map.h bits/stl_pair.h bits_stl_tree_h bits/uniform_int_dist.h -post-patch: - SCRIPTDIR=${SCRIPTDIR} MODULEMAP=${WRKSRC}/interpreter/cling/include/cling/std.modulemap ${SH} ${SCRIPTDIR}/remove-modules-from-modulemap.sh "${modules}" -.endif - -.include +.include diff --git a/devel/root/scripts/remove-modules-from-modulemap.awk b/devel/root/scripts/remove-modules-from-modulemap.awk deleted file mode 100755 index adabed818d2f..000000000000 --- a/devel/root/scripts/remove-modules-from-modulemap.awk +++ /dev/null @@ -1,9 +0,0 @@ -BEGIN { - exclude = exclude; #trim left and right - gsub(/[[:blank:]]/, "|", exclude); - gsub(/\//, "\\/", exclude); - ex_regx = "module[[:blank:]]+\"(" exclude ")\".*{[[:blank:]]*$"; -} - -$0 ~ ex_regx, $0 ~ /^[[:blank:]]*}[[:blank:]]*$/ { next ; } -{print} diff --git a/devel/root/scripts/remove-modules-from-modulemap.sh b/devel/root/scripts/remove-modules-from-modulemap.sh deleted file mode 100755 index c118c7637bf0..000000000000 --- a/devel/root/scripts/remove-modules-from-modulemap.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -# Script removes module definition blocks in LLVM/Clang .modulemap -# files "in-place" in the file path stored in the variable MODULEMAP - -modules=$1 -tmp=${MODULEMAP}.tmp && awk -f ${SCRIPTDIR}/remove-modules-from-modulemap.awk -v exclude="${modules}" ${MODULEMAP} > ${tmp} && mv ${tmp} ${MODULEMAP} || rm ${tmp}