| Message ID | VI1P190MB04933E751949AC273E5E7F929F319@VI1P190MB0493.EURP190.PROD.OUTLOOK.COM |
|---|---|
| State | Superseded |
| Headers | show |
| Series | group llvm projects and bump to version 15.0.3 | expand |
Hello, Le 25/10/2022 à 08:07, Lang Daniel via buildroot a écrit : > To make version bumping easier, move llvm to a new llvm-project subfolder > and specify site and version for the project. > > Signed-off-by: Daniel Lang <d.lang@abatec.at> > --- > Changes v1 -> v2: > - No changes > --- > 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 +++---- > package/llvm-project/llvm-project.mk | 3 ++- > 7 files changed, 9 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/DEVELOPERS b/DEVELOPERS > index d4bab1aa36..d516f585d8 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1605,10 +1605,10 @@ F: support/testing/tests/package/test_python_aexpect.py > N: Joseph Kogut <joseph.kogut@gmail.com> > F: package/at-spi2-atk/ > 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/ > @@ -2525,7 +2525,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/ > @@ -2544,6 +2543,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/ > @@ -2953,9 +2953,9 @@ F: package/gettext-tiny/ > F: package/tinyssh/ > > N: Valentin Korenblit <valentinkorenblit@gmail.com> > -F: package/clang/ > F: package/clinfo/ > F: package/libclc/ > +F: package/llvm-project/clang/ > F: package/llvm-project/llvm/ > > N: Vanya Sergeev <vsergeev@gmail.com> > diff --git a/package/Config.in b/package/Config.in > index 3b7d4a9448..15dd27796f 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -1970,7 +1970,7 @@ menu "Other" > source "package/capnproto/Config.in" > source "package/cctz/Config.in" > source "package/cereal/Config.in" > - source "package/clang/Config.in" > + source "package/llvm-project/clang/Config.in" > source "package/cmocka/Config.in" > source "package/compiler-rt/Config.in" > source "package/cppcms/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 > diff --git a/package/llvm-project/llvm-project.mk b/package/llvm-project/llvm-project.mk > index 7ba89bb605..747a6f5647 100644 > --- a/package/llvm-project/llvm-project.mk > +++ b/package/llvm-project/llvm-project.mk > @@ -4,7 +4,8 @@ > # > ################################################################################ > > -LLVM_PROJECT_VERSION = 11.1.0 > +LLVM_PROJECT_VERSION_MAJOR = 11 > +LLVM_PROJECT_VERSION = $(LLVM_PROJECT_VERSION_MAJOR).1.0 It seems not related to the clang move to llvm-project subfolder. (maybe a rebase + squash issue) It should be done at the begening of this series. Best regards, Romain > LLVM_PROJECT_SITE = https://github.com/llvm/llvm-project/releases/download/llvmorg-$(LLVM_PROJECT_VERSION) > > include $(sort $(wildcard package/llvm-project/*/*.mk))
diff --git a/DEVELOPERS b/DEVELOPERS index d4bab1aa36..d516f585d8 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1605,10 +1605,10 @@ F: support/testing/tests/package/test_python_aexpect.py N: Joseph Kogut <joseph.kogut@gmail.com> F: package/at-spi2-atk/ 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/ @@ -2525,7 +2525,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/ @@ -2544,6 +2543,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/ @@ -2953,9 +2953,9 @@ F: package/gettext-tiny/ F: package/tinyssh/ N: Valentin Korenblit <valentinkorenblit@gmail.com> -F: package/clang/ F: package/clinfo/ F: package/libclc/ +F: package/llvm-project/clang/ F: package/llvm-project/llvm/ N: Vanya Sergeev <vsergeev@gmail.com> diff --git a/package/Config.in b/package/Config.in index 3b7d4a9448..15dd27796f 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1970,7 +1970,7 @@ menu "Other" source "package/capnproto/Config.in" source "package/cctz/Config.in" source "package/cereal/Config.in" - source "package/clang/Config.in" + source "package/llvm-project/clang/Config.in" source "package/cmocka/Config.in" source "package/compiler-rt/Config.in" source "package/cppcms/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 diff --git a/package/llvm-project/llvm-project.mk b/package/llvm-project/llvm-project.mk index 7ba89bb605..747a6f5647 100644 --- a/package/llvm-project/llvm-project.mk +++ b/package/llvm-project/llvm-project.mk @@ -4,7 +4,8 @@ # ################################################################################ -LLVM_PROJECT_VERSION = 11.1.0 +LLVM_PROJECT_VERSION_MAJOR = 11 +LLVM_PROJECT_VERSION = $(LLVM_PROJECT_VERSION_MAJOR).1.0 LLVM_PROJECT_SITE = https://github.com/llvm/llvm-project/releases/download/llvmorg-$(LLVM_PROJECT_VERSION) include $(sort $(wildcard package/llvm-project/*/*.mk))
To make version bumping easier, move llvm to a new llvm-project subfolder and specify site and version for the project. Signed-off-by: Daniel Lang <d.lang@abatec.at> --- Changes v1 -> v2: - No changes --- 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 +++---- package/llvm-project/llvm-project.mk | 3 ++- 7 files changed, 9 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%)