From 353f8bd02541e282d8e21bf36677a2ef23de1f43 Mon Sep 17 00:00:00 2001 From: Lang Daniel Date: Thu, 15 Jun 2023 15:43:09 +0200 Subject: [PATCH] package/compiler-rt: move to llvm-project subfolder To make version bumping easier, move compiler-rt to a new llvm-project subfolder and specify site and version for the project. Signed-off-by: Daniel Lang Reviewed-by: Romain Naour Signed-off-by: Romain Naour Signed-off-by: Sebastian Weyer Tested-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- package/Config.in | 2 +- package/{ => llvm-project}/compiler-rt/Config.in | 0 package/{ => llvm-project}/compiler-rt/compiler-rt.hash | 0 package/{ => llvm-project}/compiler-rt/compiler-rt.mk | 6 ++---- 4 files changed, 3 insertions(+), 5 deletions(-) rename package/{ => llvm-project}/compiler-rt/Config.in (100%) rename package/{ => llvm-project}/compiler-rt/compiler-rt.hash (100%) rename package/{ => llvm-project}/compiler-rt/compiler-rt.mk (85%) diff --git a/package/Config.in b/package/Config.in index 4652ddc310..ca1a515a7b 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2026,7 +2026,6 @@ menu "Other" source "package/cctz/Config.in" source "package/cereal/Config.in" source "package/cmocka/Config.in" - source "package/compiler-rt/Config.in" source "package/cppcms/Config.in" source "package/cracklib/Config.in" source "package/dawgdic/Config.in" @@ -2130,6 +2129,7 @@ comment "linux-pam plugins" endif source "package/liquid-dsp/Config.in" source "package/llvm-project/clang/Config.in" + source "package/llvm-project/compiler-rt/Config.in" source "package/llvm-project/llvm/Config.in" source "package/lttng-libust/Config.in" source "package/matio/Config.in" diff --git a/package/compiler-rt/Config.in b/package/llvm-project/compiler-rt/Config.in similarity index 100% rename from package/compiler-rt/Config.in rename to package/llvm-project/compiler-rt/Config.in diff --git a/package/compiler-rt/compiler-rt.hash b/package/llvm-project/compiler-rt/compiler-rt.hash similarity index 100% rename from package/compiler-rt/compiler-rt.hash rename to package/llvm-project/compiler-rt/compiler-rt.hash diff --git a/package/compiler-rt/compiler-rt.mk b/package/llvm-project/compiler-rt/compiler-rt.mk similarity index 85% rename from package/compiler-rt/compiler-rt.mk rename to package/llvm-project/compiler-rt/compiler-rt.mk index c8ea86e899..84add60801 100644 --- a/package/compiler-rt/compiler-rt.mk +++ b/package/llvm-project/compiler-rt/compiler-rt.mk @@ -4,11 +4,9 @@ # ################################################################################ -# Compiler-RT should be bumped together with LLVM and Clang as the run-time is -# tied to the version of those tools -COMPILER_RT_VERSION = 11.1.0 +COMPILER_RT_VERSION = $(LLVM_PROJECT_VERSION) COMPILER_RT_SOURCE = compiler-rt-$(COMPILER_RT_VERSION).src.tar.xz -COMPILER_RT_SITE = https://github.com/llvm/llvm-project/releases/download/llvmorg-$(COMPILER_RT_VERSION) +COMPILER_RT_SITE = $(LLVM_PROJECT_SITE) COMPILER_RT_LICENSE = NCSA MIT COMPILER_RT_LICENSE_FILES = LICENSE.TXT COMPILER_RT_DEPENDENCIES = host-clang llvm