git: c91d810f65bb - 2024Q1 - devel/llvm14 devel/llvm15 devel/llvm16 devel/llvm17: fix build with clang 18

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Dimitry Andric <dim_at_FreeBSD.org>
Date: Fri, 12 Jan 2024 16:37:47 UTC
The branch 2024Q1 has been updated by dim:

URL: https://cgit.FreeBSD.org/ports/commit/?id=c91d810f65bbffe63287b537f025566ad7e2e598

commit c91d810f65bbffe63287b537f025566ad7e2e598
Author:     Dimitry Andric <dim@FreeBSD.org>
AuthorDate: 2024-01-06 17:11:27 +0000
Commit:     Dimitry Andric <dim@FreeBSD.org>
CommitDate: 2024-01-12 16:37:34 +0000

    devel/llvm14 devel/llvm15 devel/llvm16 devel/llvm17: fix build with clang 18
    
    Clang 18 is more strict in checking inline assembly constraints,
    resulting in an error building devel/llvm14, devel/llvm15, devel/llvm16,
    and devel/llvm17:
    
      /wrkdirs/usr/ports/devel/llvm14/work-default/llvm-project-14.0.6.src/compiler-rt/lib/asan/asan_rtl_x86_64.S:130:286: error: displacement 70368744177664 is not within [-2147483648, 2147483647]
    
    This is fixed by two upstream commits:
    https://github.com/llvm/llvm-project/commit/b9935bb02a50
    https://github.com/llvm/llvm-project/commit/966d564e43e6
    
    PR:             276155
    Approved by:    brooks (maintainer)
    MFH:            2024Q1
    
    (cherry picked from commit 0b672496d6927004bfcb41db685a66750420ead4)
---
 devel/llvm14/Makefile | 6 +++++-
 devel/llvm14/distinfo | 4 ++++
 devel/llvm15/Makefile | 6 +++++-
 devel/llvm15/distinfo | 4 ++++
 devel/llvm16/Makefile | 6 +++++-
 devel/llvm16/distinfo | 4 ++++
 devel/llvm17/Makefile | 6 +++++-
 devel/llvm17/distinfo | 4 ++++
 8 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/devel/llvm14/Makefile b/devel/llvm14/Makefile
index 6995247f16bc..db2fc3314c19 100644
--- a/devel/llvm14/Makefile
+++ b/devel/llvm14/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	llvm
 DISTVERSION=	14.0.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel lang
 MASTER_SITES=	https://github.com/llvm/llvm-project/releases/download/llvmorg-${DISTVERSION:S/rc/-rc/}/ \
 		https://${PRE_}releases.llvm.org/${LLVM_RELEASE}/${RCDIR}
@@ -8,6 +8,10 @@ PKGNAMESUFFIX=	${LLVM_SUFFIX}
 DISTNAME=	llvm-project-${DISTVERSION}.src
 DISTFILES=	llvm-project-${DISTVERSION}.src${EXTRACT_SUFX}
 
+PATCH_SITES=	https://github.com/llvm/llvm-project/commit/
+PATCHFILES+=	llvmorg-18-init-15199-gb9935bb02a50.patch:-p1 # https://github.com/llvm/llvm-project/pull/75748
+PATCHFILES+=	llvmorg-18-init-15680-g966d564e43e6.patch:-p1 # https://github.com/llvm/llvm-project/pull/76185
+
 MAINTAINER=	brooks@FreeBSD.org
 COMMENT=	LLVM and Clang
 WWW=		https://llvm.org/
diff --git a/devel/llvm14/distinfo b/devel/llvm14/distinfo
index dedc06cb90fe..987d3431ff51 100644
--- a/devel/llvm14/distinfo
+++ b/devel/llvm14/distinfo
@@ -1,3 +1,7 @@
 TIMESTAMP = 1656378667
 SHA256 (llvm-project-14.0.6.src.tar.xz) = 8b3cfd7bc695bd6cea0f37f53f0981f34f87496e79e2529874fd03a2f9dd3a8a
 SIZE (llvm-project-14.0.6.src.tar.xz) = 105618228
