From e0caf0d0dc251cda9f3ba20c07b763eae0c05c06 Mon Sep 17 00:00:00 2001 From: Lang Daniel Date: Thu, 15 Jun 2023 15:43:07 +0200 Subject: [PATCH] package/lld: move to llvm-project subfolder To make version bumping easier, move lld 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 --- DEVELOPERS | 2 +- package/Config.in.host | 2 +- package/{ => llvm-project}/lld/Config.in.host | 0 package/{ => llvm-project}/lld/lld.hash | 0 package/{ => llvm-project}/lld/lld.mk | 5 ++--- 5 files changed, 4 insertions(+), 5 deletions(-) rename package/{ => llvm-project}/lld/Config.in.host (100%) rename package/{ => llvm-project}/lld/lld.hash (100%) rename package/{ => llvm-project}/lld/lld.mk (87%) diff --git a/DEVELOPERS b/DEVELOPERS index 8ccecc248e..5526130847 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1633,7 +1633,7 @@ F: package/clang/ F: package/earlyoom/ F: package/gconf/ F: package/libnss/ -F: package/lld/ +F: package/llvm-project/lld/ F: package/llvm-project/llvm/ F: package/python-cython/ F: package/python-pycups/ diff --git a/package/Config.in.host b/package/Config.in.host index dcadbfdfc1..9addc88522 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -51,7 +51,7 @@ menu "Host utilities" source "package/jsmin/Config.in.host" source "package/kmod/Config.in.host" source "package/libp11/Config.in.host" - source "package/lld/Config.in.host" + source "package/llvm-project/lld/Config.in.host" source "package/lpc3250loader/Config.in.host" source "package/lttng-babeltrace/Config.in.host" source "package/lzma-alone/Config.in.host" diff --git a/package/lld/Config.in.host b/package/llvm-project/lld/Config.in.host similarity index 100% rename from package/lld/Config.in.host rename to package/llvm-project/lld/Config.in.host diff --git a/package/lld/lld.hash b/package/llvm-project/lld/lld.hash similarity index 100% rename from package/lld/lld.hash rename to package/llvm-project/lld/lld.hash diff --git a/package/lld/lld.mk b/package/llvm-project/lld/lld.mk similarity index 87% rename from package/lld/lld.mk rename to package/llvm-project/lld/lld.mk index 4bf903cda0..46ec3b13ff 100644 --- a/package/lld/lld.mk +++ b/package/llvm-project/lld/lld.mk @@ -4,9 +4,8 @@ # ################################################################################ -# LLVM, Clang and lld should be version bumped together -LLD_VERSION = 11.1.0 -LLD_SITE = https://github.com/llvm/llvm-project/releases/download/llvmorg-$(LLD_VERSION) +LLD_VERSION = $(LLVM_PROJECT_VERSION) +LLD_SITE = $(LLVM_PROJECT_SITE) LLD_SOURCE = lld-$(LLD_VERSION).src.tar.xz LLD_LICENSE = Apache-2.0 with exceptions LLD_LICENSE_FILES = LICENSE.TXT