From nobody Tue Nov 28 00:28:39 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 4SfNbq3GK5z52jNC; Tue, 28 Nov 2023 00:28:39 +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 4SfNbq1khpz4Vb7; Tue, 28 Nov 2023 00:28:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701131319; 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=lBKMNHDvM5jZ0gVS1yyaUo5OOltuuxD8KXm2sbgBJ3s=; b=HTZuJrGL6EjnP7BdlykIrfq7b89bx9+DjJpD+fKht2GGp00XAPnCDVmuihOTuVJ3GhlXdU VjNhN8PtI3V7xA/freQdaKmQXYYjy3bhqdQpeulL6v4L9X0gZxevRFvG+Av1mnGM4+JzaL S56UM4kbFYH8D8PhlNoSA3qfrzCgAtIjozbGXsLgbWv3iz5P8OAdepA/e64DCInvDAVtzx gCIOnTw+a9rg/63e7BCHMzG/sMgLEAghkz84KL/YTfjEzll6IgbcE13UDbDc8g+GIXcPSx AxND8SswXn+R210Bi7iubmcQ2JYRG9HO+yV2jd+v3z1iDJInlFYJyfavqxJs+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701131319; 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=lBKMNHDvM5jZ0gVS1yyaUo5OOltuuxD8KXm2sbgBJ3s=; b=jcJSOM3+8CqvbVjwcGcmfb5Dqdyhg5O+D4ONpJ+dBGS/dBnkMcz6EbY5c2KiiZnUI6sMdV 8C609+l4Zy7hpNGo0HiPPDW08oDGvpfTMxmzgMVI6ONbbqk5oSGXS8ISCz+jghinJMpWsU 0E+G4v6BQXBWjztg18H56GDIjBQZKu2VawI14KKZ0OqBDjxElNIkmf2YnitTUtFmRXX1yC qHox3HhZ7Mo65rjE4ns9mj1JIPWSQ1MFRE9BFkogYFQH6ZDCOInbmBwX5Y0EwLIRgFeTPi 7HtNfTY2S/rgylN2UkP4v5PK/IayQlSt2tLrEo4CAV6ygAST3BqNLQjfGanJZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701131319; a=rsa-sha256; cv=none; b=NLOy09QzQl5TfJ6RwrxUUsCWsAKUPsiwzaXBz3VSSMxkDp2+EgeZZoBGDF2G6StaWJ4l0Z /i7pWUsBLqJ7nnxaS7xQrljExRqXdd6MfxN54CCud/sQSajAmA6b7g0D4DEmBoaiJKziqn 66PLdlxZA9QqsENdmhf5UTIK994ew/8yizFD44xbUXOwXxbgaWwW9m0r8locmiBkYIC1/M cbs9kdfe4vLzbdbCwsLezppNVP8vNP4vYl0dh+EDUeGnIEf1cveDUnLpFNUa4nnCrasUv5 CLd8xG4I0Mf50PZ3xIIZ0nmSaMIO5AOfjmkPu/kJCelHOIAHpoDCCpjJwhggiA== 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 4SfNbq0rjZz10Fl; Tue, 28 Nov 2023 00:28:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AS0Sdp4003631; Tue, 28 Nov 2023 00:28:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AS0SdFf003628; Tue, 28 Nov 2023 00:28:39 GMT (envelope-from git) Date: Tue, 28 Nov 2023 00:28:39 GMT Message-Id: <202311280028.3AS0SdFf003628@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Brooks Davis Subject: git: c3a33020c0e8 - main - devel/llvm-devel: fix plist without FLANG 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: brooks X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c3a33020c0e8a681690fd9322ddb68481a62424a Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=c3a33020c0e8a681690fd9322ddb68481a62424a commit c3a33020c0e8a681690fd9322ddb68481a62424a Author: Brooks Davis AuthorDate: 2023-11-28 00:20:21 +0000 Commit: Brooks Davis CommitDate: 2023-11-28 00:28:23 +0000 devel/llvm-devel: fix plist without FLANG ISO_Fortran_binding.h is installed in both clang and flang include paths. The clang one was inappropriately tagged as conditional on CLANG and not both. --- devel/llvm-devel/Makefile | 2 +- devel/llvm-devel/pkg-plist | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile index d703a782c125..8ff822358edf 100644 --- a/devel/llvm-devel/Makefile +++ b/devel/llvm-devel/Makefile @@ -216,7 +216,7 @@ EXTRAS_LIBS= \ EXTRAS_FILES= index.js EXTRAS_PATTERN= ${EXTRAS_COMMANDS:tW:C/ */|/g}|${EXTRAS_LIBS:tW:C/ */|/g}|${EXTRAS_FILES:tW:C/ */|/g} -FLANG_PATTERN= ${FLANG_COMMANDS:S/^/bin./:tW:C/ */|/g}|flang|libFIR|libFortran|libHLFIR +FLANG_PATTERN= ${FLANG_COMMANDS:S/^/bin./:tW:C/ */|/g}|flang|libFIR|libFortran|libHLFIR|ISO_Fortran_binding.h MLIR_PATTERN= ${MLIR_COMMANDS:S/^/bin./:tW:C/ */|/g}|mlir|libMLIR|obj.MLIRCAP diff --git a/devel/llvm-devel/pkg-plist b/devel/llvm-devel/pkg-plist index 72014a1a72af..3873f2b25981 100644 --- a/devel/llvm-devel/pkg-plist +++ b/devel/llvm-devel/pkg-plist @@ -5814,7 +5814,7 @@ llvm-devel/include/llvm/XRay/YAMLXRayRecord.h %%POLLY%%llvm-devel/include/polly/isl/version.h %%POLLY%%llvm-devel/include/polly/isl/vertices.h %%POLLY%%llvm-devel/lib/LLVMPolly.so -%%CLANG%%llvm-devel/lib/clang/%%LLVM_MAJOR%%/include/ISO_Fortran_binding.h +%%CLANG%%%%FLANG%%llvm-devel/lib/clang/%%LLVM_MAJOR%%/include/ISO_Fortran_binding.h %%CLANG%%llvm-devel/lib/clang/%%LLVM_MAJOR%%/include/__clang_cuda_builtin_vars.h %%CLANG%%llvm-devel/lib/clang/%%LLVM_MAJOR%%/include/__clang_cuda_cmath.h %%CLANG%%llvm-devel/lib/clang/%%LLVM_MAJOR%%/include/__clang_cuda_complex_builtins.h