+SHA256 (llvmorg-18-init-15199-gb9935bb02a50.patch) = b0805cba765084c7bef426fa1235dd887c61ae0c1fd5e3fad5c8742cdd6ee8b0
+SIZE (llvmorg-18-init-15199-gb9935bb02a50.patch) = 1893
+SHA256 (llvmorg-18-init-15680-g966d564e43e6.patch) = 3abf92d4a788ff2f74fa9fc627a113f04d9fb72cd7e47344a8c4dce06140a163
+SIZE (llvmorg-18-init-15680-g966d564e43e6.patch) = 1297
diff --git a/devel/llvm15/Makefile b/devel/llvm15/Makefile
index 3651f6dda433..f555dd00a6d0 100644
--- a/devel/llvm15/Makefile
+++ b/devel/llvm15/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	llvm
 DISTVERSION=	15.0.7
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	devel lang
 MASTER_SITES=	https://github.com/llvm/llvm-project/releases/download/llvmorg-${DISTVERSION:S/rc/-rc/}/ \
 		https://${PRE_}releases.llvm.org/${LLVM_RELEASE}${RCDIR}/
@@ -8,6 +8,10 @@ PKGNAMESUFFIX=	${LLVM_SUFFIX}
 DISTNAME=	llvm-project-${DISTVERSION}.src
 DISTFILES=	llvm-project-${DISTVERSION}.src${EXTRACT_SUFX}
 
+PATCH_SITES=	https://github.com/llvm/llvm-project/commit/
+PATCHFILES+=	llvmorg-18-init-15199-gb9935bb02a50.patch:-p1 # https://github.com/llvm/llvm-project/pull/75748
+PATCHFILES+=	llvmorg-18-init-15680-g966d564e43e6.patch:-p1 # https://github.com/llvm/llvm-project/pull/76185
+
 MAINTAINER=	brooks@FreeBSD.org
 COMMENT=	LLVM and Clang
 WWW=		https://llvm.org/
diff --git a/devel/llvm15/distinfo b/devel/llvm15/distinfo
index f6a85a9bc945..7abec8c5f61f 100644
--- a/devel/llvm15/distinfo
+++ b/devel/llvm15/distinfo
@@ -1,3 +1,7 @@
 TIMESTAMP = 1673554510
 SHA256 (llvm-project-15.0.7.src.tar.xz) = 8b5fcb24b4128cf04df1b0b9410ce8b1a729cb3c544e6da885d234280dedeac6
 SIZE (llvm-project-15.0.7.src.tar.xz) = 110936452
+SHA256 (llvmorg-18-init-15199-gb9935bb02a50.patch) = b0805cba765084c7bef426fa1235dd887c61ae0c1fd5e3fad5c8742cdd6ee8b0
+SIZE (llvmorg-18-init-15199-gb9935bb02a50.patch) = 1893
+SHA256 (llvmorg-18-init-15680-g966d564e43e6.patch) = 3abf92d4a788ff2f74fa9fc627a113f04d9fb72cd7e47344a8c4dce06140a163
+SIZE (llvmorg-18-init-15680-g966d564e43e6.patch) = 1297
diff --git a/devel/llvm16/Makefile b/devel/llvm16/Makefile
index d5ec6b044d2a..402cf07a0177 100644
--- a/devel/llvm16/Makefile
+++ b/devel/llvm16/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	llvm
 DISTVERSION=	16.0.6
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	devel lang
 MASTER_SITES=	https://github.com/llvm/llvm-project/releases/download/llvmorg-${DISTVERSION:S/rc/-rc/}/ \
 		https://${PRE_}releases.llvm.org/${LLVM_RELEASE}${RCDIR}/
@@ -8,6 +8,10 @@ PKGNAMESUFFIX=	${LLVM_SUFFIX}
 DISTNAME=	llvm-project-${DISTVERSION}.src
 DISTFILES=	llvm-project-${DISTVERSION}.src${EXTRACT_SUFX}
 
