From nobody Wed Apr 05 11:25:55 2023 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 4Ps2Pb3WwNz43Jjx; Wed, 5 Apr 2023 11:25:55 +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 4Ps2Pb2lqyz3DDC; Wed, 5 Apr 2023 11:25:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680693955; 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=Z8UNLwb7pCtnsKY1Uta+vvceWWf41g8qC+gMAavcs4Y=; b=VUTw+aMIWqudSu4MSHTDwryATZnQhL61Jtim2nmCJlnh6iyvC9LBekDDebMwOmB3AsO6cA o6Mxr36zBGCx7sVhpUBn2NmFTyXK9NH0QV6N+WGz0F9DQzgGnxdEENN1d84NsIkhtMaHCn 8itjgW0MU8G1It3DJaGWwYXFcwb0HoYcbIXDIAcwygc02sfkAF90GsnKbEgvFYHHTzReao i8CB6aNCRNXpaFHBDOvsFcRoN66DGHO0SqleWvHsmSUFZzpeg0ndfw8zxlcjU3kHpnodOy TlhIEKPS8I7S/JOYdeyhsneWm5wXJ1Vkdd2ec/GkQxJhnT7BXDjJo3EStrgLSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680693955; 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=Z8UNLwb7pCtnsKY1Uta+vvceWWf41g8qC+gMAavcs4Y=; b=ErP+1GGxNyBobB6Z+GLVWoc5Z/cgVk5iIJINVJmXs62zF5Lbkup013ccXDlOwT6Rfo//Z0 K4OsVGm9lrknsKBbKheh0KH2jLMCMmclnTBgir4c5WOefqFpNUrRK4Xxx3talDZ6TqdQgR EzNAaiH92ZLb3PdgIw05U9+Ihwcz1DMpV2gDFIwljspRN3Xi2kxDBsPbSZ6Y0P7gg9TRY1 GrZvQDiWqqnm/LwGNj0dCE6eSlqCsuRzAd/qgsG9KBcavSIpvv9vpy3FyXy+zTZfoEUSs5 muxUZXP4DGhiHsZZCTOMwJeXttzKsLJEOlsazDgyM9HigWmaI7E+msWSxNQm5g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680693955; a=rsa-sha256; cv=none; b=G2kiwD5+MmKtuXYFeBrMjxqUyOzVzQuXQHnKaNleFp/EifY15I5g4TNvJCmbV8G4MTSlYz cymhD+yB+ZsSaB++yVHSiTpgszRiwZBnQWhX4eyMbnIo0EdcDZZxgFFU1ayRqcFwKH4/XK fWp6GO2xjtsQteEN9K/LjXbxu3Yppz3ookqtQBBdZFNNZD3pSEznjWMvoeFF5wAcbopx50 eyd8RrjBlPYO9boyttZ8cG+6bx+0ncC8roLMx3WU+05CxDN7cU0/rZf7Ebm3rQZtnHnEXY cnO7g00siHN++hIeoemD7WHkZ3lp/HelOlRCs8UJ6gynTCt0c7SuKCgPSgSuxQ== 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 4Ps2Pb1jbrzL1y; Wed, 5 Apr 2023 11:25:55 +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 335BPtKi071065; Wed, 5 Apr 2023 11:25:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 335BPtJa071064; Wed, 5 Apr 2023 11:25:55 GMT (envelope-from git) Date: Wed, 5 Apr 2023 11:25:55 GMT Message-Id: <202304051125.335BPtJa071064@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Nuno Teixeira Subject: git: 41a479ef801e - main - devel/root: Remove 12.3 workaround and clean up 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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/main X-Git-Reftype: branch X-Git-Commit: 41a479ef801eb1f07456637e90afdecce951659b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=41a479ef801eb1f07456637e90afdecce951659b commit 41a479ef801eb1f07456637e90afdecce951659b Author: Erik Jensen AuthorDate: 2023-04-05 09:59:00 +0000 Commit: Nuno Teixeira CommitDate: 2023-04-05 11:25:36 +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) --- 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}