diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000000000000000000000000000000000..8b07dd7828f72b0cb2345ae0f4d295507305991f --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +*.gz filter=lfs diff=lfs merge=lfs -text \ No newline at end of file diff --git a/.lfsconfig b/.lfsconfig new file mode 100644 index 0000000000000000000000000000000000000000..d4809a9283ef794cadf57b349f66618cef27c772 --- /dev/null +++ b/.lfsconfig @@ -0,0 +1,2 @@ +[lfs] + url = https://artlfs.openeuler.openatom.cn/src-openEuler/llvm-toolset-17 \ No newline at end of file diff --git a/llvm-for-oE-17.0.6-2503.0.1.tar.gz b/llvm-for-oE-17.0.6-2503.0.1.tar.gz deleted file mode 100644 index 0ab84e1a91541361cb683fcb8ec76e050ea98553..0000000000000000000000000000000000000000 Binary files a/llvm-for-oE-17.0.6-2503.0.1.tar.gz and /dev/null differ diff --git a/llvm-for-oE-17.0.6-2506.0.4.tar.gz b/llvm-for-oE-17.0.6-2506.0.4.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..171f896de39b0f6dac45da2dda89362360f79b53 --- /dev/null +++ b/llvm-for-oE-17.0.6-2506.0.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:db05405706279885e543dd562d7f2887fd433eb10dae819811df7d588e8548b3 +size 212541296 diff --git a/llvm-toolset-17.spec b/llvm-toolset-17.spec index a1768e4d2502685dfac6b40df3718e5969d1d6cd..dda9613de723a34c62ad93297bde91eecdc9d2df 100644 --- a/llvm-toolset-17.spec +++ b/llvm-toolset-17.spec @@ -30,7 +30,7 @@ %undefine __cmake_in_source_build -%global src_tarball llvm-for-oE-17.0.6-2503.0.1 +%global src_tarball llvm-for-oE-17.0.6-2506.0.4 %global src_tarball_dir llvm-project-%{src_tarball} #region LLVM globals @@ -150,7 +150,7 @@ #region main package Name: llvm-toolset-%{maj_ver} Version: %{maj_ver}.%{min_ver}.%{patch_ver} -Release: 6 +Release: 9 Summary: The Low Level Virtual Machine License: NCSA @@ -456,6 +456,8 @@ Requires: %{pkg_name_clang}-tools-extra = %{version}-%{release} Requires: git Requires: python3 +Obsoletes:%{?scl_prefix}git-clang-format17 < %{version}-%{release} + %description -n %{?scl_prefix}git-clang-format clang-format integration for git. @@ -501,6 +503,7 @@ Requires: %{pkg_name_llvm}-libs%{?_isa} = %{version}-%{release} Requires: elfutils-libelf Provides: libomp(major) = %{maj_ver} +Obsoletes: %{?scl_prefix}libomp < %{version}-%{release} %description -n %{pkg_name_libomp} OpenMP runtime for clang. @@ -514,6 +517,7 @@ Requires: %{pkg_name_libomp}%{?_isa} = %{version}-%{release} Requires: %{pkg_name_clang}-resource-filesystem%{?_isa} = %{version}-%{release} Provides: libomp-devel(major) = %{maj_ver} +Obsoletes: %{?scl_prefix}libomp-devel < %{version}-%{release} %description -n %{pkg_name_libomp}-devel OpenMP header files. @@ -2772,6 +2776,15 @@ fi #endregion files %changelog +* Wed Jun 25 2025 liyunfei liyunfei33@huawei.com - 17.0.6-9 +- update to llvm-for-oe-17.0.6-2506.0.4 + +* Mon Mar 24 2025 liyunfei liyunfei33@huawei.com - 17.0.6-8 +- Add obsoletes for old version libomp and git-clang-format17 + +* Mon Mar 17 2025 liyunfei liyunfei33@huawei.com - 17.0.6-7 +- update to llvm-for-oE-17.0.6-2503.0.2 + * Mon Mar 3 2025 liyunfei liyunfei33@huawei.com - 17.0.6-6 - fix cmake version requirment for 2003 build