+PATCH_SITES=	https://github.com/llvm/llvm-project/commit/
+PATCHFILES+=	llvmorg-18-init-15199-gb9935bb02a50.patch:-p1 # https://github.com/llvm/llvm-project/pull/75748
+PATCHFILES+=	llvmorg-18-init-15680-g966d564e43e6.patch:-p1 # https://github.com/llvm/llvm-project/pull/76185
+
 MAINTAINER=	brooks@FreeBSD.org
 COMMENT=	LLVM and Clang
 WWW=		https://llvm.org/
diff --git a/devel/llvm16/distinfo b/devel/llvm16/distinfo
index 95efc23fe3c1..e7394a506f14 100644
--- a/devel/llvm16/distinfo
+++ b/devel/llvm16/distinfo
@@ -1,3 +1,7 @@
 TIMESTAMP = 1686758340
 SHA256 (llvm-project-16.0.6.src.tar.xz) = ce5e71081d17ce9e86d7cbcfa28c4b04b9300f8fb7e78422b1feb6bc52c3028e
 SIZE (llvm-project-16.0.6.src.tar.xz) = 118013488
+SHA256 (llvmorg-18-init-15199-gb9935bb02a50.patch) = b0805cba765084c7bef426fa1235dd887c61ae0c1fd5e3fad5c8742cdd6ee8b0
+SIZE (llvmorg-18-init-15199-gb9935bb02a50.patch) = 1893
+SHA256 (llvmorg-18-init-15680-g966d564e43e6.patch) = 3abf92d4a788ff2f74fa9fc627a113f04d9fb72cd7e47344a8c4dce06140a163
+SIZE (llvmorg-18-init-15680-g966d564e43e6.patch) = 1297
diff --git a/devel/llvm17/Makefile b/devel/llvm17/Makefile
index 9bf6394c77d7..bd193f9fc96f 100644
--- a/devel/llvm17/Makefile
+++ b/devel/llvm17/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	llvm
 DISTVERSION=	17.0.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel lang
 MASTER_SITES=	https://github.com/llvm/llvm-project/releases/download/llvmorg-${DISTVERSION:S/rc/-rc/}/ \
 		https://${PRE_}releases.llvm.org/${LLVM_RELEASE}${RCDIR}/
@@ -8,6 +8,10 @@ PKGNAMESUFFIX=	${LLVM_SUFFIX}
 DISTNAME=	llvm-project-${DISTVERSION}.src
 DISTFILES=	llvm-project-${DISTVERSION}.src${EXTRACT_SUFX}
 
+PATCH_SITES=	https://github.com/llvm/llvm-project/commit/
+PATCHFILES+=	llvmorg-18-init-15199-gb9935bb02a50.patch:-p1 # https://github.com/llvm/llvm-project/pull/75748
+PATCHFILES+=	llvmorg-18-init-15680-g966d564e43e6.patch:-p1 # https://github.com/llvm/llvm-project/pull/76185
+
 MAINTAINER=	brooks@FreeBSD.org
 COMMENT=	LLVM and Clang
 WWW=		https://llvm.org/
diff --git a/devel/llvm17/distinfo b/devel/llvm17/distinfo
index 81dcd0a422d4..9b27c6ea150d 100644
--- a/devel/llvm17/distinfo
+++ b/devel/llvm17/distinfo
@@ -1,3 +1,7 @@
 TIMESTAMP = 1701190197
 SHA256 (llvm-project-17.0.6.src.tar.xz) = 58a8818c60e6627064f312dbf46c02d9949956558340938b71cf731ad8bc0813
 SIZE (llvm-project-17.0.6.src.tar.xz) = 127838860
+SHA256 (llvmorg-18-init-15199-gb9935bb02a50.patch) = b0805cba765084c7bef426fa1235dd887c61ae0c1fd5e3fad5c8742cdd6ee8b0
+SIZE (llvmorg-18-init-15199-gb9935bb02a50.patch) = 1893
+SHA256 (llvmorg-18-init-15680-g966d564e43e6.patch) = 3abf92d4a788ff2f74fa9fc627a113f04d9fb72cd7e47344a8c4dce06140a163
+SIZE (llvmorg-18-init-15680-g966d564e43e6.patch) = 1297