diff --git a/sys-devel/llvm/llvm17-17.0.1.recipe b/sys-devel/llvm/llvm17-17.0.1.recipe index 4867be743..5592375eb 100644 --- a/sys-devel/llvm/llvm17-17.0.1.recipe +++ b/sys-devel/llvm/llvm17-17.0.1.recipe @@ -30,7 +30,7 @@ other than the ones listed above. HOMEPAGE="https://www.llvm.org/" COPYRIGHT="2003-2023 University of Illinois at Urbana-Champaign" LICENSE="Apache v2 with LLVM Exception" -REVISION="4" +REVISION="5" SOURCE_URI="https://github.com/llvm/llvm-project/releases/download/llvmorg-$portVersion/llvm-project-$portVersion.src.tar.xz" CHECKSUM_SHA256="b0e42aafc01ece2ca2b42e3526f54bebc4b1f1dc8de6e34f46a0446a13e882b9" SOURCE_DIR="llvm-project-$portVersion.src" @@ -690,7 +690,6 @@ INSTALL() $libDir/cmake/lld/LLDTargets-release.cmake \ $libDir/cmake/llvm/LLVMExports-release.cmake - sed -i 's|/libexec/|/bin/|' $binDir/scan-build sed -i 's|/share/|/data/|' $binDir/scan-build $binDir/scan-view mv $prefix/include/* $includeDir/ diff --git a/sys-devel/llvm/patches/llvm17-17.0.1.patchset b/sys-devel/llvm/patches/llvm17-17.0.1.patchset index 6bebd4321..76b5ce247 100644 --- a/sys-devel/llvm/patches/llvm17-17.0.1.patchset +++ b/sys-devel/llvm/patches/llvm17-17.0.1.patchset @@ -1,4 +1,4 @@ -From d1cfb6800bf2dcb08fc023e0fa569f02f13e7b7c Mon Sep 17 00:00:00 2001 +From 99d8d39bf18e3f7bed815475d15404f9495e82b1 Mon Sep 17 00:00:00 2001 From: Calvin Hill Date: Sun, 9 Sep 2018 16:11:42 +0100 Subject: llvm: import header dir suffix patch from 3dEyes @@ -21,10 +21,10 @@ index e86eb2b..395a857 100644 SmallString<256> Path(LLVM_INSTALL_PACKAGE_DIR); sys::fs::make_absolute(ActivePrefix, Path); -- -2.37.3 +2.42.0 -From a1acf9482f39b430e48f767b829de24287a1b3f2 Mon Sep 17 00:00:00 2001 +From 0c87fff14ccd78ccbdc573eb2daaded323c63837 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Mon, 18 Jul 2016 14:13:19 +0200 Subject: clang: support for secondary arch. @@ -129,10 +129,10 @@ index 41382d7..de70e50 100644 break; case llvm::Triple::RTEMS: -- -2.37.3 +2.42.0 -From 090d11535e856778bdd61ec10d1b742be0e21ae0 Mon Sep 17 00:00:00 2001 +From c1fbc349b0af1cb0e13d31335290419b018e231b Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Thu, 7 Apr 2016 18:30:52 +0000 Subject: clang: add a test for haiku driver. @@ -158,10 +158,10 @@ index 0000000..9591739 +// CHECK-X86: gcc{{.*}}" "-o" "a.out" "{{.*}}.o" + -- -2.37.3 +2.42.0 -From d0e47545dfbb35a7cc6c2d3fb88f7e9025f8f174 Mon Sep 17 00:00:00 2001 +From 86cef90d17a1769f68f53e33adede7810e9c1dfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Mon, 18 Jul 2016 14:13:19 +0200 Subject: clang: Enable thread-local storage and disable PIE by default @@ -195,10 +195,10 @@ index 669379a..fd82022 100644 void addLibCxxIncludePaths( const llvm::opt::ArgList &DriverArgs, -- -2.37.3 +2.42.0 -From 32c0bb82925d2a0be4faf3498f05970a5b11ba43 Mon Sep 17 00:00:00 2001 +From 04fa2c7335744534d329d06d0cf2d3d0739e97c0 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Mon, 13 Feb 2023 16:28:39 +0100 Subject: clang: Haiku: defaults to PIC @@ -217,10 +217,10 @@ index fd82022..f649d8d 100644 void addLibCxxIncludePaths( const llvm::opt::ArgList &DriverArgs, -- -2.37.3 +2.42.0 -From fb9728fa8c3b75fd71fc7d274f8dd7359c12048a Mon Sep 17 00:00:00 2001 +From 4a64b5f8a11c7e045a06adc8775c1601d53d5649 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 3 Apr 2021 23:23:24 +0200 Subject: lld: MachO needs libunwind somehow, disable @@ -311,10 +311,10 @@ index 2c30bc9..5069361 100644 int lld_main(int argc, char **argv, const llvm::ToolContext &) { -- -2.37.3 +2.42.0 -From 2cef519b57b202ee37bf332d0ded106929ef33d5 Mon Sep 17 00:00:00 2001 +From 26a2cbf078195ede11957d5d4b6acf25c37fa7d7 Mon Sep 17 00:00:00 2001 From: X512 Date: Wed, 16 Mar 2022 07:04:18 +0900 Subject: libunwind: Haiku: Signal frame unwinding support @@ -437,10 +437,10 @@ index dde9477..e4811a7 100644 result = this->stepThroughSigReturn(); } else -- -2.37.3 +2.42.0 -From 6cf513f733f879de4b23e99ea8d07a23c1759cb4 Mon Sep 17 00:00:00 2001 +From c6216f8fc5b2f9fd95556e97b08bd46eb5475430 Mon Sep 17 00:00:00 2001 From: Trung Nguyen Date: Thu, 7 Jul 2022 22:19:34 +0700 Subject: libunwind: Haiku: Initial support @@ -614,10 +614,10 @@ index 6707d59..db1df8c 100644 // Assume an ELF system with a dl_iterate_phdr function. #define _LIBUNWIND_USE_DL_ITERATE_PHDR 1 -- -2.37.3 +2.42.0 -From 948ee9ce1334115c99b4753cd9047812c923c02c Mon Sep 17 00:00:00 2001 +From c444a515fbfc06edaa4f4a02a1698fe766c60f89 Mon Sep 17 00:00:00 2001 From: X512 Date: Mon, 10 Oct 2022 12:18:55 +0900 Subject: Haiku: reimplement toolchain driver, make lld functional @@ -911,10 +911,10 @@ index f649d8d..70fc0dc 100644 } // end namespace toolchains -- -2.37.3 +2.42.0 -From 9017451e454169413103bb46db54b5d07eebcbf0 Mon Sep 17 00:00:00 2001 +From e23ce64748507485c07cb1868c5e81c2dc6f1a1a Mon Sep 17 00:00:00 2001 From: David Karoly Date: Wed, 9 Aug 2023 23:05:15 +0200 Subject: Haiku: implement GCC installation detection @@ -989,10 +989,10 @@ index eea14dd..217315f 100644 ToolChain::CXXStdlibType Haiku::GetDefaultCXXStdlibType() const { -- -2.37.3 +2.42.0 -From e08a1468aed84255bea789fc6ce618011b0e22eb Mon Sep 17 00:00:00 2001 +From 38cc2cc243e1b374728002c432f3257d5a3393dc Mon Sep 17 00:00:00 2001 From: Trung Nguyen <57174311+trungnt2910@users.noreply.github.com> Date: Mon, 14 Aug 2023 14:58:56 +1000 Subject: clang: Haiku: Add missing GNU headers include path @@ -1011,10 +1011,10 @@ index de70e50..0e8df73 100644 #ifdef HAIKU_HYBRID_SECONDARY AddPath("/boot/system/develop/headers/" HAIKU_HYBRID_SECONDARY, System, false); -- -2.37.3 +2.42.0 -From 05bcacbb80ffe9065b26725b54ca058ddab3ee6b Mon Sep 17 00:00:00 2001 +From 8769573725dca85af3a49fcd9e90c3b4735d42c2 Mon Sep 17 00:00:00 2001 From: David Karoly Date: Sat, 26 Aug 2023 09:36:42 +0200 Subject: clang: Haiku: silence warning for -pie @@ -1035,10 +1035,10 @@ index 217315f..e9d1187 100644 CmdArgs.push_back(Args.MakeArgString("--sysroot=" + D.SysRoot)); /* -- -2.37.3 +2.42.0 -From bbdc6d4b32fed7999880e024a3f1198b6a590aa4 Mon Sep 17 00:00:00 2001 +From c58231b90a3e22fbacf961df3d64315fdbc4dee7 Mon Sep 17 00:00:00 2001 From: David Karoly Date: Sun, 27 Aug 2023 19:32:12 +0200 Subject: clang: Haiku: silence warning for -pthread and -pthreads when linking @@ -1061,10 +1061,10 @@ index e9d1187..f5f7e99 100644 if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nostartfiles, -- -2.37.3 +2.42.0 -From 04be9a0fd76dbe4566d32cc3a649c76ef9bbcfbf Mon Sep 17 00:00:00 2001 +From 7b4ba9f39d2a761b4590ead1cdb6277f42dc4d25 Mon Sep 17 00:00:00 2001 From: David Karoly Date: Tue, 12 Sep 2023 18:30:30 +0200 Subject: clang: Haiku: remove custom addLibStdCxxIncludePaths implementation @@ -1110,10 +1110,10 @@ index 70fc0dc..be3425e 100644 Tool *buildLinker() const override; }; -- -2.37.3 +2.42.0 -From 1302099a935edd11510b8233d1b7035892d09a86 Mon Sep 17 00:00:00 2001 +From 8d6ade601f6a15511bb406ba93da9ed336c7f145 Mon Sep 17 00:00:00 2001 From: David Karoly Date: Thu, 21 Sep 2023 17:44:12 +0000 Subject: fix build on x86 secondary arch @@ -1133,10 +1133,10 @@ index f2b0c5c..f5fbcb5 100644 set(generated_files) -- -2.37.3 +2.42.0 -From f8dfc7073c0316607557b2eb7331d86bf18d0f31 Mon Sep 17 00:00:00 2001 +From 8556cdb5c7337ef7d70655272e193f9c06053627 Mon Sep 17 00:00:00 2001 From: David Karoly Date: Fri, 13 Oct 2023 21:35:29 +0200 Subject: clang: link against crti.o @@ -1155,10 +1155,10 @@ index 60434c6..2b507b1 100644 if (crt1) CmdArgs.push_back(Args.MakeArgString(ToolChain.GetFilePath(crt1))); -- -2.37.3 +2.42.0 -From 636386a5e94aa96f0c39c7544bbb1e0a20de8d52 Mon Sep 17 00:00:00 2001 +From b08d5d27f4124bbe05c654a1bcab35d923ac4c83 Mon Sep 17 00:00:00 2001 From: Calvin Hill Date: Thu, 2 Nov 2023 07:44:17 +0000 Subject: lld: Make --no-undefined-version into a warning @@ -1203,5 +1203,40 @@ index b99fb17..9cdfa1e 100644 # ERR3: version script assignment of 'local' to symbol 'und' failed: symbol not defined -- -2.37.3 +2.42.0 + + +From 96f29d1128de89cc355223c2928005fe6c626f3d Mon Sep 17 00:00:00 2001 +From: David Karoly +Date: Mon, 6 Nov 2023 14:24:21 +0100 +Subject: clang: Haiku: patch for analyzer scripts + + +diff --git a/clang/tools/scan-build/bin/scan-build b/clang/tools/scan-build/bin/scan-build +index 04734d9..f41d1b7 100755 +--- a/clang/tools/scan-build/bin/scan-build ++++ b/clang/tools/scan-build/bin/scan-build +@@ -1888,8 +1888,8 @@ if ($Clang !~ /\+\+(\.exe)?$/) { + + # Determine the location of ccc-analyzer. + my $AbsRealBin = Cwd::realpath($RealBin); +-my $Cmd = "$AbsRealBin/../libexec/ccc-analyzer"; +-my $CmdCXX = "$AbsRealBin/../libexec/c++-analyzer"; ++my $Cmd = "$AbsRealBin/../lib/ccc-analyzer"; ++my $CmdCXX = "$AbsRealBin/../lib/c++-analyzer"; + + # Portability: use less strict but portable check -e (file exists) instead of + # non-portable -x (file is executable). On some windows ports -x just checks +diff --git a/clang/tools/scan-view/bin/scan-view b/clang/tools/scan-view/bin/scan-view +index d01aebb..f337580 100755 +--- a/clang/tools/scan-view/bin/scan-view ++++ b/clang/tools/scan-view/bin/scan-view +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + + from __future__ import print_function + +-- +2.42.0