From 2d660e4cdc93cc3557458f671703e2df18adbfb5 Mon Sep 17 00:00:00 2001 From: Lang Daniel Date: Thu, 15 Jun 2023 15:43:08 +0200 Subject: [PATCH] package/clang: move to llvm-project subfolder To make version bumping easier, move clang to a new llvm-project subfolder and specify site and version for the project. 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 | 6 +++--- package/Config.in | 2 +- ...-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch | 0 package/{ => llvm-project}/clang/Config.in | 0 package/{ => llvm-project}/clang/clang.hash | 0 package/{ => llvm-project}/clang/clang.mk | 7 +++---- 7 files changed, 8 insertions(+), 9 deletions(-) rename package/{ => llvm-project}/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch (100%) rename package/{ => llvm-project}/clang/Config.in (100%) rename package/{ => llvm-project}/clang/clang.hash (100%) rename package/{ => llvm-project}/clang/clang.mk (96%) diff --git a/.checkpackageignore b/.checkpackageignore index 55d2985707..059732bf37 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -273,7 +273,6 @@ package/cgroupfs-mount/S30cgroupfs Indent Shellcheck Variables package/chipmunk/0001-Fix-build-failure-on-musl.patch Upstream package/chocolate-doom/0001-Remove-redundant-demoextend-definition.patch Upstream package/chrony/S49chrony Indent Shellcheck Variables -package/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch Upstream package/cmake/0001-rename-cmake-rootfile.patch Upstream package/cmocka/0001-Don-t-redefine-uintptr_t.patch Upstream package/collectd/0001-src-netlink.c-remove-REG_NOERROR.patch Upstream @@ -881,6 +880,7 @@ package/lite/0002-no-tests.patch Sob Upstream 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/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 5526130847..baa2856a43 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1629,10 +1629,10 @@ F: support/testing/tests/package/test_zfs.py N: Joseph Kogut F: package/at-spi2-core/ -F: package/clang/ F: package/earlyoom/ F: package/gconf/ F: package/libnss/ +F: package/llvm-project/clang/ F: package/llvm-project/lld/ F: package/llvm-project/llvm/ F: package/python-cython/ @@ -2526,7 +2526,6 @@ F: package/alure/ F: package/aubio/ F: package/binutils/ F: package/bullet/ -F: package/clang/ F: package/clinfo/ F: package/efl/ F: package/enet/ @@ -2545,6 +2544,7 @@ F: package/libgta/ F: package/libiec61850/ F: package/libspatialindex/ F: package/linux-syscall-support/ +F: package/llvm-project/clang/ F: package/llvm-project/llvm/ F: package/lugaru/ F: package/mcelog/ @@ -2952,9 +2952,9 @@ F: package/gettext-tiny/ F: package/tinyssh/ N: Valentin Korenblit -F: package/clang/ F: package/clinfo/ F: package/libclc/ +F: package/llvm-project/clang/ F: package/llvm-project/llvm/ N: Vanya Sergeev diff --git a/package/Config.in b/package/Config.in index 0e9f7c35e8..4652ddc310 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2025,7 +2025,6 @@ menu "Other" source "package/catch2/Config.in" source "package/cctz/Config.in" source "package/cereal/Config.in" - source "package/clang/Config.in" source "package/cmocka/Config.in" source "package/compiler-rt/Config.in" source "package/cppcms/Config.in" @@ -2130,6 +2129,7 @@ comment "linux-pam plugins" source "package/libpam-tacplus/Config.in" endif source "package/liquid-dsp/Config.in" + source "package/llvm-project/clang/Config.in" source "package/llvm-project/llvm/Config.in" source "package/lttng-libust/Config.in" source "package/matio/Config.in" diff --git a/package/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch b/package/llvm-project/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch similarity index 100% rename from package/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch rename to package/llvm-project/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch diff --git a/package/clang/Config.in b/package/llvm-project/clang/Config.in similarity index 100% rename from package/clang/Config.in rename to package/llvm-project/clang/Config.in diff --git a/package/clang/clang.hash b/package/llvm-project/clang/clang.hash similarity index 100% rename from package/clang/clang.hash rename to package/llvm-project/clang/clang.hash diff --git a/package/clang/clang.mk b/package/llvm-project/clang/clang.mk similarity index 96% rename from package/clang/clang.mk rename to package/llvm-project/clang/clang.mk index 3c75f8d6b1..0943e21a8c 100644 --- a/package/clang/clang.mk +++ b/package/llvm-project/clang/clang.mk @@ -4,10 +4,9 @@ # ################################################################################ -# LLVM, Clang and lld should be version bumped together -CLANG_VERSION_MAJOR = 11 -CLANG_VERSION = $(CLANG_VERSION_MAJOR).1.0 -CLANG_SITE = https://github.com/llvm/llvm-project/releases/download/llvmorg-$(CLANG_VERSION) +CLANG_VERSION_MAJOR = $(LLVM_PROJECT_VERSION_MAJOR) +CLANG_VERSION = $(LLVM_PROJECT_VERSION) +CLANG_SITE = $(LLVM_PROJECT_SITE) CLANG_SOURCE = clang-$(CLANG_VERSION).src.tar.xz CLANG_LICENSE = Apache-2.0 with exceptions CLANG_LICENSE_FILES = LICENSE.TXT