From 5fad34d0d1a2285233ca6cb087e0509d98379a50 Mon Sep 17 00:00:00 2001 From: Lang Daniel Date: Thu, 15 Jun 2023 15:43:10 +0200 Subject: [PATCH] package/libclc: move to llvm-project subfolder To make version bumping easier, move libclc to a new llvm-project subfolder and specify site for the project. Since the version of libclc is more recent than the version specified in LLVM_PROJECT_VERSION, don't change it for now until a later update. Signed-off-by: Daniel Lang Signed-off-by: Romain Naour Signed-off-by: Sebastian Weyer Tested-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 2 +- DEVELOPERS | 4 ++-- package/Config.in | 2 +- .../libclc/0001-support-out-of-tree-build.patch | 0 package/{ => llvm-project}/libclc/Config.in | 0 package/{ => llvm-project}/libclc/libclc.hash | 0 package/{ => llvm-project}/libclc/libclc.mk | 2 +- 7 files changed, 5 insertions(+), 5 deletions(-) rename package/{ => llvm-project}/libclc/0001-support-out-of-tree-build.patch (100%) rename package/{ => llvm-project}/libclc/Config.in (100%) rename package/{ => llvm-project}/libclc/libclc.hash (100%) rename package/{ => llvm-project}/libclc/libclc.mk (93%) diff --git a/.checkpackageignore b/.checkpackageignore index 059732bf37..612d54cab3 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -691,7 +691,6 @@ package/libcdaudio/0001-libcdaudio-enable-autoreconf.patch Upstream package/libcec/0001-cecloader-h-fix-null-return.patch Upstream package/libcgi/0001-CMakeLists.txt-honour-BUILD_TESTING.patch Upstream package/libcgicc/0001-disable-documentation-option.patch Sob Upstream -package/libclc/0001-support-out-of-tree-build.patch Upstream package/libconfuse/0001-Fix-163-unterminated-username-used-with-getpwnam.patch Upstream package/libcorrect/0002-CMakeLists.txt-conditionally-use-fsanitize-address.patch Upstream package/libcuefile/0001-fix-static-link.patch Upstream @@ -881,6 +880,7 @@ package/lite/0003-pkg-config.patch Sob Upstream package/live555/0001-Add-a-pkg-config-file-for-the-shared-libraries.patch Upstream package/lldpd/S60lldpd Indent Shellcheck Variables package/llvm-project/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch Upstream +package/llvm-project/libclc/0001-support-out-of-tree-build.patch Upstream package/llvm-project/llvm/0001-nfc-Fix-missing-include.patch Upstream package/lm-sensors/0001-static-build.patch Upstream package/lm-sensors/0002-no-host-ldconfig.patch Upstream diff --git a/DEVELOPERS b/DEVELOPERS index baa2856a43..43058cedf9 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2539,12 +2539,12 @@ F: package/irrlicht/ F: package/liblinear/ F: package/lensfun/ F: package/libbpf/ -F: package/libclc/ F: package/libgta/ F: package/libiec61850/ F: package/libspatialindex/ F: package/linux-syscall-support/ F: package/llvm-project/clang/ +F: package/llvm-project/libclc/ F: package/llvm-project/llvm/ F: package/lugaru/ F: package/mcelog/ @@ -2953,8 +2953,8 @@ F: package/tinyssh/ N: Valentin Korenblit F: package/clinfo/ -F: package/libclc/ F: package/llvm-project/clang/ +F: package/llvm-project/libclc/ F: package/llvm-project/llvm/ N: Vanya Sergeev diff --git a/package/Config.in b/package/Config.in index ca1a515a7b..601922aad5 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2067,7 +2067,6 @@ menu "Other" source "package/libcap/Config.in" source "package/libcap-ng/Config.in" source "package/libcgroup/Config.in" - source "package/libclc/Config.in" source "package/libcofi/Config.in" source "package/libcorrect/Config.in" source "package/libcrossguid/Config.in" @@ -2130,6 +2129,7 @@ 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/libclc/Config.in" source "package/llvm-project/llvm/Config.in" source "package/lttng-libust/Config.in" source "package/matio/Config.in" diff --git a/package/libclc/0001-support-out-of-tree-build.patch b/package/llvm-project/libclc/0001-support-out-of-tree-build.patch similarity index 100% rename from package/libclc/0001-support-out-of-tree-build.patch rename to package/llvm-project/libclc/0001-support-out-of-tree-build.patch diff --git a/package/libclc/Config.in b/package/llvm-project/libclc/Config.in similarity index 100% rename from package/libclc/Config.in rename to package/llvm-project/libclc/Config.in diff --git a/package/libclc/libclc.hash b/package/llvm-project/libclc/libclc.hash similarity index 100% rename from package/libclc/libclc.hash rename to package/llvm-project/libclc/libclc.hash diff --git a/package/libclc/libclc.mk b/package/llvm-project/libclc/libclc.mk similarity index 93% rename from package/libclc/libclc.mk rename to package/llvm-project/libclc/libclc.mk index 5d246cf4f8..406adfdb53 100644 --- a/package/libclc/libclc.mk +++ b/package/llvm-project/libclc/libclc.mk @@ -5,7 +5,7 @@ ################################################################################ LIBCLC_VERSION = 13.0.1 -LIBCLC_SITE = https://github.com/llvm/llvm-project/releases/download/llvmorg-$(LIBCLC_VERSION) +LIBCLC_SITE = $(LLVM_PROJECT_SITE) LIBCLC_SOURCE = libclc-$(LIBCLC_VERSION).src.tar.xz LIBCLC_LICENSE = Apache-2.0 with exceptions or MIT LIBCLC_LICENSE_FILES = LICENSE.TXT