From nobody Fri Oct 18 12:16:21 2024 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 4XVNwP5xqFz5Z7g6; Fri, 18 Oct 2024 12:16:21 +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 4XVNwP5Qr7z4FDf; Fri, 18 Oct 2024 12:16:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729253781; 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=/ETdVGEKd76lPmP0RM7tOfHdYewuM4RvkAlHviQuM5M=; b=nUke9rsTOMMWztkkSzhM7pXN3ZkOSCE6jPIMxUrhzl/XzfM1tpGCo3c28JbUov6+ppN7mx cM+/NzR/u/mqHxrqwLT8oBupR0M96KJWbfyGYMATyVJhHeJU9WKfhcTH7cq9HsVTxhMdtO Gba8sSOSu2q3qCg89K8mGmZU/1zFxU7KCmaLyTVRDIYUH6ohsrGHjEfuE9r1vBVQPBLKFs 5hkMCom55s86L6oV7EZtpdptrovlf5hQoHvQhw08SQ/cMWaeWXAJPoyokBmBl2P5DTqcJ2 qOMFkjemCUQVR/bbDK17W6MO6f4agy8g2j9gLIiq5Cth/P9qjLvV3JX0Ji2nQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729253781; 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=/ETdVGEKd76lPmP0RM7tOfHdYewuM4RvkAlHviQuM5M=; b=cdclrpBDexCpxUzhbJZqzuirjmkZ5X2aiuPPoh1HwOin1fATtOPiiDOz1cNMDImkV/aRj2 EgNXp2bJLF2E2BnYJDUq3+jCKhdaAhnMCxuc1ov/udTfpW9bjxgtA3gUe8uDUqXND4RDSP ptNzCf2NCWX1v1ZXe6msJEV4lb4PSN1vvL9IyswJ7yipGJp3hE5cjsB3UxxlNLdVW2qSfe lc0J+3xyS7a2tEgHJGZ7xFz+7Zf0OHkOdKZDgAAOIM0J9s0WaTfhi02Yr2Tjr8BvA/Vc1z O+Ow+T9U5xiM4wHLtXbmimOBcCQ7ooEmNDBdixQTfGeoh0wg2kmMe1fyVH6Org== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729253781; a=rsa-sha256; cv=none; b=EUwonA8V9TTULXF2+DlK0CrCHdL3IznHRxc9Y86VNVyrdjPLWScMwkABsoaf10drKLafwc b/xoipQKnD1E+F4hCHUgD6QxbiTA7KH71y1mY/PX7k30lzmlk/TEppB/ZQxF7upd7USZ5L tn3E+pChoKxe9PmkUvyB9IRqawqcLjyzcYSGLxUULVWFXu2BuXkaUMlVt/Uy4IezEBZ9As GQsHcTm/ST6YlTLqTq1zJNCFvYTLRNg1z2nVZMprUVRj+AbDhaidw9p4GFmipdQQpO+d6K zlY2He4UfboDXy3Wkd9gfqlO4rTsdF0FssR0HclbQ0x0KB6EKplFIK/JZv8WMg== 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 4XVNwP51YtzZ3s; Fri, 18 Oct 2024 12:16:21 +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 49ICGLB6045616; Fri, 18 Oct 2024 12:16:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49ICGLg9045613; Fri, 18 Oct 2024 12:16:21 GMT (envelope-from git) Date: Fri, 18 Oct 2024 12:16:21 GMT Message-Id: <202410181216.49ICGLg9045613@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Charlie Li Subject: git: cc2efaed00e3 - main - devel/wasi-{compiler-rt,libcxx}: attempt to unbreak the tree 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: vishwin X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cc2efaed00e35ece830aa68e3298d865513de061 Auto-Submitted: auto-generated The branch main has been updated by vishwin: URL: https://cgit.FreeBSD.org/ports/commit/?id=cc2efaed00e35ece830aa68e3298d865513de061 commit cc2efaed00e35ece830aa68e3298d865513de061 Author: Charlie Li AuthorDate: 2024-10-18 12:01:51 +0000 Commit: Charlie Li CommitDate: 2024-10-18 12:01:51 +0000 devel/wasi-{compiler-rt,libcxx}: attempt to unbreak the tree In the meta-ports, USES=llvm is defined before IGNORE, so when DISTVERSION=0, they are marked BROKEN because LLVM version 0 is invalid. However, the USES=llvm alone will permeate ${LLVM_DEFAULT} unless a valid specific LLVM version/range is specified, so anything that references the USES=llvm variables will defer to ${LLVM_DEFAULT}. In these cases, the children of these meta-ports are split by individual LLVM version, referencing them specifically. Each devel/wasi-libcxx depends on the corresponding devel/wasi-compiler-rt using ${LLVM_VERSION} through the respective meta-ports. However, since the meta-port is not IGNOREd until after the invalid USES=llvm, ${LLVM_VERSION} is ${LLVM_DEFAULT}, which is still as of this commit 15, one of the dropped versions in WASI. BUILD_DEPENDS in the meta-port as a result refers to a removed port, breaking the tree. Conditionalise USES=llvm until after the proper IGNORE to avoid this kind of situation now and into the future. Reported by: antoine --- devel/wasi-compiler-rt/Makefile | 10 ++++++---- devel/wasi-libcxx/Makefile | 12 +++++++----- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/devel/wasi-compiler-rt/Makefile b/devel/wasi-compiler-rt/Makefile index f389dbb446ab..89fa972ac97e 100644 --- a/devel/wasi-compiler-rt/Makefile +++ b/devel/wasi-compiler-rt/Makefile @@ -18,15 +18,17 @@ LICENSE_NAME= Apache License 2.0 with LLVM Exceptions LICENSE_FILE= ${WRKSRC}/llvm/LICENSE.TXT LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept +BUILD_DEPENDS= ${WASI_SYSROOT}/include/stdarg.h:devel/wasi-libc + +USES= cmake tar:xz + .if ${DISTVERSION} == 0 IGNORE= is a meta-port; there is nothing to build PKGNAMESUFFIX= -master +.else +USES+= llvm:${LLVM_SUFFIX} .endif -BUILD_DEPENDS= ${WASI_SYSROOT}/include/stdarg.h:devel/wasi-libc - -USES= cmake llvm:${LLVM_SUFFIX} tar:xz - LLVM_RELEASE= ${DISTVERSION:C/rc.*//} LLVM_SUFFIX= ${LLVM_RELEASE:C/\.[0-9]\.[0-9]$//} DISTINFO_FILE= ${PORTSDIR}/${LLVM_PORT}/distinfo diff --git a/devel/wasi-libcxx/Makefile b/devel/wasi-libcxx/Makefile index c32a1afe9edc..c87c5f29c884 100644 --- a/devel/wasi-libcxx/Makefile +++ b/devel/wasi-libcxx/Makefile @@ -18,16 +18,18 @@ LICENSE_NAME= Apache License 2.0 with LLVM Exceptions LICENSE_FILE= ${WRKSRC}/llvm/LICENSE.TXT LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept +BUILD_DEPENDS= ${WASI_SYSROOT}/include/stdarg.h:devel/wasi-libc + +USES= cmake tar:xz + .if ${DISTVERSION} == 0 IGNORE= is a meta port; there is nothing to build PKGNAMESUFFIX= -master +.else +BUILD_DEPENDS+= wasi-compiler-rt${LLVM_VERSION}>0:devel/wasi-compiler-rt${LLVM_VERSION} +USES+= llvm:${LLVM_SUFFIX} .endif -BUILD_DEPENDS= ${WASI_SYSROOT}/include/stdarg.h:devel/wasi-libc \ - wasi-compiler-rt${LLVM_VERSION}>0:devel/wasi-compiler-rt${LLVM_VERSION} - -USES= cmake llvm:${LLVM_SUFFIX} tar:xz - LLVM_RELEASE= ${DISTVERSION:C/rc.*//} LLVM_SUFFIX= ${LLVM_RELEASE:C/\.[0-9]\.[0-9]$//} DISTINFO_FILE= ${PORTSDIR}/${LLVM_PORT}/distinfo